file clean-up

This commit is contained in:
DizzyEggg
2025-07-09 12:59:18 +02:00
parent 2d6aa48f9d
commit 6ec3fc7013
37 changed files with 272 additions and 359 deletions

View File

@@ -3,17 +3,60 @@
#include "structs/sprite_oam.h"
#include "structs/str_position.h"
#include "code_800E9A8.h"
#include "structs/code_800E9E4.h"
s32 sub_800E890(unkStruct_80416E0 *);
typedef struct unkStruct_80416E0
{
s32 unk0;
s32 unk4;
s32 dir;
DungeonPos pos1;
DungeonPos pos2;
s32 unk14;
u32 unk18;
unkStruct_2039DB0 spriteMasks;
} unkStruct_80416E0;
void sub_800DC14(s32);
bool8 sub_800E9A8(s32);
void sub_800DAC0(u32);
struct UnkStruct_8040094
{
u16 unk0;
s16 unk2;
DungeonPos unk4;
DungeonPos unk8;
s32 unkC;
s32 unk10;
};
void sub_800DAC0(u32 fileSelection);
void sub_800DB7C(void);
void sub_800DBBC(void);
bool8 sub_800E90C(DungeonPos *);
void sub_800DC14(s32 param_1);
s32 sub_800DC9C(s32 a0);
s32 sub_800E308(struct UnkStruct_8040094 *a0, DungeonPos *a1);
void sub_800E3AC(s32 a0, DungeonPos *pos, s32 a2);
s32 sub_800E448(u8 a0, DungeonPos *pos);
s32 sub_800E49C(u8 a0, DungeonPos *pos, DungeonPos posArray[4], bool8 a3, s32 a4);
s32 sub_800E52C(struct UnkStruct_8040094 *a0);
s32 sub_800E6D8(s32 a0);
s32 sub_800E700(s32 a0);
s32 sub_800E710(s32 a0_, s32 a1);
s32 sub_800E790(s32 a0_, s32 a1);
bool8 sub_800E7D0(u16 *param_1);
bool8 sub_800E838(u16 *param_1, s32 param_2);
s32 sub_800E890(unkStruct_80416E0 *param_1);
void sub_800E8AC(s32 a0, DungeonPos *a1, DungeonPos *a2, s32 a3, unkStruct_2039DB0 *a4);
bool8 sub_800E90C(DungeonPos *param_1);
void sub_800E970(void);
bool8 sub_800E9A8(s32 a0);
bool8 sub_800E9E4(u32 param_1);
bool8 sub_800E9FC(u8 a0);
u8 sub_800EA44(unkStruct_800EA44 param_1, s32 param_2);
s32 sub_800EA84(struct UnkStruct_8040094 *a0);
void sub_800EB24(s32 param_1, DungeonPos *param_2, DungeonPos *param_3, s32 r5, s32 r4);
s32 sub_800EBC8(struct UnkStruct_8040094 *a0);
u8 sub_800EC74(void);
u8 sub_800EC84(s32 param_1);
u8 sub_800EC94(s32 param_1);
#endif // GUARD_CODE_800DAC0_H

View File

@@ -1,76 +0,0 @@
#ifndef GUARD_CODE_800E9A8_H
#define GUARD_CODE_800E9A8_H
#include "structs/axdata.h"
#include "structs/sprite_oam.h"
#include "structs/str_position.h"
#include "structs/str_file_system.h"
#include "structs/str_8009A7C.h"
struct unkStruct_203B0CC_x94
{
struct Struct_8009A7C sub;
s32 unk14;
s32 unk18;
s32 fill1C;
u8 unk20;
};
typedef struct unkStruct_80416E0
{
s32 unk0;
s32 unk4;
s32 dir;
DungeonPos pos1;
DungeonPos pos2;
s32 unk14;
u32 unk18;
unkStruct_2039DB0 spriteMasks;
} unkStruct_80416E0;
struct unkStruct_203B0CC_sub
{
// size: 0xD0
u32 unk0;
s32 unk4;
s32 unk8;
unkStruct_80416E0 unkC;
u32 unk34;
u32 effectID;
s32 paletteNum;
s32 unk40;
s32 unk44;
s32 unk48;
u32 unk4C;
s32 unk50;
u8 unk54;
u8 unk55;
axdata unk58;
struct unkStruct_203B0CC_x94 unk94;
OpenedFile *unkB8;
DungeonPos unkBC;
DungeonPos unkC0;
s16 unkC4;
DungeonPos unkC8;
DungeonPos unkCC;
};
#define UNK_203B0CC_ARR_COUNT 0x20
struct unkStruct_203B0CC
{
// size: 0x1A18
struct unkStruct_203B0CC_sub unk0[UNK_203B0CC_ARR_COUNT];
s32 unk1A00;
/* 0x1A04 */ u32 fileSelection;
s32 unk1A08;
s32 unk1A0C;
s32 unk1A10;
u16 unk1A14;
};
bool8 sub_800E9A8(s32 a0);
bool8 sub_800E9E4(u32);
bool8 sub_800E9FC(u8 a0);
#endif

View File

@@ -13,6 +13,8 @@ typedef struct unkStruct_2039DB0
u16 unkA; // SpriteOAM attrib3 value
} unkStruct_2039DB0;
#define DEFAULT_UNK_2039DB0_MASKS (unkStruct_2039DB0) {0xFFFF, 0xFFFF, 0xFFFF, 0, 0, 0}
// size: 0x8. Similar to struct OamData but unk6 is not copied to OAM
typedef struct SpriteOAM
{