mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-02 09:51:47 -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?