Fix all headers to comply with C standard (#957)

* Fix all headers to comply with C standard * fix a file in libultra * Update include/stdbool.h Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com> * Update stdbool.h * Update z64animation.h Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-06-25 22:09:34 +00:00 · 2021-09-15 19:24:19 -04:00 · 2021-09-15 19:24:19 -04:00 · e3f1ccd902
commit e3f1ccd902
parent fbc4071cc8
524 changed files with 1051 additions and 1050 deletions
--- a/include/alloca.h
+++ b/include/alloca.h
@ -1,5 +1,5 @@
-#ifndef _ALLOCA_H_
-#define _ALLOCA_H_
+#ifndef ALLOCA_H
+#define ALLOCA_H

 void* alloca(u32);
 #define alloca  __builtin_alloca
--- a/include/color.h
+++ b/include/color.h
@ -1,5 +1,5 @@
-#ifndef _COLOR_H_
-#define _COLOR_H_
+#ifndef COLOR_H
+#define COLOR_H

 typedef struct {
    u8 r, g, b;
--- a/include/command_macros_base.h
+++ b/include/command_macros_base.h
@ -1,5 +1,5 @@
-#ifndef _COMMAND_MACROS_BASE_H_
-#define _COMMAND_MACROS_BASE_H_
+#ifndef COMMAND_MACROS_BASE_H
+#define COMMAND_MACROS_BASE_H

 /**
 * Command Base macros intended for use in designing of more specific command macros
--- a/include/fp.h
+++ b/include/fp.h
@ -1,5 +1,5 @@
-#ifndef _FP_H_
-#define _FP_H_
+#ifndef FP_H
+#define FP_H
 #include "ultra64.h"

 extern f32 qNaN0x3FFFFF;
--- a/include/functions.h
+++ b/include/functions.h
@ -1,5 +1,5 @@
-#ifndef _FUNCTIONS_H_
-#define _FUNCTIONS_H_
+#ifndef FUNCTIONS_H
+#define FUNCTIONS_H

 #include "z64.h"

--- a/include/global.h
+++ b/include/global.h
@ -1,5 +1,5 @@
-#ifndef _GLOBAL_H_
-#define _GLOBAL_H_
+#ifndef GLOBAL_H
+#define GLOBAL_H

 #include "functions.h"
 #include "variables.h"
--- a/include/ichain.h
+++ b/include/ichain.h
@ -1,5 +1,5 @@
-#ifndef _ICHAIN_H_
-#define _ICHAIN_H_
+#ifndef ICHAIN_H
+#define ICHAIN_H

 typedef struct {
    u32 cont:   1;
--- a/include/macros.h
+++ b/include/macros.h
@ -1,5 +1,5 @@
-#ifndef _MACROS_H_
-#define _MACROS_H_
+#ifndef MACROS_H
+#define MACROS_H

 #define ARRAY_COUNT(arr) (s32)(sizeof(arr) / sizeof(arr[0]))
 #define ARRAY_COUNTU(arr) (u32)(sizeof(arr) / sizeof(arr[0]))
--- a/include/math.h
+++ b/include/math.h
@ -1,5 +1,5 @@
-#ifndef _MATH_H_
-#define _MATH_H_
+#ifndef MATH_H
+#define MATH_H

 #include "ultra64/types.h"

--- a/include/regs.h
+++ b/include/regs.h
@ -1,5 +1,5 @@
-#ifndef _REGS_H_
-#define _REGS_H_
+#ifndef REGS_H
+#define REGS_H

 #define REG_GROUPS 29 // number of REG groups, i.e. REG, SREG, OREG, etc.
 #define REG_PAGES 6
--- a/include/segment_symbols.h
+++ b/include/segment_symbols.h
@ -1,5 +1,5 @@
-#ifndef _SEGMENT_SYMBOLS_H_
-#define _SEGMENT_SYMBOLS_H_
+#ifndef SEGMENT_SYMBOLS_H
+#define SEGMENT_SYMBOLS_H

 #include "z64.h"

--- a/include/stdarg.h
+++ b/include/stdarg.h
@ -1,5 +1,5 @@
-#ifndef _STDARG_H_
-#define _STDARG_H_
+#ifndef STDARG_H
+#define STDARG_H

 // When building with GCC, use the official vaarg macros to avoid warnings
 // and possibly bad codegen.
--- a/include/stdbool.h
+++ b/include/stdbool.h
@ -1,5 +1,5 @@
-#ifndef _STDBOOL
-#define _STDBOOL
+#ifndef STDBOOL_H
+#define STDBOOL_H

 #define __bool_true_false_are_defined 1

@ -11,4 +11,4 @@

 #endif /* __cplusplus */

-#endif /* _STDBOOL */
+#endif /* STDBOOL */
--- a/include/stddef.h
+++ b/include/stddef.h
@ -1,5 +1,5 @@
-#ifndef _STDDEF_H_
-#define _STDDEF_H_
+#ifndef STDDEF_H
+#define STDDEF_H

 #define NULL ((void*)0)

--- a/include/stdlib.h
+++ b/include/stdlib.h
@ -1,5 +1,5 @@
-#ifndef _STDLIB_H_
-#define _STDLIB_H_
+#ifndef STDLIB_H
+#define STDLIB_H

 #include "ultra64.h"

--- a/include/ultra64.h
+++ b/include/ultra64.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_H_
-#define _ULTRA64_H_
+#ifndef ULTRA64_H
+#define ULTRA64_H

 #include "stddef.h"
 #include "stdbool.h"
--- a/include/ultra64/abi.h
+++ b/include/ultra64/abi.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_ABI_H_
-#define _ULTRA64_ABI_H_
+#ifndef ULTRA64_ABI_H
+#define ULTRA64_ABI_H

 /* Audio commands: */
 /*
@ -528,4 +528,4 @@ typedef short ENVMIX_STATE[40];
        _a->words.w1 = _SHIFTL(pitchAccu, 0, 16);                       \
 }

-#endif /* _ULTRA64_ABI_H_ */
+#endif /* ULTRA64_ABI_H */
--- a/include/ultra64/controller.h
+++ b/include/ultra64/controller.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_CONTROLLER_H_
-#define _ULTRA64_CONTROLLER_H_
+#ifndef ULTRA64_CONTROLLER_H
+#define ULTRA64_CONTROLLER_H

 #include "ultra64.h"
 #include "ultra64/message.h"
--- a/include/ultra64/convert.h
+++ b/include/ultra64/convert.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_CONVERT_H_
-#define _ULTRA64_CONVERT_H_
+#ifndef ULTRA64_CONVERT_H
+#define ULTRA64_CONVERT_H

 #define OS_CLOCK_RATE           62500000LL
 #define OS_CPU_COUNTER          (OS_CLOCK_RATE*3/4)
--- a/include/ultra64/gbi.h
+++ b/include/ultra64/gbi.h
@ -1,7 +1,7 @@
 #include "ultra64/mbi.h"

-#ifndef _ULTRA64_GBI_H_
-#define _ULTRA64_GBI_H_
+#ifndef ULTRA64_GBI_H
+#define ULTRA64_GBI_H

 /* To enable Fast3DEX grucode support, define F3DEX_GBI. */

--- a/include/ultra64/gs2dex.h
+++ b/include/ultra64/gs2dex.h
@ -1,5 +1,5 @@
-#ifndef	_GS2DEX_H_
-#define	_GS2DEX_H_
+#ifndef	GS2DEX_H
+#define	GS2DEX_H

 #ifdef _LANGUAGE_C_PLUS_PLUS
 extern "C" {
@ -374,6 +374,6 @@ extern	void	guS2DInitBg(uObjBg *);
 #ifdef _LANGUAGE_C_PLUS_PLUS
 }
 #endif
-#endif /* _GS2DEX_H_ */
+#endif /* GS2DEX_H */

 /*======== End of gs2dex.h ========*/
--- a/include/ultra64/gu.h
+++ b/include/ultra64/gu.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_GU_H_
-#define _ULTRA64_GU_H_
+#ifndef ULTRA64_GU_H
+#define ULTRA64_GU_H

 #define GU_PI 3.1415926

--- a/include/ultra64/hardware.h
+++ b/include/ultra64/hardware.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_HARDWARE_H_
-#define _ULTRA64_HARDWARE_H_
+#ifndef ULTRA64_HARDWARE_H
+#define ULTRA64_HARDWARE_H

 #define HW_REG(reg, type) *(volatile type*)((reg) | 0xa0000000)

--- a/include/ultra64/internal.h
+++ b/include/ultra64/internal.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_INTERNAL_H_
-#define _ULTRA64_INTERNAL_H_
+#ifndef ULTRA64_INTERNAL_H
+#define ULTRA64_INTERNAL_H

 typedef struct {
    /* 0x00 */ u32 initialized;
--- a/include/ultra64/interrupt.h
+++ b/include/ultra64/interrupt.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_INTERRUPT_H_
-#define _ULTRA64_INTERRUPT_H_
+#ifndef ULTRA64_INTERRUPT_H
+#define ULTRA64_INTERRUPT_H

 typedef u32 OSIntMask;

--- a/include/ultra64/mbi.h
+++ b/include/ultra64/mbi.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_MBI_H_
-#define _ULTRA64_MBI_H_
+#ifndef ULTRA64_MBI_H
+#define ULTRA64_MBI_H

 /*
 * Header file for the Media Binary Interface
--- a/include/ultra64/message.h
+++ b/include/ultra64/message.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_MESSAGE_H_
-#define _ULTRA64_MESSAGE_H_
+#ifndef ULTRA64_MESSAGE_H
+#define ULTRA64_MESSAGE_H

 #include "ultra64/types.h"

--- a/include/ultra64/pfs.h
+++ b/include/ultra64/pfs.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PFS_H_
-#define _ULTRA64_PFS_H_
+#ifndef ULTRA64_PFS_H
+#define ULTRA64_PFS_H

 #include "ultra64.h"

--- a/include/ultra64/pi.h
+++ b/include/ultra64/pi.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PI_H_
-#define _ULTRA64_PI_H_
+#ifndef ULTRA64_PI_H
+#define ULTRA64_PI_H

 typedef struct {
    /* 0x00 */ u32 errStatus;
--- a/include/ultra64/printf.h
+++ b/include/ultra64/printf.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_PRINTF_H_
-#define _ULTRA64_PRINTF_H_
+#ifndef ULTRA64_PRINTF_H
+#define ULTRA64_PRINTF_H
 #include "stdarg.h"

 typedef struct {
--- a/include/ultra64/rcp.h
+++ b/include/ultra64/rcp.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RCP_H_
-#define _ULTRA64_RCP_H_
+#ifndef ULTRA64_RCP_H
+#define ULTRA64_RCP_H

 #define VI_NTSC_CLOCK       48681812        /* Hz = 48.681812 MHz */
 #define VI_PAL_CLOCK        49656530        /* Hz = 49.656530 MHz */
--- a/include/ultra64/rdp.h
+++ b/include/ultra64/rdp.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RDP_H_
-#define _ULTRA64_RDP_H_
+#ifndef ULTRA64_RDP_H
+#define ULTRA64_RDP_H

 /* DP Command Registers */

--- a/include/ultra64/rsp.h
+++ b/include/ultra64/rsp.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_RSP_H_
-#define _ULTRA64_RSP_H_
+#ifndef ULTRA64_RSP_H
+#define ULTRA64_RSP_H

 /* SP Status Flags */
 #define SP_STATUS_HALT          0x001
--- a/include/ultra64/sptask.h
+++ b/include/ultra64/sptask.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_SPTASK_H_
-#define _ULTRA64_SPTASK_H_
+#ifndef ULTRA64_SPTASK_H
+#define ULTRA64_SPTASK_H

 /* Task Types */
 #define M_NULTASK 0
--- a/include/ultra64/thread.h
+++ b/include/ultra64/thread.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_THREAD_H_
-#define _ULTRA64_THREAD_H_
+#ifndef ULTRA64_THREAD_H
+#define ULTRA64_THREAD_H

 #define OS_PRIORITY_MAX      255
 #define OS_PRIORITY_VIMGR    254
--- a/include/ultra64/time.h
+++ b/include/ultra64/time.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_TIME_H_
-#define _ULTRA64_TIME_H_
+#ifndef ULTRA64_TIME_H
+#define ULTRA64_TIME_H

 #include "ultra64/message.h"

--- a/include/ultra64/types.h
+++ b/include/ultra64/types.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_TYPES_H_
-#define _ULTRA64_TYPES_H_
+#ifndef ULTRA64_TYPES_H
+#define ULTRA64_TYPES_H

 typedef signed char            s8;
 typedef unsigned char          u8;
--- a/include/ultra64/vi.h
+++ b/include/ultra64/vi.h
@ -1,5 +1,5 @@
-#ifndef _ULTRA64_VI_H_
-#define _ULTRA64_VI_H_
+#ifndef ULTRA64_VI_H
+#define ULTRA64_VI_H

 /* Special Features */
 #define OS_VI_GAMMA_ON          0x0001
--- a/include/unk.h
+++ b/include/unk.h
@ -1,5 +1,5 @@
-#ifndef _UNK_H_
-#define _UNK_H_
+#ifndef UNK_H
+#define UNK_H

 #define UNK_TYPE s32
 #define UNK_TYPE1 s8
--- a/include/variables.h
+++ b/include/variables.h
@ -1,5 +1,5 @@
-#ifndef _VARIABLES_H_
-#define _VARIABLES_H_
+#ifndef VARIABLES_H
+#define VARIABLES_H

 #include "z64.h"
 #include "segment_symbols.h"
--- a/include/z64.h
+++ b/include/z64.h
@ -1,5 +1,5 @@
-#ifndef _Z64_H_
-#define _Z64_H_
+#ifndef Z64_H
+#define Z64_H

 #include "ultra64.h"
 #include "ultra64/gs2dex.h"
--- a/include/z64actor.h
+++ b/include/z64actor.h
@ -1,5 +1,5 @@
-#ifndef _Z64ACTOR_H_
-#define _Z64ACTOR_H_
+#ifndef Z64ACTOR_H
+#define Z64ACTOR_H

 #include "z64dma.h"
 #include "z64animation.h"
--- a/include/z64animation.h
+++ b/include/z64animation.h
@ -1,5 +1,5 @@
-#ifndef _Z64_ANIMATION_H
-#define _Z64_ANIMATION_H
+#ifndef Z64_ANIMATION_H
+#define Z64_ANIMATION_H

 #include "ultra64.h"
 #include "z64dma.h"
--- a/include/z64audio.h
+++ b/include/z64audio.h
@ -1,5 +1,5 @@
-#ifndef _Z64_AUDIO_H_
-#define _Z64_AUDIO_H_
+#ifndef Z64_AUDIO_H
+#define Z64_AUDIO_H

 #define MK_CMD(b0,b1,b2,b3) ((((b0) & 0xFF) << 0x18) | (((b1) & 0xFF) << 0x10) | (((b2) & 0xFF) << 0x8) | (((b3) & 0xFF) << 0))

--- a/include/z64bgcheck.h
+++ b/include/z64bgcheck.h
@ -1,5 +1,5 @@
-#ifndef _Z_BGCHECK_
-#define _Z_BGCHECK_
+#ifndef Z_BGCHECK_H
+#define Z_BGCHECK_H

 struct GlobalContext;
 struct Actor;
--- a/include/z64camera.h
+++ b/include/z64camera.h
@ -1,5 +1,5 @@
-#ifndef _Z64CAMERA_H_
-#define _Z64CAMERA_H_
+#ifndef Z64CAMERA_H
+#define Z64CAMERA_H

 #include "ultra64.h"
 #include "z64cutscene.h"
--- a/include/z64collision_check.h
+++ b/include/z64collision_check.h
@ -1,5 +1,5 @@
-#ifndef _Z_COLLISION_CHECK_H_
-#define _Z_COLLISION_CHECK_H_
+#ifndef Z_COLLISION_CHECK_H
+#define Z_COLLISION_CHECK_H

 #define COLLISION_CHECK_AT_MAX 50
 #define COLLISION_CHECK_AC_MAX 60
--- a/include/z64cutscene.h
+++ b/include/z64cutscene.h
@ -1,5 +1,5 @@
-#ifndef _Z64CUTSCENE_H_
-#define _Z64CUTSCENE_H_
+#ifndef Z64CUTSCENE_H
+#define Z64CUTSCENE_H

 #include "ultra64.h"

--- a/include/z64cutscene_commands.h
+++ b/include/z64cutscene_commands.h
@ -1,5 +1,5 @@
-#ifndef _Z64CUTSCENE_COMMANDS_H_
-#define _Z64CUTSCENE_COMMANDS_H_
+#ifndef Z64CUTSCENE_COMMANDS_H
+#define Z64CUTSCENE_COMMANDS_H

 #include "command_macros_base.h"
 #include "z64cutscene.h"
--- a/include/z64dma.h
+++ b/include/z64dma.h
@ -1,5 +1,5 @@
-#ifndef _Z64_DMA_H_
-#define _Z64_DMA_H_
+#ifndef Z64_DMA_H
+#define Z64_DMA_H

 #include "ultra64.h"

--- a/include/z64effect.h
+++ b/include/z64effect.h
@ -1,5 +1,5 @@
-#ifndef _Z64EFFECT_H_
-#define _Z64EFFECT_H_
+#ifndef Z64EFFECT_H
+#define Z64EFFECT_H

 #include "color.h"

--- a/include/z64interface.h
+++ b/include/z64interface.h
@ -1,5 +1,5 @@
-#ifndef _Z64INTERFACE_H_
-#define _Z64INTERFACE_H_
+#ifndef Z64INTERFACE_H
+#define Z64INTERFACE_H

 /**
 * Button HUD Positions (Upper Left)
--- a/include/z64item.h
+++ b/include/z64item.h
@ -1,5 +1,5 @@
-#ifndef _Z64ITEM_H_
-#define _Z64ITEM_H_
+#ifndef Z64ITEM_H
+#define Z64ITEM_H

 typedef enum {
    /* 0x00 */ EQUIP_SWORD,
--- a/include/z64light.h
+++ b/include/z64light.h
@ -1,5 +1,5 @@
-#ifndef _Z64LIGHT_H_
-#define _Z64LIGHT_H_
+#ifndef Z64LIGHT_H
+#define Z64LIGHT_H

 #include "ultra64.h"
 #include "ultra64/gbi.h"
--- a/include/z64map_mark.h
+++ b/include/z64map_mark.h
@ -1,5 +1,5 @@
-#ifndef _Z64MAP_MARK_H_
-#define _Z64MAP_MARK_H_
+#ifndef Z64MAP_MARK_H
+#define Z64MAP_MARK_H

 #include "ultra64.h"

--- a/include/z64math.h
+++ b/include/z64math.h
@ -1,5 +1,5 @@
-#ifndef _Z64MATH_H_
-#define _Z64MATH_H_
+#ifndef Z64MATH_H
+#define Z64MATH_H

 #include "ultra64.h"

--- a/include/z64object.h
+++ b/include/z64object.h
@ -1,5 +1,5 @@
-#ifndef _Z64OBJECT_H_
-#define _Z64OBJECT_H_
+#ifndef Z64OBJECT_H
+#define Z64OBJECT_H

 #define OBJECT_EXCHANGE_BANK_MAX 19

--- a/include/z64player.h
+++ b/include/z64player.h
@ -1,5 +1,5 @@
-#ifndef _Z64PLAYER_H_
-#define _Z64PLAYER_H_
+#ifndef Z64PLAYER_H
+#define Z64PLAYER_H

 #include "z64actor.h"

--- a/include/z64save.h
+++ b/include/z64save.h
@ -1,5 +1,5 @@
-#ifndef _Z64SAVE_H_
-#define _Z64SAVE_H_
+#ifndef Z64SAVE_H
+#define Z64SAVE_H

 #include "ultra64.h"
 #include "z64math.h"
--- a/include/z64scene.h
+++ b/include/z64scene.h
@ -1,5 +1,5 @@
-#ifndef _Z64SCENE_H_
-#define _Z64SCENE_H_
+#ifndef Z64SCENE_H
+#define Z64SCENE_H

 #include "command_macros_base.h"

--- a/include/z64transition.h
+++ b/include/z64transition.h
@ -1,4 +1,5 @@
-#ifndef _Z64TRANSITION_H_
+#ifndef Z64TRANSITION_H
+#define Z64TRANSITION_H

 #include "ultra64.h"
 #include "color.h"
--- a/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
+++ b/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.h
@ -1,5 +1,5 @@
-#ifndef _Z_ARMS_HOOK_H_
-#define _Z_ARMS_HOOK_H_
+#ifndef Z_ARMS_HOOK_H
+#define Z_ARMS_HOOK_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
+++ b/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.h
@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_FIRE_H_
-#define _Z_ARROW_FIRE_H_
+#ifndef Z_ARROW_FIRE_H
+#define Z_ARROW_FIRE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
+++ b/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.h
@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_ICE_H_
-#define _Z_ARROW_ICE_H_
+#ifndef Z_ARROW_ICE_H
+#define Z_ARROW_ICE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
+++ b/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.h
@ -1,5 +1,5 @@
-#ifndef _Z_ARROW_LIGHT_H_
-#define _Z_ARROW_LIGHT_H_
+#ifndef Z_ARROW_LIGHT_H
+#define Z_ARROW_LIGHT_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BDAN_OBJECTS_H_
-#define _Z_BG_BDAN_OBJECTS_H_
+#ifndef Z_BG_BDAN_OBJECTS_H
+#define Z_BG_BDAN_OBJECTS_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
+++ b/src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BDAN_SWITCH_H_
-#define _Z_BG_BDAN_SWITCH_H_
+#ifndef Z_BG_BDAN_SWITCH_H
+#define Z_BG_BDAN_SWITCH_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
+++ b/src/overlays/actors/ovl_Bg_Bom_Guard/z_bg_bom_guard.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOM_GUARD_H_
-#define _Z_BG_BOM_GUARD_H_
+#ifndef Z_BG_BOM_GUARD_H
+#define Z_BG_BOM_GUARD_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
+++ b/src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOMBWALL_H_
-#define _Z_BG_BOMBWALL_H_
+#ifndef Z_BG_BOMBWALL_H
+#define Z_BG_BOMBWALL_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
+++ b/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BOWL_WALL_H_
-#define _Z_BG_BOWL_WALL_H_
+#ifndef Z_BG_BOWL_WALL_H
+#define Z_BG_BOWL_WALL_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
+++ b/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_BREAKWALL_H_
-#define _Z_BG_BREAKWALL_H_
+#ifndef Z_BG_BREAKWALL_H
+#define Z_BG_BREAKWALL_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Jd/z_bg_ddan_jd.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_DDAN_JD_H_
-#define _Z_BG_DDAN_JD_H_
+#ifndef Z_BG_DDAN_JD_H
+#define Z_BG_DDAN_JD_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
+++ b/src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_DDAN_KD_H_
-#define _Z_BG_DDAN_KD_H_
+#ifndef Z_BG_DDAN_KD_H
+#define Z_BG_DDAN_KD_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
+++ b/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_DODOAGO_H_
-#define _Z_BG_DODOAGO_H_
+#ifndef Z_BG_DODOAGO_H
+#define Z_BG_DODOAGO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
+++ b/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_DY_YOSEIZO_H_
-#define _Z_BG_DY_YOSEIZO_H_
+#ifndef Z_BG_DY_YOSEIZO_H
+#define Z_BG_DY_YOSEIZO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
+++ b/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GANON_OTYUKA_H_
-#define _Z_BG_GANON_OTYUKA_H_
+#ifndef Z_BG_GANON_OTYUKA_H
+#define Z_BG_GANON_OTYUKA_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
+++ b/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GATE_SHUTTER_H_
-#define _Z_BG_GATE_SHUTTER_H_
+#ifndef Z_BG_GATE_SHUTTER_H
+#define Z_BG_GATE_SHUTTER_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
+++ b/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GJYO_BRIDGE_H_
-#define _Z_BG_GJYO_BRIDGE_H_
+#ifndef Z_BG_GJYO_BRIDGE_H
+#define Z_BG_GJYO_BRIDGE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_DARKMEIRO_H_
-#define _Z_BG_GND_DARKMEIRO_H_
+#ifndef Z_BG_GND_DARKMEIRO_H
+#define Z_BG_GND_DARKMEIRO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_FIREMEIRO_H_
-#define _Z_BG_GND_FIREMEIRO_H_
+#ifndef Z_BG_GND_FIREMEIRO_H
+#define Z_BG_GND_FIREMEIRO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Iceblock/z_bg_gnd_iceblock.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_ICEBLOCK_H_
-#define _Z_BG_GND_ICEBLOCK_H_
+#ifndef Z_BG_GND_ICEBLOCK_H
+#define Z_BG_GND_ICEBLOCK_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Nisekabe/z_bg_gnd_nisekabe.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_NISEKABE_H_
-#define _Z_BG_GND_NISEKABE_H_
+#ifndef Z_BG_GND_NISEKABE_H
+#define Z_BG_GND_NISEKABE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
+++ b/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_GND_SOULMEIRO_H_
-#define _Z_BG_GND_SOULMEIRO_H_
+#ifndef Z_BG_GND_SOULMEIRO_H
+#define Z_BG_GND_SOULMEIRO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
+++ b/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_H_
-#define _Z_BG_HAKA_H_
+#ifndef Z_BG_HAKA_H
+#define Z_BG_HAKA_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_GATE_H_
-#define _Z_BG_HAKA_GATE_H_
+#ifndef Z_BG_HAKA_GATE_H
+#define Z_BG_HAKA_GATE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Huta/z_bg_haka_huta.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_HUTA_H_
-#define _Z_BG_HAKA_HUTA_H_
+#ifndef Z_BG_HAKA_HUTA_H
+#define Z_BG_HAKA_HUTA_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Megane/z_bg_haka_megane.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_MEGANE_H_
-#define _Z_BG_HAKA_MEGANE_H_
+#ifndef Z_BG_HAKA_MEGANE_H
+#define Z_BG_HAKA_MEGANE_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
+++ b/src/overlays/actors/ovl_Bg_Haka_MeganeBG/z_bg_haka_meganebg.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_MEGANEBG_H_
-#define _Z_BG_HAKA_MEGANEBG_H_
+#ifndef Z_BG_HAKA_MEGANEBG_H
+#define Z_BG_HAKA_MEGANEBG_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_SGAMI_H_
-#define _Z_BG_HAKA_SGAMI_H_
+#ifndef Z_BG_HAKA_SGAMI_H
+#define Z_BG_HAKA_SGAMI_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_SHIP_H_
-#define _Z_BG_HAKA_SHIP_H_
+#ifndef Z_BG_HAKA_SHIP_H
+#define Z_BG_HAKA_SHIP_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_TRAP_H_
-#define _Z_BG_HAKA_TRAP_H_
+#ifndef Z_BG_HAKA_TRAP_H
+#define Z_BG_HAKA_TRAP_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_TUBO_H_
-#define _Z_BG_HAKA_TUBO_H_
+#ifndef Z_BG_HAKA_TUBO_H
+#define Z_BG_HAKA_TUBO_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_WATER_H_
-#define _Z_BG_HAKA_WATER_H_
+#ifndef Z_BG_HAKA_WATER_H
+#define Z_BG_HAKA_WATER_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
+++ b/src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HAKA_ZOU_H_
-#define _Z_BG_HAKA_ZOU_H_
+#ifndef Z_BG_HAKA_ZOU_H
+#define Z_BG_HAKA_ZOU_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
+++ b/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HEAVY_BLOCK_H_
-#define _Z_BG_HEAVY_BLOCK_H_
+#ifndef Z_BG_HEAVY_BLOCK_H
+#define Z_BG_HEAVY_BLOCK_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_CURTAIN_H_
-#define _Z_BG_HIDAN_CURTAIN_H_
+#ifndef Z_BG_HIDAN_CURTAIN_H
+#define Z_BG_HIDAN_CURTAIN_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_DALM_H_
-#define _Z_BG_HIDAN_DALM_H_
+#ifndef Z_BG_HIDAN_DALM_H
+#define Z_BG_HIDAN_DALM_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FIREWALL_H_
-#define _Z_BG_HIDAN_FIREWALL_H_
+#ifndef Z_BG_HIDAN_FIREWALL_H
+#define Z_BG_HIDAN_FIREWALL_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FSLIFT_H_
-#define _Z_BG_HIDAN_FSLIFT_H_
+#ifndef Z_BG_HIDAN_FSLIFT_H
+#define Z_BG_HIDAN_FSLIFT_H

 #include "ultra64.h"
 #include "global.h"
--- a/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
+++ b/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.h
@ -1,5 +1,5 @@
-#ifndef _Z_BG_HIDAN_FWBIG_H_
-#define _Z_BG_HIDAN_FWBIG_H_
+#ifndef Z_BG_HIDAN_FWBIG_H
+#define Z_BG_HIDAN_FWBIG_H

 #include "ultra64.h"
 #include "global.h"
--- a/Show More
+++ b/Show More