summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authortheo3 <arisstephenson2@gmail.com>2021-02-19 15:03:20 -0800
committertheo3 <arisstephenson2@gmail.com>2021-02-19 15:11:40 -0800
commit31f324e3a7e4d0dec27d85ee6b50a42ec6df8f7b (patch)
treefde6bcff3bf8746c7af2e3f9f1dae572e01159c7 /include
parentfd2a50eee48c9c5d550ec435abccc38ae6dd5a85 (diff)
clang-format pass and workflow
Diffstat (limited to 'include')
-rw-r--r--include/audio.h4
-rw-r--r--include/functions.h8
-rw-r--r--include/gba/macro.h11
-rw-r--r--include/gba/syscall.h15
-rw-r--r--include/manager.h1
-rw-r--r--include/npc.h1
-rw-r--r--include/save.h2
-rw-r--r--include/script.h4
8 files changed, 23 insertions, 23 deletions
diff --git a/include/audio.h b/include/audio.h
index 3690de89..0f1a1b40 100644
--- a/include/audio.h
+++ b/include/audio.h
@@ -145,7 +145,7 @@ typedef enum {
SFX_VO_MINISH2,
SFX_VO_MINISH3,
SFX_VO_MINISH4,
-
+
SFX_REM_SLEEP = 0xCC,
SFX_TASK_COMPLETE,
SFX_KEY_APPEAR,
@@ -183,7 +183,7 @@ typedef enum {
SFX_APPARATE,
SFX_F8,
SFX_TELEPORTER,
-
+
SFX_ITEM_BOMB_EXPLODE = 0xFD,
SFX_HIT,
diff --git a/include/functions.h b/include/functions.h
index f3213239..9e8b7d0b 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -284,10 +284,10 @@ extern void sub_0801E00C();
extern void sub_08050038(u32);
extern void sub_080500F4(u32);
extern void sub_08050110(u32, u32, u32, u32);
-extern u32 sub_08052734(); //has Dungeon Map?
-extern u32 sub_08052764(); //has Dungeon Compass?
-extern u32 sub_0805279C(); //has Dungeon Big Key?
-extern u32 sub_080527CC(); //num Dungeon small keys?
+extern u32 sub_08052734(); // has Dungeon Map?
+extern u32 sub_08052764(); // has Dungeon Compass?
+extern u32 sub_0805279C(); // has Dungeon Big Key?
+extern u32 sub_080527CC(); // num Dungeon small keys?
extern u32 sub_08053FE0();
extern void sub_08078790(Entity*, u32);
extern void sub_080788E0(Entity*);
diff --git a/include/gba/macro.h b/include/gba/macro.h
index 2fa1abb2..b08ed921 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -167,11 +167,12 @@
#define DmaClear16Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 16)
#define DmaClear32Defvars(dmaNum, dest, size) DmaClearDefvars(dmaNum, dest, size, 32)
-#define DmaWait(DmaNo) \
-{ \
- vu32 *(DmaCntp) = (vu32 *)REG_ADDR_DMA##DmaNo; \
- while (DmaCntp[2] & (DMA_ENABLE << 16)) ; \
-}
+#define DmaWait(DmaNo) \
+ { \
+ vu32*(DmaCntp) = (vu32*)REG_ADDR_DMA##DmaNo; \
+ while (DmaCntp[2] & (DMA_ENABLE << 16)) \
+ ; \
+ }
#define IntrEnable(flags) \
{ \
diff --git a/include/gba/syscall.h b/include/gba/syscall.h
index d319a9fe..0c07bcbb 100644
--- a/include/gba/syscall.h
+++ b/include/gba/syscall.h
@@ -11,17 +11,18 @@
#define RESET_REGS 0x80
#define RESET_ALL 0xFF
-#define SystemCall(x) { asm("svc " #x); }
+#define SystemCall(x) \
+ { asm("svc " #x); }
extern void SoundBiasReset();
extern void SoundBiasSet();
-#define Stop() \
-{ \
- SoundBiasReset(); \
- SystemCall(3); \
- SoundBiasSet(); \
-}
+#define Stop() \
+ { \
+ SoundBiasReset(); \
+ SystemCall(3); \
+ SoundBiasSet(); \
+ }
void SoftReset(u32 resetFlags);
diff --git a/include/manager.h b/include/manager.h
index a0d8eb1c..f292baf2 100644
--- a/include/manager.h
+++ b/include/manager.h
@@ -193,5 +193,4 @@ extern void sub_0805E0FC();
void (*const gManagerFunctions[58])();
-
#endif
diff --git a/include/npc.h b/include/npc.h
index 024a9a43..b27a82f9 100644
--- a/include/npc.h
+++ b/include/npc.h
@@ -172,7 +172,6 @@ extern void NPC58_Head(Entity*);
extern u32 UpdateFuseInteraction(Entity*);
-
void (*const gNPCFunctions[128][3])(Entity*);
#endif
diff --git a/include/save.h b/include/save.h
index 83ef1e3f..eaf1eaf5 100644
--- a/include/save.h
+++ b/include/save.h
@@ -11,7 +11,7 @@
typedef enum {
SAVE_BUSY = 0,
- SAVE_OK = 1,
+ SAVE_OK = 1,
SAVE_ERROR = -1,
} SaveResult;
diff --git a/include/script.h b/include/script.h
index 93b7554c..9abc5291 100644
--- a/include/script.h
+++ b/include/script.h
@@ -31,6 +31,6 @@ extern void StartPlayerScript(u16*);
extern void sub_0807DEDC(Entity*, ScriptExecutionContext*, u32, u32);
extern ScriptExecutionContext* StartCutscene(Entity*, u16*);
-extern void sub_0807DDAC(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
-extern void sub_0807DD94(Entity*, void(*function)(Entity*, ScriptExecutionContext*));
+extern void sub_0807DDAC(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
+extern void sub_0807DD94(Entity*, void (*function)(Entity*, ScriptExecutionContext*));
#endif