mirror/ss
1
0
Fork 0
mirror of https://github.com/zeldaret/ss synced 2026-08-18 13:42:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Progress

Browse Source
This commit is contained in:
robojumper
2025-04-04 01:41:19 +02:00
parent e5a24391fb
commit 3535968370
18 changed files with 178 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_message.h
+1
View File
@@ -39,6 +39,7 @@ public:
return field_0x32A;
}
static bool isValidTextLabel(const char *name);
static void loadTextByLabel(const char *label, dTagProcessor_c *tagProcessor, bool, u32, u32);
private:
include/d/d_tag_processor.h
+12
View File
@@ -82,6 +82,18 @@ public:
return field_0x90C;
}
u8 getField_0x90D() const {
return field_0x90D;
}
u8 getField_0x90E() const {
return field_0x90E;
}
s32 getField_0x830() const {
return field_0x830;
}
void setMsgWindowSubtype(u8 type) {
field_0x90C = type;
}
include/d/d_textwindow_unk.h
+1
View File
@@ -11,6 +11,7 @@ public:
virtual ~TextWindowUnk() {}
void fn_800B2130(const char *, dTextBox_c *, void*, bool);
void fn_800B2AA0();
void textAdvancingRelated(bool, bool);
const wchar_t *getProcessedText() const {
include/d/lyt/d_lyt_auto_caption.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
build(d2d::ResAccIf_c *resAcc1, d2d::ResAccIf_c *resAcc, dTagProcessor_c *tagProcessor) override;
/* vt 0x14 */ virtual bool remove() override;
/* vt 0x18 */ virtual bool execute() override;
/* vt 0x1C */ virtual void open() override;
/* vt 0x1C */ virtual void open(dAcObjBase_c *obj, u32 param) override;
/* vt 0x20 */ virtual bool isDoneOpening() const override;
/* vt 0x24 */ virtual void close() override;
/* vt 0x28 */ virtual bool isDoneClosing() const override;
include/d/lyt/d_lyt_auto_explain.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
build(d2d::ResAccIf_c *resAcc1, d2d::ResAccIf_c *resAcc, dTagProcessor_c *tagProcessor) override;
/* vt 0x14 */ virtual bool remove() override;
/* vt 0x18 */ virtual bool execute() override;
/* vt 0x1C */ virtual void open() override;
/* vt 0x1C */ virtual void open(dAcObjBase_c *obj, u32 param) override;
/* vt 0x20 */ virtual bool isDoneOpening() const override;
/* vt 0x24 */ virtual void close() override;
/* vt 0x28 */ virtual bool isDoneClosing() const override;
include/d/lyt/msg_window/d_lyt_msg_window.h
+5 -1
View File
@@ -6,6 +6,7 @@
#include "d/lyt/d2d.h"
#include "d/lyt/msg_window/d_lyt_msg_window_common.h"
#include "d/lyt/msg_window/d_lyt_msg_window_select_btn.h"
#include "m/m_vec.h"
#include "s/s_State.hpp"
#include "sized_string.h"
@@ -23,10 +24,10 @@ public:
bool remove();
private:
static bool isValidTextLabel(const char *name);
void setTextToDisplay(const wchar_t *text);
void createSubMsgManager(u8 type);
void removeSubMsgManagers();
bool fn_8011A5D0() const;
static dLytMsgWindow_c *sInstance;
@@ -68,6 +69,9 @@ private:
/* 0x748 */ dLytAutoExplain_c *mpAutoExplain;
/* 0x74C */ dLytAutoCaption_c *mpAutoCaption;
/* 0x750 */ u8 _0x750[0x768 - 0x750];
/* 0x768 */ mVec3_c field_0x768;
/* 0x774 */ s32 field_0x774;
/* 0x778 */ s32 field_0x778;
/* 0x77C */ s32 field_0x77C;
include/d/lyt/msg_window/d_lyt_msg_window_common.h
+2 -1
View File
@@ -2,6 +2,7 @@
#define D_LYT_MGS_WINDOW_COMMON_H
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_tag_processor.h"
#include "d/lyt/d2d.h"
#include "m/m2d.h"
@@ -13,7 +14,7 @@ public:
/* vt 0x10 */ virtual bool build(d2d::ResAccIf_c *resAcc1, d2d::ResAccIf_c *resAcc, dTagProcessor_c *tagProcessor);
/* vt 0x14 */ virtual bool remove();
/* vt 0x18 */ virtual bool execute();
/* vt 0x1C */ virtual void open();
/* vt 0x1C */ virtual void open(dAcObjBase_c *obj, u32 param);
/* vt 0x20 */ virtual bool isDoneOpening() const;
/* vt 0x24 */ virtual void close();
/* vt 0x28 */ virtual bool isDoneClosing() const;
include/d/lyt/msg_window/d_lyt_msg_window_stone.h
+1 -1
View File
@@ -18,7 +18,7 @@ public:
build(d2d::ResAccIf_c *resAcc1, d2d::ResAccIf_c *resAcc, dTagProcessor_c *tagProcessor) override;
/* vt 0x14 */ virtual bool remove() override;
/* vt 0x18 */ virtual bool execute() override;
/* vt 0x1C */ virtual void open() override;
/* vt 0x1C */ virtual void open(dAcObjBase_c *obj, u32 param) override;
/* vt 0x20 */ virtual bool isDoneOpening() const override;
/* vt 0x24 */ virtual void close() override;
/* vt 0x28 */ virtual bool isDoneClosing() const override;
include/d/lyt/msg_window/d_lyt_msg_window_wood.h
+2 -1
View File
@@ -1,6 +1,7 @@
#ifndef D_LYT_MSG_WINDOW_WOOD_H
#define D_LYT_MSG_WINDOW_WOOD_H
#include "d/a/obj/d_a_obj_base.h"
#include "d/d_tag_processor.h"
#include "d/lyt/d2d.h"
#include "d/lyt/d_lyt_common_a_btn.h"
@@ -18,7 +19,7 @@ public:
build(d2d::ResAccIf_c *resAcc1, d2d::ResAccIf_c *resAcc, dTagProcessor_c *tagProcessor) override;
/* vt 0x14 */ virtual bool remove() override;
/* vt 0x18 */ virtual bool execute() override;
/* vt 0x1C */ virtual void open() override;
/* vt 0x1C */ virtual void open(dAcObjBase_c *obj, u32 param) override;
/* vt 0x20 */ virtual bool isDoneOpening() const override;
/* vt 0x24 */ virtual void close() override;
/* vt 0x28 */ virtual bool isDoneClosing() const override;
include/toBeSorted/d_d3d.h
+4
View File
@@ -10,6 +10,7 @@
#include "m/m3d/m_proc.h"
#include "m/m_color.h"
#include "m/m_mtx.h"
#include "m/m_vec.h"
#include "nw4r/g3d/res/g3d_resfile.h"
#include "toBeSorted/tlist.h"
@@ -17,6 +18,9 @@
namespace d3d {
f32 fn_80016960(const mVec3_c&, const mVec3_c& pos);
bool fn_80016A90(const mVec3_c& pos);
class AnmMdlWrapper : protected m3d::mdlAnmChr {
public:
AnmMdlWrapper();
include/toBeSorted/event_manager.h
+3 -2
View File
@@ -3,11 +3,11 @@
#define EVENT_MANAGER_H
#include "common.h"
#include "d/a/obj/d_a_obj_base.h"
#include "f/f_base.h"
#include "sized_string.h"
#include "toBeSorted/event.h"
#include <cstring>
class dAcBase_c;
class EventManager {
@@ -16,6 +16,7 @@ public:
static bool finishEvent(dAcBase_c *actor, const char *eventName);
static void changeOwnEvent(dAcBase_c *actor1, dAcBase_c *actor2, Event *event, UNKWORD);
static bool alsoSetAsCurrentEvent(dAcBase_c *actor, Event *event, void *unknown);
static dAcObjBase_c *fn_800A08F0(fBase_c::GROUP_TYPE_e);
static EventManager *sInstance;
include/toBeSorted/music_mgrs.h
+1
View File
@@ -7,6 +7,7 @@ extern "C" void *BGM_MGR;
extern "C" void fn_8035E000();
extern "C" void fn_8035E860(void *);
extern "C" void fn_8035E310(void *);
extern "C" void fn_8035E820(void *);
extern "C" void fn_8035E880(void *);
extern "C" void *ENEMY_SOUND_MGR;