mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-20 06:06:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_talk almost done

Browse Source
This commit is contained in:
TakaRikka
2023-06-27 16:14:31 -07:00
parent 2baa07dbf6
commit 1d6d179077
12 changed files with 140 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_attention.h
+2
View File
@@ -216,6 +216,8 @@ public:
int GetLockonCount() { return mLockonCount; }
bool Lockon() { return LockonTruth() || chkFlag(0x20000000); } // only matches with -O2?
static dist_entry& i_getDistTable(int i_no) { return dist_table[i_no]; }
static type_tbl_entry loc_type_tbl[3];
static type_tbl_entry act_type_tbl[5];
static dist_entry dist_table[234];
include/d/msg/d_msg_object.h
+5 -5
View File
@@ -121,12 +121,12 @@ public:
/* 802380F4 */ void getString(u32, J2DTextBox*, J2DTextBox*, JUTFont*, COutFont_c*, char*,
char*, char*, s16*);
/* 80238174 */ static u8* getMsgDtPtr();
/* 80238188 */ void setProcessID(unsigned int);
/* 80238188 */ static void setProcessID(unsigned int);
/* 8023819C */ static fopAc_ac_c* getActor();
/* 802381C0 */ void getpTalkActor();
/* 802381D4 */ void getIdx();
/* 802381E8 */ void getNodeIdx();
/* 802381FC */ void setStatus(u16);
/* 802381C0 */ static fopAc_ac_c* getpTalkActor();
/* 802381D4 */ static u32 getIdx();
/* 802381E8 */ static u16 getNodeIdx();
/* 802381FC */ static void setStatus(u16);
/* 8023822C */ static u16 getStatus();
/* 80238258 */ void getScrnDrawPtr();
/* 8023826C */ static void setTalkActor(fopAc_ac_c*);
include/f_op/f_op_actor.h
+2 -4
View File
@@ -87,10 +87,8 @@ struct actor_place {
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u8 field_0x0[4];
/* 0x04 */ u8 field_0x4[4];
/* 0x08 */ u8 field_0x8[2];
/* 0x0A */ u16 field_0xa;
/* 0x00 */ u8 field_0x0[9];
/* 0x0A */ s16 field_0xa;
/* 0x0C */ cXyz mPosition;
/* 0x18 */ u32 mFlags;
}; // Size = 0x1C
include/rel/d/a/d_a_talk/d_a_talk.h
+16 -1
View File
@@ -1,6 +1,21 @@
#ifndef D_A_TALK_H
#define D_A_TALK_H
#include "dolphin/types.h"
#include "f_op/f_op_actor_mng.h"
#include "d/msg/d_msg_flow.h"
class daTalk_c : public fopAc_ac_c {
public:
/* 80D66378 */ ~daTalk_c();
/* 80D663E4 */ int create();
/* 80D664AC */ int execute();
/* 80D6665C */ int draw();
/* 80D66664 */ void setStatus(u16);
/* 80D66688 */ u16 getStatus();
/* 80D666A8 */ u32 messageSet();
/* 0x568 */ dMsgFlow_c mMsgFlow;
/* 0x5B4 */ u32 mMessageID;
};
#endif /* D_A_TALK_H */