mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-07-09 23:01:41 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into undecided

Browse Source
This commit is contained in:
Tal Hayon
2023-06-28 15:02:13 +03:00
parent a3c4cc486e 47edd67190
commit f7e5cc384f
95 changed files with 1009 additions and 3160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/J2DGraph/J2DAnmLoader.h
+1 -1
View File
@@ -5,7 +5,7 @@
#include "dolphin/types.h"
struct J2DAnmLoaderDataBase {
/* 80308A6C */ static void* load(void const*);
/* 80308A6C */ static J2DAnmBase* load(void const*);
};
class J2DAnmLoader {
include/d/com/d_com_inf_game.h
+4
View File
@@ -1702,6 +1702,10 @@ inline void dComIfGs_setOptCalibrateDist(u16 i_calibrateDist) {
g_dComIfG_gameInfo.info.getPlayer().getConfig().setCalibrateDist(i_calibrateDist);
}
inline u16 dComIfGs_getFishNum(u8 param_0) {
return g_dComIfG_gameInfo.info.getPlayer().getFishingInfo().getFishCount(param_0);
}
void dComIfGp_setSelectItem(int index);
s32 dComIfGp_offHeapLockFlag(int flag);
void dComIfGp_createSubExpHeap2D();
include/d/d_attention.h
+2
View File
@@ -219,6 +219,8 @@ public:
return mZHintTarget.request(param_1, param_2);
}
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/d_select_cursor.h
+2
View File
@@ -58,6 +58,8 @@ public:
void onPlayAnime(int i_flag) { field_0xb4 |= (1 << i_flag); }
void offPlayAnime(int i_flag) { field_0xb4 &= ~(1 << i_flag); }
bool chkPlayAnime(int i_flag) { return field_0xb4 & (1 << i_flag); }
void onPlayAllAnime() { field_0xb4 = 0xff; }
void offPlayAllAnime() { field_0xb4 = 0; }
private:
/* 0x04 */ J2DScreen* mpScreen;
include/d/menu/d_menu_collect.h
+11 -8
View File
@@ -20,6 +20,7 @@ class dSelect_cursor_c;
class dMenu_Collect2D_c;
class dMenu_Collect2DTop_c : public dDlst_base_c {
public:
dMenu_Collect2DTop_c(dMenu_Collect2D_c* param_0) { mpCollect2D = param_0; }
/* 801B77A4 */ virtual void draw();
/* 801B7EB8 */ virtual ~dMenu_Collect2DTop_c();
@@ -32,9 +33,9 @@ public:
/* 801AFEA4 */ void _create();
/* 801B0100 */ void _delete();
/* 801B0570 */ void initialize();
/* 801B05A8 */ void isFishIconVisible();
/* 801B061C */ void isSkillIconVisible();
/* 801B071C */ void isInsectIconVisible();
/* 801B05A8 */ bool isFishIconVisible();
/* 801B061C */ bool isSkillIconVisible();
/* 801B071C */ bool isInsectIconVisible();
/* 801B074C */ void screenSet();
/* 801B1C3C */ void animationSet();
/* 801B1CE0 */ void btkAnimeLoop0(J2DAnmTextureSRTKey*);
@@ -105,6 +106,8 @@ public:
/* 801B7F00 */ virtual void draw();
/* 801AFE34 */ virtual ~dMenu_Collect2D_c();
u8 getCursorX() { return mCursorX; }
u8 getCursorY() { return mCursorY; }
u8 getSubWindowOpenCheck() { return mSubWindowOpenCheck; }
private:
@@ -311,12 +314,12 @@ public:
/* 801B6FB0 */ void animeEntry();
/* 801B7014 */ void createMaskModel();
/* 801B71C4 */ void createMirrorModel();
/* 801B7434 */ void getCrystalNum();
/* 801B749C */ void getMirrorNum();
/* 801B7434 */ int getCrystalNum();
/* 801B749C */ int getMirrorNum();
/* 801B7504 */ void getMaskMdlVisible();
/* 801B75E8 */ static void setupItem3D(f32 (*)[4]);
/* 801B75E8 */ static void setupItem3D(Mtx);
/* 801B7660 */ void toItem3Dpos(f32, f32, f32, cXyz*);
/* 801B774C */ void calcViewMtx(f32 (*)[4]);
/* 801B774C */ static void calcViewMtx(Mtx);
/* 801B6538 */ virtual ~dMenu_Collect3D_c();
@@ -331,7 +334,7 @@ private:
/* 0x018 */ J3DModel* mpModel;
/* 0x01C */ mDoExt_bckAnm* field_0x1c;
/* 0x020 */ mDoExt_brkAnm* field_0x20;
/* 0x024 */ u8 field_0x24[4];
/* 0x024 */ u32 field_0x24;
/* 0x028 */ dKy_tevstr_c field_0x28;
/* 0x3B0 */ cXyz field_0x3b0;
/* 0x3BC */ csXyz field_0x3bc;
include/d/menu/d_menu_insect.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
/* 801D9644 */ void screenSetBase();
/* 801D98F0 */ void screenSetExplain();
/* 801D9BD0 */ void screenSetDoIcon();
/* 801D9D4C */ void getGetInsectNum();
/* 801D9D4C */ static u8 getGetInsectNum();
/* 801D9DCC */ void getInsectItemID(int, int);
/* 801D9DE4 */ void isGetInsect(int, int);
/* 801D9E20 */ void isGiveInsect(int, int);
include/d/meter/d_meter2_info.h
+8
View File
@@ -151,6 +151,10 @@ public:
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
void resetDirectUseItem() { mDirectUseItem = 0; }
u16 getFloatingFlowID() { return mFloatingFlowID; }
void setCollectCursorPosXY(u8 x, u8 y) {
mCollectCursorPosX = x;
mCollectCursorPosY = y;
}
public:
/* 0x04 */ u8 unk4[4];
@@ -550,6 +554,10 @@ inline u16 dMeter2Info_getFloatingFlowID() {
return g_meter2_info.getFloatingFlowID();
}
inline void dMeter2Info_setCollectCursorPosXY(u8 x, u8 y) {
g_meter2_info.setCollectCursorPosXY(x, y);
}
const char* dMeter2Info_getNumberTextureName(int pIndex);
void dMeter2Info_recieveLetter();
u8 dMeter2Info_getNewLetterNum();
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/d/save/d_save.h
+2
View File
@@ -678,6 +678,7 @@ class dSv_fishing_info_c {
public:
void init();
void addFishCount(u8 i_fishIndex);
u16 getFishCount(u8 i_fishIndex) { return mFishCount[i_fishIndex]; }
private:
/* 0x00 */ u16 mFishCount[16];
@@ -768,6 +769,7 @@ public:
dSv_player_get_item_c& getGetItem() { return mGetItem; }
dSv_player_config_c& getConfig() { return mConfig; }
dSv_letter_info_c& getLetterInfo() { return mLetterInfo; }
dSv_fishing_info_c& getFishingInfo() { return mFishingInfo; }
dSv_player_field_last_stay_info_c& getPlayerFieldLastStayInfo() {
return mPlayerFieldLastStayInfo;
}
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/m_Do/m_Do_graphic.h
+1
View File
@@ -73,6 +73,7 @@ public:
static f32 getMinXF() { return 0.0f; }
static f32 getMaxYF() { return 448.0f; }
static f32 getMaxXF() { return 608.0f; }
static f32 getAspect() { return 1.3571428f; }
static int getMinY() { return 0; }
static int getMinX() { return 0; }
static int getMaxY() { return 448; }
include/m_Do/m_Do_mtx.h
+2 -2
View File
@@ -19,8 +19,8 @@ void mDoMtx_XrotM(Mtx, s16);
void mDoMtx_YrotM(Mtx, s16);
void mDoMtx_ZrotM(Mtx, s16);
void mDoMtx_MtxToRot(CMtxP, csXyz*);
void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, s16 param_3);
void mDoMtx_lookAt(f32 (*param_0)[4], Vec const* param_1, Vec const* param_2, Vec const* param_3,
void mDoMtx_lookAt(Mtx param_0, Vec const* param_1, Vec const* param_2, s16 param_3);
void mDoMtx_lookAt(Mtx param_0, Vec const* param_1, Vec const* param_2, Vec const* param_3,
s16 param_4);
void mDoMtx_concatProjView(f32 const (*param_0)[4], f32 const (*param_1)[4], f32 (*param_2)[4]);
void mDoMtx_ZrotM(Mtx mtx, s16 z);
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 */