mirror of
https://github.com/zeldaret/tmc
synced 2026-07-08 22:44:46 -04:00
clang-format pass and workflow
This commit is contained in:
+2
-2
@@ -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,
|
||||
|
||||
|
||||
+4
-4
@@ -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*);
|
||||
|
||||
+6
-5
@@ -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) \
|
||||
{ \
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -193,5 +193,4 @@ extern void sub_0805E0FC();
|
||||
|
||||
void (*const gManagerFunctions[58])();
|
||||
|
||||
|
||||
#endif
|
||||
|
||||
@@ -172,7 +172,6 @@ extern void NPC58_Head(Entity*);
|
||||
|
||||
extern u32 UpdateFuseInteraction(Entity*);
|
||||
|
||||
|
||||
void (*const gNPCFunctions[128][3])(Entity*);
|
||||
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@
|
||||
|
||||
typedef enum {
|
||||
SAVE_BUSY = 0,
|
||||
SAVE_OK = 1,
|
||||
SAVE_OK = 1,
|
||||
SAVE_ERROR = -1,
|
||||
} SaveResult;
|
||||
|
||||
|
||||
+2
-2
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user