mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 22:40:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_agb cleanup

Browse Source
This commit is contained in:
LagoLunatic
2023-11-26 15:28:53 -05:00
parent b9490ec082
commit ff6162dbee
5 changed files with 144 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_agb.h
+14 -6
View File
@@ -91,7 +91,9 @@ public:
void getTargetID() {}
void setTargetID(unsigned int) {}
static int mEffect;
struct daAgb_ItemBuy {
/* 0x0 */ u8 field_0x0;
} __attribute__((aligned(4)));
struct daAgb_GbaFlg {
/* 0x0 */ u16 field_0x0;
@@ -100,7 +102,6 @@ public:
/* 0x4 */ u16 field_0x4;
/* 0x6 */ u16 field_0x6;
};
static daAgb_GbaFlg mGbaFlg;
struct daAgb_Switch {
/* 0x0 */ u8 field_0x0;
@@ -110,15 +111,22 @@ public:
/* 0x4 */ u8 field_0x4;
u8 field_0x5[0x8 - 0x5];
};
static daAgb_Switch mSwitch;
struct daAgb_Item {
/* 0x0 */ u8 field_0x0;
/* 0x1 */ u8 field_0x1;
};
} __attribute__((aligned(4)));
struct daAgb_Shop {
/* 0x0 */ u8 field_0x0;
} __attribute__((aligned(4)));
static int mEffect;
static daAgb_ItemBuy mItemBuy;
static daAgb_GbaFlg mGbaFlg;
static daAgb_Switch mSwitch;
static daAgb_Item mItem;
static u8 mShop;
static u8 mItemBuy;
static daAgb_Shop mShop;
static u8 DungeonNoTable[];
struct daAgb_Flags {
include/d/d_stage.h
+6 -6
View File
@@ -1035,13 +1035,13 @@ inline u8 dStage_FileList_dt_DarkNo(dStage_FileList_dt_c* i_fili) {
return (i_fili->mParam & 0x78) >> 3;
}
// inline u8 dStage_FileList_dt_CheckAgbCom(dStage_FileList_dt_c* i_fili) {
// }
inline u8 dStage_FileList_dt_CheckAgbCom(dStage_FileList_dt_c* i_fili) {
return i_fili->mParam & 2;
}
// inline u8 dStage_FileList_dt_CheckAgbHover(dStage_FileList_dt_c* i_fili) {
// }
inline u8 dStage_FileList_dt_CheckAgbHover(dStage_FileList_dt_c* i_fili) {
return i_fili->mParam & 4;
}
// inline u8 dStage_FileList_dt_GetSongOk(dStage_FileList_dt_c* i_fili) {
// maybe 0x40000000?
include/m_Do/m_Do_gba_com.h
+62 -1
View File
@@ -54,9 +54,14 @@ public:
void mDoGaC_GbaRead();
void mDoGaC_ReadResult();
~mDoGaC_agbCom_c();
~mDoGaC_agbCom_c() {}
u8 getEnable() { return field_0x0; }
void onEnable() { field_0x0 = 1; }
u8 getPortNo() { return mPortNo; }
void setPortNo(u8 port) { mPortNo = port; }
u8 getDataStatus(u8 param_0) { return field_0x110[param_0].field_0x4; }
void getReConnect() {} // TODO
/* 0x000 */ u8 field_0x0;
/* 0x001 */ u8 field_0x1;
@@ -106,8 +111,64 @@ extern mDoGaC_DataManag_c TestDataManager[16];
u32 BigLittleChange(u32);
inline int mDoGaC_GbaLink() {
return g_mDoGaC_gbaCom.mDoGaC_GbaLink();
}
inline u8 mDoGaC_getComEnable() {
return g_mDoGaC_gbaCom.getEnable();
};
inline void mDoGaC_onComEnable() {
g_mDoGaC_gbaCom.onEnable();
}
inline void mDoGaC_ComStart() {
g_mDoGaC_gbaCom.mDoGaC_ComStart();
}
inline u8 mDoGaC_getPortNo() {
return g_mDoGaC_gbaCom.getPortNo();
}
inline void mDoGaC_setPortNo(u8 port) {
g_mDoGaC_gbaCom.setPortNo(port);
}
inline void mDoGaC_GbaReboot() {
g_mDoGaC_gbaCom.mDoGaC_GbaReboot();
}
inline void mDoGac_SendDataSet(u32* param_0, int param_1, u8 param_2, u32 param_3) {
g_mDoGaC_gbaCom.mDoGaC_SendDataSet(param_0, param_1, param_2, param_3);
}
inline void mDoGac_SendEndCheck(u8 param_0) {
g_mDoGaC_gbaCom.mDoGaC_SendEndCheck(param_0);
}
inline BOOL mDoGac_SendStatusCheck(u8 param_0) {
return g_mDoGaC_gbaCom.mDoGaC_SendStatusCheck(param_0);
}
inline BOOL mDoGaC_RecvStatusCheck(u8 param_0) {
return g_mDoGaC_gbaCom.mDoGaC_RecvStatusCheck(param_0);
}
inline void mDoGaC_DataStatusReset(u8 param_0) {
g_mDoGaC_gbaCom.mDoGaC_DataStatusReset(param_0);
}
inline u8 mDoGaC_getDataStatus(u8 param_0) {
return g_mDoGaC_gbaCom.getDataStatus(param_0);
}
inline void mDoGaC_ConnectWake() {
g_mDoGaC_gbaCom.mDoGaC_ConnectWake();
}
inline void mDoGaC_ConnectSleep() {
g_mDoGaC_gbaCom.mDoGaC_ConnectSleep();
}
#endif /* M_DO_GBA_COM_H */