mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-17 20:43:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

move d_a_itembase_static / d_a_item_static / Z2StatusMgr (#123)

Browse Source 
* move d_a_itembase_static

* move d_a_item_static

* moved Z2StatusMgr

* clang

* fixes

* clang?

* move d_save

* move d_meter2_info

* some d_meter2_info fixes

* move most d_a_player

* move d_bg_s stuff

* move c_cc_s stuff

* move d_cc stuff

* move d_attention / d_event / d_stage
This commit is contained in:
TakaRikka
2021-05-02 10:13:14 -07:00
committed by GitHub
parent a9c78b5b0b
commit 2f4904dae2
234 changed files with 5861 additions and 6762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/a/d_a_itembase_static.cpp
+19 -69
View File
@@ -4,6 +4,7 @@
//
#include "d/a/d_a_itembase_static.h"
#include "SSystem/SComponent/c_lib.h"
#include "dol2asm.h"
#include "dolphin/types.h"
@@ -13,19 +14,6 @@
struct fopAc_ac_c {};
struct daItemBase_c {
/* 80037A5C */ void getItemNo();
/* 80037A64 */ void hide();
/* 80037A74 */ void show();
/* 80037A84 */ void changeDraw();
/* 80037ACC */ void chkDraw();
/* 80037AE4 */ void dead();
/* 80037AF4 */ void chkDead();
/* 8014475C */ void CreateItemHeap(char const*, s16, s16, s16, s16, s16, s16, s16);
static u8 const m_data[56];
};
struct dItem_data {
static void* item_resource[1530];
static void* field_item_res[1020];
@@ -58,75 +46,37 @@ extern "C" void* field_item_res__10dItem_data[1020];
// Declarations:
//
/* 80037A5C-80037A64 03239C 0008+00 2/2 2/2 2/2 .text getItemNo__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::getItemNo() {
nofralloc
#include "asm/d/a/d_a_itembase_static/getItemNo__12daItemBase_cFv.s"
u8 daItemBase_c::getItemNo() {
return mItemNo;
}
#pragma pop
/* 80037A64-80037A74 0323A4 0010+00 1/1 5/5 12/12 .text hide__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::hide() {
nofralloc
#include "asm/d/a/d_a_itembase_static/hide__12daItemBase_cFv.s"
void daItemBase_c::hide() {
cLib_offBit(unk2347, 1);
}
#pragma pop
/* 80037A74-80037A84 0323B4 0010+00 1/1 7/7 13/13 .text show__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::show() {
nofralloc
#include "asm/d/a/d_a_itembase_static/show__12daItemBase_cFv.s"
void daItemBase_c::show() {
cLib_onBit(unk2347, 1);
}
#pragma pop
/* 80037A84-80037ACC 0323C4 0048+00 0/0 1/1 0/0 .text changeDraw__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::changeDraw() {
nofralloc
#include "asm/d/a/d_a_itembase_static/changeDraw__12daItemBase_cFv.s"
void daItemBase_c::changeDraw() {
if (chkDraw()) {
hide();
} else {
show();
}
}
#pragma pop
/* 80037ACC-80037AE4 03240C 0018+00 1/1 1/1 9/9 .text chkDraw__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::chkDraw() {
nofralloc
#include "asm/d/a/d_a_itembase_static/chkDraw__12daItemBase_cFv.s"
u8 daItemBase_c::chkDraw() {
return cLib_checkBit(unk2347, 1) != 0;
}
#pragma pop
/* 80037AE4-80037AF4 032424 0010+00 0/0 3/3 0/0 .text dead__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::dead() {
nofralloc
#include "asm/d/a/d_a_itembase_static/dead__12daItemBase_cFv.s"
void daItemBase_c::dead() {
cLib_onBit(unk2347, 2);
}
#pragma pop
/* 80037AF4-80037B0C 032434 0018+00 0/0 0/0 1/1 .text chkDead__12daItemBase_cFv */
#pragma push
#pragma optimization_level 0
#pragma optimizewithasm off
asm void daItemBase_c::chkDead() {
nofralloc
#include "asm/d/a/d_a_itembase_static/chkDead__12daItemBase_cFv.s"
u8 daItemBase_c::chkDead() {
return cLib_checkBit(unk2347, 2) != 0;
}
#pragma pop
/* 80037B0C-80037B78 03244C 006C+00 0/0 0/0 1/1 .text CheckItemCreateHeap__FP10fopAc_ac_c
*/