Skip to content

JaiSeMgr #1106

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

Draft
tommaso-perondi wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

JaiSeMgr #1106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
01528bf
JAISeMgr: almost complete, non linking, high match
Jul 5, 2026
42211db
JAISeMgr: little progress, regalloc issues
Jul 5, 2026
36be3c0
JAISeMgr: progress but regalloc issues
Jul 5, 2026
8af8413
removed non matching from 100% methods
Jul 5, 2026
a08b9fa
D_a_npc_tt (#1099)
Zeclos Jul 5, 2026
ee4c5a6
d_menu_save mostly done (#1103)
TakaRikka Jul 5, 2026
1923bfd
d_menu_save OK
LagoLunatic Jul 5, 2026
7a41a47
d_a_npc_mt 100% for GZLE01 (#1102)
mattias-blum Jul 5, 2026
6f8ff44
d_a_npc_mt OK for all versions
LagoLunatic Jul 5, 2026
af12518
d_flower Code Matching (#1105)
SuperDude88 Jul 5, 2026
68fc1ae
Match most d_flower funcs for demo
LagoLunatic Jul 5, 2026
b9e6658
Remove Matching
Jul 5, 2026
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
43 changes: 43 additions & 0 deletions config/D44J01/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3068,6 +3068,49 @@ extract:
header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h
rename: l_backMat

- symbol: l_Txq_bessou_hanaTEX
binary: assets/l_Txq_bessou_hanaTEX.bin
header: assets/l_Txq_bessou_hanaTEX.h
- symbol: l_QbsafDL
binary: assets/l_QbsafDL.bin
header: assets/l_QbsafDL.h
- symbol: l_QbsfwDL
binary: assets/l_QbsfwDL.bin
header: assets/l_QbsfwDL.h
- symbol: l_Txo_ob_flower_white_64x64TEX
binary: assets/l_Txo_ob_flower_white_64x64TEX.bin
header: assets/l_Txo_ob_flower_white_64x64TEX.h
- symbol: l_OhanaDL
binary: assets/l_OhanaDL.bin
header: assets/l_OhanaDL.h
- symbol: l_Ohana_gutDL
binary: assets/l_Ohana_gutDL.bin
header: assets/l_Ohana_gutDL.h
- symbol: l_Txo_ob_flower_pink_64x64TEX
binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin
header: assets/l_Txo_ob_flower_pink_64x64TEX.h
- symbol: l_Ohana_highDL
binary: assets/l_Ohana_highDL.bin
header: assets/l_Ohana_highDL.h
- symbol: l_Ohana_high_gutDL
binary: assets/l_Ohana_high_gutDL.bin
header: assets/l_Ohana_high_gutDL.h
- symbol: l_matDL3
binary: assets/l_matDL3.bin
header: assets/l_matDL3.h
header_type: none
custom_type: matDL
- symbol: l_matDL!.data:0x80377C60
binary: assets/l_matDL__d_flower.bin
header: assets/l_matDL__d_flower.h
header_type: none
custom_type: matDL
- symbol: l_matDL2
binary: assets/l_matDL2.bin
header: assets/l_matDL2.h
header_type: none
custom_type: matDL

- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@
binary: assets/l_Txa_swood_bTEX.bin
header: assets/l_Txa_swood_bTEX.h
Expand Down
43 changes: 43 additions & 0 deletions config/GZLE01/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2646,6 +2646,49 @@ extract:
header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h
rename: l_backMat

- symbol: l_Txq_bessou_hanaTEX
binary: assets/l_Txq_bessou_hanaTEX.bin
header: assets/l_Txq_bessou_hanaTEX.h
- symbol: l_QbsafDL
binary: assets/l_QbsafDL.bin
header: assets/l_QbsafDL.h
- symbol: l_QbsfwDL
binary: assets/l_QbsfwDL.bin
header: assets/l_QbsfwDL.h
- symbol: l_Txo_ob_flower_white_64x64TEX
binary: assets/l_Txo_ob_flower_white_64x64TEX.bin
header: assets/l_Txo_ob_flower_white_64x64TEX.h
- symbol: l_OhanaDL
binary: assets/l_OhanaDL.bin
header: assets/l_OhanaDL.h
- symbol: l_Ohana_gutDL
binary: assets/l_Ohana_gutDL.bin
header: assets/l_Ohana_gutDL.h
- symbol: l_Txo_ob_flower_pink_64x64TEX
binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin
header: assets/l_Txo_ob_flower_pink_64x64TEX.h
- symbol: l_Ohana_highDL
binary: assets/l_Ohana_highDL.bin
header: assets/l_Ohana_highDL.h
- symbol: l_Ohana_high_gutDL
binary: assets/l_Ohana_high_gutDL.bin
header: assets/l_Ohana_high_gutDL.h
- symbol: l_matDL3
binary: assets/l_matDL3.bin
header: assets/l_matDL3.h
header_type: none
custom_type: matDL
- symbol: l_matDL!.data:0x80383CE0
binary: assets/l_matDL__d_flower.bin
header: assets/l_matDL__d_flower.h
header_type: none
custom_type: matDL
- symbol: l_matDL2
binary: assets/l_matDL2.bin
header: assets/l_matDL2.h
header_type: none
custom_type: matDL

- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@
binary: assets/l_Txa_swood_bTEX.bin
header: assets/l_Txa_swood_bTEX.h
Expand Down
43 changes: 43 additions & 0 deletions config/GZLJ01/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2230,6 +2230,49 @@ extract:
header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h
rename: l_backMat

- symbol: l_Txq_bessou_hanaTEX
binary: assets/l_Txq_bessou_hanaTEX.bin
header: assets/l_Txq_bessou_hanaTEX.h
- symbol: l_QbsafDL
binary: assets/l_QbsafDL.bin
header: assets/l_QbsafDL.h
- symbol: l_QbsfwDL
binary: assets/l_QbsfwDL.bin
header: assets/l_QbsfwDL.h
- symbol: l_Txo_ob_flower_white_64x64TEX
binary: assets/l_Txo_ob_flower_white_64x64TEX.bin
header: assets/l_Txo_ob_flower_white_64x64TEX.h
- symbol: l_OhanaDL
binary: assets/l_OhanaDL.bin
header: assets/l_OhanaDL.h
- symbol: l_Ohana_gutDL
binary: assets/l_Ohana_gutDL.bin
header: assets/l_Ohana_gutDL.h
- symbol: l_Txo_ob_flower_pink_64x64TEX
binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin
header: assets/l_Txo_ob_flower_pink_64x64TEX.h
- symbol: l_Ohana_highDL
binary: assets/l_Ohana_highDL.bin
header: assets/l_Ohana_highDL.h
- symbol: l_Ohana_high_gutDL
binary: assets/l_Ohana_high_gutDL.bin
header: assets/l_Ohana_high_gutDL.h
- symbol: l_matDL3
binary: assets/l_matDL3.bin
header: assets/l_matDL3.h
header_type: none
custom_type: matDL
- symbol: l_matDL!.data:0x80377180
binary: assets/l_matDL__d_flower.bin
header: assets/l_matDL__d_flower.h
header_type: none
custom_type: matDL
- symbol: l_matDL2
binary: assets/l_matDL2.bin
header: assets/l_matDL2.h
header_type: none
custom_type: matDL

- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@
binary: assets/l_Txa_swood_bTEX.bin
header: assets/l_Txa_swood_bTEX.h
Expand Down
43 changes: 43 additions & 0 deletions config/GZLP01/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2242,6 +2242,49 @@ extract:
header: assets/l_backMat__draw__23dDlst_alphaInvVolPacketFv.h
rename: l_backMat

- symbol: l_Txq_bessou_hanaTEX
binary: assets/l_Txq_bessou_hanaTEX.bin
header: assets/l_Txq_bessou_hanaTEX.h
- symbol: l_QbsafDL
binary: assets/l_QbsafDL.bin
header: assets/l_QbsafDL.h
- symbol: l_QbsfwDL
binary: assets/l_QbsfwDL.bin
header: assets/l_QbsfwDL.h
- symbol: l_Txo_ob_flower_white_64x64TEX
binary: assets/l_Txo_ob_flower_white_64x64TEX.bin
header: assets/l_Txo_ob_flower_white_64x64TEX.h
- symbol: l_OhanaDL
binary: assets/l_OhanaDL.bin
header: assets/l_OhanaDL.h
- symbol: l_Ohana_gutDL
binary: assets/l_Ohana_gutDL.bin
header: assets/l_Ohana_gutDL.h
- symbol: l_Txo_ob_flower_pink_64x64TEX
binary: assets/l_Txo_ob_flower_pink_64x64TEX.bin
header: assets/l_Txo_ob_flower_pink_64x64TEX.h
- symbol: l_Ohana_highDL
binary: assets/l_Ohana_highDL.bin
header: assets/l_Ohana_highDL.h
- symbol: l_Ohana_high_gutDL
binary: assets/l_Ohana_high_gutDL.bin
header: assets/l_Ohana_high_gutDL.h
- symbol: l_matDL3
binary: assets/l_matDL3.bin
header: assets/l_matDL3.h
header_type: none
custom_type: matDL
- symbol: l_matDL!.data:0x8038A9C0
binary: assets/l_matDL__d_flower.bin
header: assets/l_matDL__d_flower.h
header_type: none
custom_type: matDL
- symbol: l_matDL2
binary: assets/l_matDL2.bin
header: assets/l_matDL2.h
header_type: none
custom_type: matDL

- symbol: l_Txa_swood_bTEX__Q25dWood20@unnamed@d_wood_cpp@
binary: assets/l_Txa_swood_bTEX.bin
header: assets/l_Txa_swood_bTEX.h
Expand Down
6 changes: 3 additions & 3 deletions configure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ def EquivalentFor(*versions):
Object(NonMatching, "d/d_menu_fmap2.cpp"),
Object(NonMatching, "d/d_menu_item.cpp"),
Object(Matching, "d/d_menu_option.cpp"),
Object(NonMatching, "d/d_menu_save.cpp"),
Object(Matching, "d/d_menu_save.cpp"),
Object(MatchingFor("GZLE01"), "d/d_menu_window.cpp"),
Object(NonMatching, "d/d_mesg.cpp"),
Object(NonMatching, "d/d_message.cpp"),
Expand Down Expand Up @@ -1684,7 +1684,7 @@ def EquivalentFor(*versions):
ActorRel(Matching, "d_a_npc_ls1"),
ActorRel(NonMatching, "d_a_npc_mk"),
ActorRel(NonMatching, "d_a_npc_mn"),
ActorRel(NonMatching, "d_a_npc_mt"),
ActorRel(Matching, "d_a_npc_mt"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_nz"),
ActorRel(NonMatching, "d_a_npc_ob1"),
ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"), "d_a_npc_os"),
Expand All @@ -1699,7 +1699,7 @@ def EquivalentFor(*versions):
ActorRel(NonMatching, "d_a_npc_sarace"),
ActorRel(NonMatching, "d_a_npc_sv"),
ActorRel(Matching, "d_a_npc_tc"),
ActorRel(NonMatching, "d_a_npc_tt"),
ActorRel(Matching, "d_a_npc_tt"),
ActorRel(NonMatching, "d_a_npc_uk"),
ActorRel(NonMatching, "d_a_npc_ym1"),
ActorRel(NonMatching, "d_a_npc_yw1"),
Expand Down
8 changes: 3 additions & 5 deletions include/JSystem/JAudio/JAISeMgr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ namespace JAInter {
MoveParaSetInitZero field_0x2a4[8];
MoveParaSetInitZero field_0x324[8];
MoveParaSet field_0x3a4[8];
f32* field_0x424;
f32 field_0x428;
u8 field_0x42c[0x43c - 0x42c];
SeParameter* field_0x43c;
SeParameter* field_0x440;
f32* field_0x424[6];
SeParameter* mPrev;
SeParameter* mNext;
};

namespace SeMgr {
Expand Down
8 changes: 5 additions & 3 deletions include/JSystem/JAudio/JAISound.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ class JAISound {
void setRandom(u8) {}
void setSeInterDolbyU7(u8, u8, u32, u8) {}
void setSeInterFxmixU7(u8, u8, u32, u8) {}
void setSeqInterVolumeU7(u8, u8, u32) {}
void setSeqInterVolumeU7(u8 type, u8 value, u32 moveTime) {
setSeqInterVolume(type, value / 127.0f, moveTime);
}
void setStatus(u8) {}
void setTrack(u8) {}
void setTrackVolumeU7(u8, u8, u32) {}
Expand All @@ -183,7 +185,7 @@ class JAISound {
/* 0x09 */ u8 field_0x9;
/* 0x0a */ s16 field_0xa;
/* 0x0c */ u32 mSoundID;
/* 0x10 */ int field_0x10;
/* 0x10 */ u32 field_0x10;
/* 0x14 */ u32 mFadeCounter;
/* 0x18 */ u32 field_0x18;
/* 0x1c */ int field_0x1c;
Expand Down Expand Up @@ -214,7 +216,7 @@ namespace JAInter {
/* 0x00 */ f32 mTargetValue;
/* 0x04 */ f32 mCurrentValue;
/* 0x08 */ f32 mMoveAmount;
/* 0x0C */ int mMoveCounter;
/* 0x0C */ u32 mMoveCounter;
};

class MoveParaSetInitHalf : public MoveParaSet {
Expand Down
Loading
Loading