clang-format and newlines

This commit is contained in:
theo3
2020-11-13 23:27:50 -08:00
parent 8fd7481395
commit 3079c016b4
236 changed files with 4010 additions and 4415 deletions
+1 -2
View File
@@ -3,7 +3,6 @@
#include "global.h"
typedef struct {
u8 areaMetadata;
u8 locationIndex;
@@ -17,7 +16,7 @@ typedef struct {
u8 field_0x16;
u8 field_0x17;
u8 field_0x18;
//u8 filler3[7];
// u8 filler3[7];
u8 fadeOut;
u8 filler2[14];
u8 filler4[0x835];
+1 -1
View File
@@ -1 +1 @@
Entity* CreateEnemy(u8, u8);
Entity* CreateEnemy(u8, u8);
+1 -1
View File
@@ -13,4 +13,4 @@ typedef struct {
s32 targetY;
} CutsceneBehavior;
#endif
#endif
+1 -1
View File
@@ -112,4 +112,4 @@ extern u32 GetNextFunction(Entity*);
extern void EnemyFunctionHandler(Entity*, void (*const func[])(Entity*));
extern void sub_0804AA30(Entity*, void (*const func[])(Entity*));
extern void sub_08001324(Entity*);
#endif
#endif
+1 -1
View File
@@ -132,4 +132,4 @@ enum {
/*0x64*/ CASTLE_BGM, /* Castle intro BGM */
};
#endif
#endif
+6 -6
View File
@@ -37,13 +37,13 @@ extern void _DmaZero(void* src, u32 count);
extern void EraseAllEntities(void);
extern void SetTile(u32, u32, u32);
extern void SetDirtTile(u32);
extern void LoadRoomTileEntities(); //tba
extern void LoadRoomTileEntities(); // tba
extern Entity* CreateDeathFx(Entity*, u32, u32);
extern void UpdateAnimationVariableFrames(Entity*, u32);
extern void CopyPositionAndSpriteOffset(Entity*, Entity*);
extern u8* GetSpriteSubEntryOffsetDataPointer(u32, u32);
extern u32 LoadFixedGFX(Entity*, u32);
extern void ExecuteScriptCommandSet(Entity*, void *);
extern void ExecuteScriptCommandSet(Entity*, void*);
extern void _DmaFill32(u32, void*, u32);
extern Entity* CreateItemEntity(u32, u32, u32);
@@ -99,16 +99,16 @@ extern void sub_0804A720(Entity*);
extern u32 sub_080AEFE0(Entity*);
extern u32 sub_08049FA0(Entity*);
extern u32 sub_08049FDC(Entity*, u32);
extern u32 sub_080041A0(Entity *, Entity *, u32, u32);
extern u32 sub_080041A0(Entity*, Entity*, u32, u32);
extern u32 sub_08049EE4(Entity*);
extern Entity *sub_0804A98C(Entity *, u8, u8);
extern Entity* sub_0804A98C(Entity*, u8, u8);
extern u32 sub_080544DC(u8);
extern void sub_08077E54(Entity*);
extern void sub_080042BA(Entity*, u32);
extern void _DmaZero(void*, u32);
extern void sub_08077F24(ItemBehavior*, u32);
extern void sub_08079184();
extern void sub_08077F50(ItemBehavior *beh, u32 arg1);
extern void sub_08077F50(ItemBehavior* beh, u32 arg1);
extern void sub_0807AA80(Entity*);
extern s32 sub_0807887C(Entity*, u32, u32);
extern s32 sub_08078904();
@@ -210,7 +210,7 @@ extern u32 sub_08052638(u32);
extern void sub_0805616C(void);
extern u32 sub_0807CF08(u32, u8*);
extern void sub_0807CF48(u32);
extern u32 sub_0807CF10(u8 *);
extern u32 sub_0807CF10(u8*);
extern void sub_08056208(void);
extern void sub_08050384();
extern void sub_080B1520(u32);
+1 -2
View File
@@ -44,10 +44,9 @@ extern u8 gUnk_0812079C[8];
extern s16 gSineTable[];
extern s8 gUnk_081207AC[];
typedef struct {
s32 unk0;
s32 unk4;
} struct_08087424;
#endif
#endif
+1 -1
View File
@@ -162,4 +162,4 @@ void extern JarEmpty(ItemBehavior*, u32);
LongSpin = 0x75
} ItemType;
*/
#endif
#endif
+1 -2
View File
@@ -54,7 +54,6 @@ typedef struct {
extern Main gUnk_03001000;
extern UI gUnk_02032EC0;
extern void sub_080A3204(void);
extern void sub_0807CE90(void);
extern void sub_080560B8(void);
@@ -74,4 +73,4 @@ extern void sub_08056458(void);
extern void sub_08050154(void);
extern void sub_080A3480(void);
#endif
#endif
+1 -1
View File
@@ -24,7 +24,7 @@ typedef struct Manager {
/*0x0f*/ u8 unk_0f;
/*0x10*/ u8 unk_10;
/*0x11*/ u8 unk_11[3];
/*0x14*/ struct Manager * parent;
/*0x14*/ struct Manager* parent;
/*0x18*/ u8 unk_18[0x8];
// union SplitHWord unk_20;
// u16 unk_22;
+1 -1
View File
@@ -41,4 +41,4 @@ typedef struct {
extern Menu gMenu;
#endif
#endif
+1 -2
View File
@@ -172,5 +172,4 @@ extern void NPC58_Head(Entity*);
extern u32 UpdateFuseInteraction(Entity*);
#endif
#endif
+1 -1
View File
@@ -199,4 +199,4 @@ extern void ObjectBF(Entity*);
extern void EnemyItem(Entity*);
extern void ObjectC1(Entity*);
#endif
#endif
+1 -1
View File
@@ -11,4 +11,4 @@ void sub_0806FA90(Entity*, Entity*, s32, s32);
void ResolveEntityOnTop(Entity*, Entity*);
void sub_0806FAD8(Entity*, Entity*);
#endif
#endif
+1 -1
View File
@@ -5,4 +5,4 @@ extern u32 Random(void);
extern u32 gRand;
#endif
#endif
+14 -15
View File
@@ -37,22 +37,22 @@ typedef struct {
} RoomControls;
typedef struct {
u8 filler[4];
u8 filler[4];
u8 field_0x4;
u8 filler1[1];
u8 itemForSaleIndex;
u8 field_0x7;
u8 itemForSaleIndex;
u8 field_0x7;
u8 field_0x8;
u8 field_0x9;
u8 unk2;
u8 filler2[5];
u8 unk_10;
u8 filler6[3];
u32 roomFlags;
u8 unk2;
u8 filler2[5];
u8 unk_10;
u8 filler6[3];
u32 roomFlags;
u32 unk3;
u8 filler4[48];
u8 filler5[28];
u32 greatFairyState;
u8 filler4[48];
u8 filler5[28];
u32 greatFairyState;
u32* field_0x6c;
u32* field_0x70;
u32* field_0x74;
@@ -61,13 +61,12 @@ typedef struct {
void* field_0x88;
} RoomVars;
//Packets used to store which entities to load in a room
// Packets used to store which entities to load in a room
typedef struct {
u8 type : 4;
u8 type : 4;
u8 layer : 4;
u8 flags : 4;
u8 unk : 4;
u8 unk : 4;
u8 subtype;
u8 form;
u32 parameter;
+1 -1
View File
@@ -36,4 +36,4 @@ typedef struct {
u8 unk;
} SpriteLoadData;
#endif
#endif
+1 -1
View File
@@ -24,4 +24,4 @@ extern TextBox gTextBox;
void TextboxNoOverlap(u32 index, Entity* ent);
void extern TextboxNoOverlapFollow(u32 index);
#endif
#endif