summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-04-02 12:54:40 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-04-02 12:54:40 -0400
commit1b8d405b5e39de986954f8c3c7c3e15ea4a4967c (patch)
tree54887eeb9caa3b3c511af1f87931c3a5e2c3f10c
parenta0b3d4df12f30442ea7d14d3e05f19327ad8f6ce (diff)
Add missing include guard suffixes
-rw-r--r--berry_fix/payload/include/gba/defines.h6
-rw-r--r--include/battle_gfx_sfx_util.h6
-rwxr-xr-xinclude/constants/metatile_behaviors.h6
-rw-r--r--include/gba/defines.h6
-rw-r--r--include/item_menu_icons.h6
-rw-r--r--include/metatile_behavior.h6
-rw-r--r--include/script_pokemon_util.h6
7 files changed, 21 insertions, 21 deletions
diff --git a/berry_fix/payload/include/gba/defines.h b/berry_fix/payload/include/gba/defines.h
index 289518cf3..4037af584 100644
--- a/berry_fix/payload/include/gba/defines.h
+++ b/berry_fix/payload/include/gba/defines.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_GBA_DEFINES
-#define GUARD_GBA_DEFINES
+#ifndef GUARD_GBA_DEFINES_H
+#define GUARD_GBA_DEFINES_H
#include <stddef.h>
@@ -84,4 +84,4 @@
#define RGB_CYAN RGB(0, 31, 31)
#define RGB_WHITEALPHA (RGB_WHITE | 0x8000)
-#endif // GUARD_GBA_DEFINES
+#endif // GUARD_GBA_DEFINES_H
diff --git a/include/battle_gfx_sfx_util.h b/include/battle_gfx_sfx_util.h
index e3f549aa9..3288204d1 100644
--- a/include/battle_gfx_sfx_util.h
+++ b/include/battle_gfx_sfx_util.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_BATTLE_GFX_SFX_UTIL
-#define GUARD_BATTLE_GFX_SFX_UTIL
+#ifndef GUARD_BATTLE_GFX_SFX_UTIL_H
+#define GUARD_BATTLE_GFX_SFX_UTIL_H
void AllocateBattleSpritesData(void);
void FreeBattleSpritesData(void);
@@ -45,4 +45,4 @@ void AllocateMonSpritesGfx(void);
void FreeMonSpritesGfx(void);
bool32 ShouldPlayNormalMonCry(struct Pokemon *mon);
-#endif // GUARD_BATTLE_GFX_SFX_UTIL
+#endif // GUARD_BATTLE_GFX_SFX_UTIL_H
diff --git a/include/constants/metatile_behaviors.h b/include/constants/metatile_behaviors.h
index 94cb0ffca..cc069c66c 100755
--- a/include/constants/metatile_behaviors.h
+++ b/include/constants/metatile_behaviors.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_METATILE_BEHAVIORS
-#define GUARD_METATILE_BEHAVIORS
+#ifndef GUARD_METATILE_BEHAVIORS_H
+#define GUARD_METATILE_BEHAVIORS_H
#define MB_NORMAL 0x00
#define MB_SECRET_BASE_WALL 0x01
@@ -242,4 +242,4 @@
#define MB_UNUSED_EE 0xEE
#define MB_UNUSED_EF 0xEF
-#endif // GUARD_METATILE_BEHAVIORS
+#endif // GUARD_METATILE_BEHAVIORS_H
diff --git a/include/gba/defines.h b/include/gba/defines.h
index 78c688593..ad06aaad2 100644
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_GBA_DEFINES
-#define GUARD_GBA_DEFINES
+#ifndef GUARD_GBA_DEFINES_H
+#define GUARD_GBA_DEFINES_H
#include <stddef.h>
@@ -76,4 +76,4 @@
#define TOTAL_OBJ_TILE_COUNT 1024
-#endif // GUARD_GBA_DEFINES
+#endif // GUARD_GBA_DEFINES_H
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index e061149fc..7ff6ace94 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_ITEM_MENU_ICONS
-#define GUARD_ITEM_MENU_ICONS
+#ifndef GUARD_ITEM_MENU_ICONS_H
+#define GUARD_ITEM_MENU_ICONS_H
extern const struct CompressedSpriteSheet gBagMaleSpriteSheet;
extern const struct CompressedSpriteSheet gBagFemaleSpriteSheet;
@@ -28,4 +28,4 @@ u8 CreateBerryFlavorCircleSprite(s16 x);
#define TAG_BERRY_PIC_TILE 0xFFFF
#define TAG_BERRY_PIC_PAL 0x7544
-#endif // GUARD_ITEM_MENU_ICONS
+#endif // GUARD_ITEM_MENU_ICONS_H
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index d4bd9e683..584b3e546 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_METATILE_BEHAVIOR
-#define GUARD_METATILE_BEHAVIOR
+#ifndef GUARD_METATILE_BEHAVIOR_H
+#define GUARD_METATILE_BEHAVIOR_H
bool8 MetatileBehavior_IsATile(u8);
bool8 MetatileBehavior_IsEncounterTile(u8);
@@ -146,4 +146,4 @@ bool8 MetatileBehavior_IsLongGrass_Duplicate(u8);
bool8 MetatileBehavior_IsLongGrassSouthEdge(u8);
bool8 MetatileBehavior_IsTrainerHillTimer(u8);
-#endif // GUARD_METATILE_BEHAVIOR
+#endif // GUARD_METATILE_BEHAVIOR_H
diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h
index 120c28a63..cae16e40a 100644
--- a/include/script_pokemon_util.h
+++ b/include/script_pokemon_util.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_SCRIPT_POKEMON_UTIL
-#define GUARD_SCRIPT_POKEMON_UTIL
+#ifndef GUARD_SCRIPT_POKEMON_UTIL_H
+#define GUARD_SCRIPT_POKEMON_UTIL_H
u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
u8 ScriptGiveEgg(u16);
@@ -8,4 +8,4 @@ void ScriptSetMonMoveSlot(u8, u16, u8);
void ReducePlayerPartyToSelectedMons(void);
void HealPlayerParty(void);
-#endif // GUARD_SCRIPT_POKEMON_UTIL
+#endif // GUARD_SCRIPT_POKEMON_UTIL_H