mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-23 06:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix offset comments

Browse Source
This commit is contained in:
LagoLunatic
2024-03-05 17:02:44 -05:00
parent 61398dbbec
commit 3a8c3ebda3
8 changed files with 39 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JGadget/allocator.h
+4 -4
View File
@@ -10,10 +10,10 @@ struct TAllocator {
inline TAllocator();
u8 _00; // _00
u32 _04; // _04
u32 _08; // _08
u32 _0C; // _0C
/* 0x00 */ u8 _00;
/* 0x04 */ u32 _04;
/* 0x08 */ u32 _08;
/* 0x0C */ u32 _0C;
};
typedef TAllocator<void*> TVoidAllocator;
include/JSystem/JMessage/processor.h
+21 -23
View File
@@ -42,16 +42,16 @@ struct TProcessor {
inline void pop() { mSize--; }
u32 mSize; // _00
const char* mStack[3]; // _04
/* 0x00 */ u32 mSize;
/* 0x04 */ const char* mStack[3];
};
struct TProcess {
struct TProcessData {
ProcessOnSelectCallBack mSelectCallback; // _00
const char* mBase; // _04
const void* mOffset; // _08
u32 mRest; // _0C
/* 0x00 */ ProcessOnSelectCallBack mSelectCallback;
/* 0x04 */ const char* mBase;
/* 0x08 */ const void* mOffset;
/* 0x0C */ u32 mRest;
};
TProcess() { reset_normal(); }
@@ -59,8 +59,8 @@ struct TProcessor {
void reset_normal() { mEndCallback = process_onCharacterEnd_normal_; }
void reset_select() { mEndCallback = process_onCharacterEnd_select_; }
OnCharacterEndCallBack mEndCallback; // _00
TProcessData mData; // _04
/* 0x00 */ OnCharacterEndCallBack mEndCallback;
/* 0x04 */ TProcessData mData;
};
~TProcessor();
@@ -114,12 +114,12 @@ struct TProcessor {
void on_tag_();
void process_character_();
// _00 = VTBL
const TReference* mReference; // _04
const TResource* mResourceCache; // _08
const char* mCurrent; // _0C
TStack_ mStack; // _10
TProcess mProcess; // _24
/* 0x00 */ /* vtable */
/* 0x04 */ const TReference* mReference;
/* 0x08 */ const TResource* mResourceCache;
/* 0x0C */ const char* mCurrent;
/* 0x10 */ TStack_ mStack;
/* 0x24 */ TProcess mProcess;
};
struct TSequenceProcessor : public TProcessor {
@@ -178,13 +178,12 @@ struct TSequenceProcessor : public TProcessor {
do_begin_(param_1, param_2);
}
// _00 = VTBL
// _00-_38 = TProcessor
TControl* _38; // _38
int _3C; // _3C
ProcessOnJumpCallBack* _40; // _40 - processorCallBack(void*, ulong) pointer?
u32 _44; // _44
u32 _48; // _48
/* 0x00 */ /* TProcessor */
/* 0x38 */ TControl* _38;
/* 0x3C */ int _3C;
/* 0x40 */ ProcessOnJumpCallBack* _40;
/* 0x44 */ u32 _44;
/* 0x48 */ u32 _48;
};
struct TRenderingProcessor : public TProcessor {
@@ -201,8 +200,7 @@ struct TRenderingProcessor : public TProcessor {
void process(const char*);
// _00 = VTBL
// _00-_38 = TProcessor
/* 0x00 */ /* TProcessor */
};
} // namespace JMessage
include/JSystem/JParticle/JPAEmitter.h
+1 -1
View File
@@ -86,7 +86,7 @@ public:
inline virtual void execute(T);
inline virtual void executeAfter(T);
inline virtual void draw(T);
};
}; // Size: 0x04
template<typename T, typename U>
class JPACallBackBase2 {
include/JSystem/JStudio/JStudio/jstudio-object.h
+1 -1
View File
@@ -24,7 +24,7 @@ struct TVariableValue {
struct TOutput {
virtual void operator()(f32, JStudio::TAdaptor*) const = 0;
~TOutput();
};
}; // Size: 0x04
struct TOutput_none_ {
~TOutput_none_();
include/JSystem/JStudio/JStudio_JAudio/control.h
+8 -9
View File
@@ -23,11 +23,11 @@ struct TAdaptor_sound : public JStudio::TAdaptor_sound {
virtual void operator()(f32, JStudio::TAdaptor*) const; // _08
virtual ~TVVOSetValue_(); // _0C (weak)
// _00 = VTBL
int _04; // _04
u32 _08; // _08, unknown
int _0C; // _0C
int _10; // _10
/* 0x00 */ /* JStudio::TVariableValue::TOutput */
/* 0x04 */ int _04;
/* 0x08 */ u32 _08;
/* 0x0C */ int _0C;
/* 0x10 */ int _10;
};
static TVVOOn_BEGIN_FADE_IN_ soVVOOn_BEGIN_FADE_IN_;
@@ -77,10 +77,9 @@ struct TCreateObject : public JStudio::TCreateObject {
virtual ~TCreateObject(); // _08
virtual bool create(JStudio::TObject** newObject, const JStudio::stb::data::TParse_TBlock_object& data); // _0C
// _00 = VTBL
// _00-_0C = JStudio::TCreateObject
JAIBasic* mSound; // _04
const JStage::TSystem* mSystem; // _08
/* 0x00 */ /* JStudio::TCreateObject */
/* 0x0C */ JAIBasic* mSound;
/* 0x10 */ const JStage::TSystem* mSystem;
};
} // namespace JStudio_JAudio
include/JSystem/JStudio/JStudio_JMessage/control.h
+2 -2
View File
@@ -19,7 +19,7 @@ struct TCreateObject : public TCreateObject_base {
virtual ~TCreateObject(); // _08
virtual JMessage::TControl* find(const JStudio::stb::data::TParse_TBlock_object&); // _10
JMessage::TControl* mControl; // _0C
/* 0x0C */ JMessage::TControl* mControl;
};
struct TAdaptor_message : public JStudio::TAdaptor_message {
@@ -27,7 +27,7 @@ struct TAdaptor_message : public JStudio::TAdaptor_message {
virtual void adaptor_do_MESSAGE(JStudio::data::TEOperationData, const void*, u32); // _20
TAdaptor_message(JMessage::TControl*);
JMessage::TControl* mControl; // _10
/* 0x0C */ JMessage::TControl* mControl;
};
} // namespace JStudio_JMessage
include/JSystem/JStudio/JStudio_JParticle/control.h
+2 -2
View File
@@ -32,8 +32,8 @@ struct TAdaptor_particle : public JStudio::TAdaptor_particle {
virtual ~TJPACallback_() { } // _08 (weak)
virtual void execute(JPABaseEmitter*); // _0C
TAdaptor_particle* mAdaptor; // _04
const JStudio::TObject* mObject; // _08
/* 0x04 */ TAdaptor_particle* mAdaptor;
/* 0x08 */ const JStudio::TObject* mObject;
};
struct TVVOOn_BEGIN_FADE_IN_ : public JStudio::TVariableValue::TOutput {
src/JSystem/JStudio/JStudio_JMessage/object-message.cpp
-1
View File
@@ -18,7 +18,6 @@ JStudio_JMessage::TAdaptor_message::~TAdaptor_message() {}
/* 8027A6AC-8027A6EC .text adaptor_do_MESSAGE__Q216JStudio_JMessage16TAdaptor_messageFQ37JStudio4data15TEOperationDataPCvUl */
void JStudio_JMessage::TAdaptor_message::adaptor_do_MESSAGE(JStudio::data::TEOperationData operation, const void* param_2, u32 param_3) {
/* Nonmatching */
switch (operation) {
case JStudio::data::UNK_0x19:
mControl->setMessageCode(*(u32*)param_2);