summaryrefslogtreecommitdiff
path: root/src/d/d_item.cpp
diff options
context:
space:
mode:
authorJulgodis <>2021-04-08 01:47:05 +0200
committerJulgodis <>2021-04-08 01:47:05 +0200
commita23a10639979ee10cbea5ffdadadc490d9e60227 (patch)
tree75a86f6d6760a9f4183f3e97606eb7747399a0a8 /src/d/d_item.cpp
parentdca1d2a1c032f239c65aa1b7767132c12e89f628 (diff)
demangle data-symbols
Diffstat (limited to 'src/d/d_item.cpp')
-rw-r--r--src/d/d_item.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/d/d_item.cpp b/src/d/d_item.cpp
index b498e3696d..d7b4befaca 100644
--- a/src/d/d_item.cpp
+++ b/src/d/d_item.cpp
@@ -62,10 +62,18 @@ struct dSv_info_c {
/* 80035200 */ void onSwitch(int, int);
};
+struct dSv_event_flag_c {
+ static u8 saveBitLabels[1644 + 4 /* padding */];
+};
+
struct dSv_event_c {
/* 8003498C */ void onEventBit(u16);
};
+struct dEnemyItem_c {
+ static u8 mData[4 + 4 /* padding */];
+};
+
struct dComIfG_play_c {
/* 8002B36C */ void setItemBombNumCount(u8, s16);
/* 8002C97C */ void getLayerNo(int);
@@ -461,7 +469,7 @@ extern "C" void isInsect__FUc();
extern "C" void check_itemno__Fi();
extern "C" static void addBombCount__FUcUc();
extern "C" extern char const* const d_d_item__stringBase0;
-extern "C" extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
+extern "C" u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
//
// External References:
@@ -506,7 +514,7 @@ extern "C" void _restgpr_20();
extern "C" void _restgpr_26();
extern "C" void _restgpr_29();
extern "C" void strncmp();
-extern "C" extern u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
+extern "C" u8 saveBitLabels__16dSv_event_flag_c[1644 + 4 /* padding */];
extern "C" extern u8 g_dComIfG_gameInfo[122384];
extern "C" extern u8 struct_80450D64[4];
@@ -4433,8 +4441,7 @@ static asm void addBombCount(u8 param_0, u8 param_1) {
/* ############################################################################################## */
/* 80450F90-80450F98 000490 0004+04 0/0 2/2 0/0 .sbss mData__12dEnemyItem_c */
-extern u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
-u8 mData__12dEnemyItem_c[4 + 4 /* padding */];
+u8 dEnemyItem_c::mData[4 + 4 /* padding */];
/* 8037B0D0-8037B0D8 007730 0007+01 1/1 0/0 0/0 .rodata @stringBase0 */
#pragma push