arrange file-local type definitions, constants, and objects into an unnamed namespace

This commit is contained in:
Max
2020-10-18 18:24:23 -04:00
parent f18777bd8f
commit e773605fd4
3 changed files with 26 additions and 27 deletions
-3
View File
@@ -1,3 +0,0 @@
.include "macros.inc"
.section .text, "ax" # 0x80006980 - 0x803E1E60
-1
View File
@@ -219,7 +219,6 @@ SPLIT_O_FILES := \
$(BUILD_DIR)/asm/SDK/NdevExi2A/exi2.o \
$(BUILD_DIR)/src/code_801DAA30.o \
$(BUILD_DIR)/src/code_801DAAE0.o \
$(BUILD_DIR)/asm/code_801DAAE0_asm.o \
$(BUILD_DIR)/asm/code_801DB040.o \
$(BUILD_DIR)/asm/code_801DB81C.o \
$(BUILD_DIR)/asm/code_801DBB3C.o \
+26 -23
View File
@@ -4,31 +4,34 @@
#include "Runtime/__mem.h"
#include "SDK/mem.h"
namespace
{
struct unkClass
{
u8 unk0;
MEMHeapHandle unk4;
u32 unk8;
};
struct unkClass2
{
MEMHeapHandle heap;
u16 groupID;
u32 unk8;
};
const size_t ARR_SIZE = 16;
unkClass gUnk804912B0[ARR_SIZE];
unkStruct gUnk8063F2D0(1, 4, 0);
u8 gUnk8063F2D6;
u8 gUnk8063F2D7;
MEMHeapHandle gUnk8063F2D8;
u16 gUnk8063F2DC;
}
extern "C" {
struct unkClass
{
u8 unk0;
MEMHeapHandle unk4;
u32 unk8;
};
struct unkClass2
{
MEMHeapHandle heap;
u16 groupID;
u32 unk8;
};
#define ARR_SIZE 16
unkClass gUnk804912B0[ARR_SIZE];
unkStruct gUnk8063F2D0(1, 4, 0);
u8 gUnk8063F2D6;
u8 gUnk8063F2D7;
MEMHeapHandle gUnk8063F2D8;
u16 gUnk8063F2DC;
static unkClass* func_801DAAE0(void)
{
for (u32 i = 0; i < ARR_SIZE; i++)