summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-09-16 15:13:06 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-09-16 15:13:06 -0400
commit18e06b480b13143b8870675a763fb2f9854f9679 (patch)
tree6122fce330637bc3e93a13e5f38d8773aa6e1797
parent66fbc9753fa8411d715fdad1067eb98c68ace27a (diff)
Fix header guards
-rwxr-xr-xinclude/data3.h6
-rwxr-xr-xinclude/event_scripts.h6
-rw-r--r--include/field_effect.h6
-rw-r--r--include/field_effect_helpers.h6
-rw-r--r--include/field_ground_effect.h6
-rwxr-xr-xinclude/field_map_obj.h6
-rw-r--r--include/field_player_avatar.h6
-rw-r--r--include/fieldmap.h6
-rw-r--r--include/map_obj_8097404.h6
-rw-r--r--include/rom4.h6
-rw-r--r--include/rom_818CFC8.h6
-rw-r--r--include/rom_81BE66C.h6
12 files changed, 36 insertions, 36 deletions
diff --git a/include/data3.h b/include/data3.h
index 2b5cc1bc5..b2b19b050 100755
--- a/include/data3.h
+++ b/include/data3.h
@@ -2,8 +2,8 @@
// Created by Scott Norton on 9/8/17.
//
-#ifndef POKEEMERALD_DATA3_H
-#define POKEEMERALD_DATA3_H
+#ifndef GUARD_DATA3_H
+#define GUARD_DATA3_H
struct PairedPalettes {
u16 tag;
@@ -38,4 +38,4 @@ extern bool8 (*const gUnknown_0850DA64[])(struct MapObject *, struct Sprite *, u
extern const u8 gUnknown_0850DBA0[5];
-#endif //POKEEMERALD_DATA3_H
+#endif //GUARD_DATA3_H
diff --git a/include/event_scripts.h b/include/event_scripts.h
index 967bc196a..f1abdd6f6 100755
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -2,10 +2,10 @@
// Created by scott on 9/12/2017.
//
-#ifndef POKEEMERALD_EVENT_SCRIPTS_H
-#define POKEEMERALD_EVENT_SCRIPTS_H
+#ifndef GUARD_EVENT_SCRIPTS_H
+#define GUARD_EVENT_SCRIPTS_H
extern const u8 gUnknown_082766A2[];
extern const u8 gUnknown_082766A6[];
-#endif //POKEEMERALD_EVENT_SCRIPTS_H
+#endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_effect.h b/include/field_effect.h
index 8cf866725..7ec26b3d7 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -2,8 +2,8 @@
// Created by Scott Norton on 9/15/17.
//
-#ifndef POKEEMERALD_FIELD_EFFECTS_H
-#define POKEEMERALD_FIELD_EFFECTS_H
+#ifndef GUARD_FIELD_EFFECTS_H
+#define GUARD_FIELD_EFFECTS_H
enum FieldEffectScriptIdx
{
@@ -77,4 +77,4 @@ extern u32 gFieldEffectSpawnParams[8];
u8 FieldEffectStart(u8);
-#endif //POKEEMERALD_FIELD_EFFECTS_H
+#endif //GUARD_FIELD_EFFECTS_H
diff --git a/include/field_effect_helpers.h b/include/field_effect_helpers.h
index 673d59139..6504a84f1 100644
--- a/include/field_effect_helpers.h
+++ b/include/field_effect_helpers.h
@@ -2,8 +2,8 @@
// Created by scott on 9/7/2017.
//
-#ifndef POKEEMERALD_FIELD_EFFECT_HELPERS_H
-#define POKEEMERALD_FIELD_EFFECT_HELPERS_H
+#ifndef GUARD_FIELD_EFFECT_HELPERS_H
+#define GUARD_FIELD_EFFECT_HELPERS_H
// Exported type declarations
@@ -12,4 +12,4 @@
// Exported ROM declarations
u8 sub_8154228(void);
-#endif //POKEEMERALD_FIELD_EFFECT_HELPERS_H
+#endif //GUARD_FIELD_EFFECT_HELPERS_H
diff --git a/include/field_ground_effect.h b/include/field_ground_effect.h
index 0c90f50dc..e2dc3a00f 100644
--- a/include/field_ground_effect.h
+++ b/include/field_ground_effect.h
@@ -2,8 +2,8 @@
// Created by scott on 9/6/2017.
//
-#ifndef POKEEMERALD_FIELD_GROUND_EFFECT_H
-#define POKEEMERALD_FIELD_GROUND_EFFECT_H
+#ifndef GUARD_FIELD_GROUND_EFFECT_H
+#define GUARD_FIELD_GROUND_EFFECT_H
// Exported type declarations
@@ -13,4 +13,4 @@
void SetObjectSubpriorityByZCoord(u8, struct Sprite *, u8);
void InitObjectPriorityByZCoord(struct Sprite *, u8);
-#endif //POKEEMERALD_FIELD_GROUND_EFFECT_H
+#endif //GUARD_FIELD_GROUND_EFFECT_H
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 536d9d1a4..f603e9a8e 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -1,5 +1,5 @@
-#ifndef POKEEMERALD_FIELD_MAP_OBJ_H
-#define POKEEMERALD_FIELD_MAP_OBJ_H
+#ifndef GUARD_FIELD_MAP_OBJ_H
+#define GUARD_FIELD_MAP_OBJ_H
#define NUM_OBJECT_GRAPHICS_INFO 239
#define SPRITE_VAR 240
@@ -70,4 +70,4 @@ u8 npc_block_way(struct MapObject *, s16, s16, u32);
extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[];
-#endif //POKEEMERALD_FIELD_MAP_OBJ_H
+#endif //GUARD_FIELD_MAP_OBJ_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index cd00832d5..a787cf805 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -2,8 +2,8 @@
// Created by Scott Norton on 9/6/17.
//
-#ifndef POKEEMERALD_FIELD_PLAYER_AVATAR_H
-#define POKEEMERALD_FIELD_PLAYER_AVATAR_H
+#ifndef GUARD_FIELD_PLAYER_AVATAR_H
+#define GUARD_FIELD_PLAYER_AVATAR_H
void ClearPlayerAvatarInfo(void);
void SetPlayerAvatarExtraStateTransition(u8, u8);
@@ -14,4 +14,4 @@ u8 player_get_direction_lower_nybble(void);
u8 player_get_direction_upper_nybble(void);
u8 player_get_x22(void);
-#endif //POKEEMERALD_FIELD_PLAYER_AVATAR_H
+#endif //GUARD_FIELD_PLAYER_AVATAR_H
diff --git a/include/fieldmap.h b/include/fieldmap.h
index 7057fe889..4c75c3f40 100644
--- a/include/fieldmap.h
+++ b/include/fieldmap.h
@@ -2,8 +2,8 @@
// Created by scott on 9/16/2017.
//
-#ifndef POKEEMERALD_FIELDMAP_H
-#define POKEEMERALD_FIELDMAP_H
+#ifndef GUARD_FIELDMAP_H
+#define GUARD_FIELDMAP_H
// Exported type declarations
@@ -12,4 +12,4 @@
// Exported ROM declarations
u8 MapGridGetMetatileBehaviorAt(s16, s16);
-#endif //POKEEMERALD_FIELDMAP_H
+#endif //GUARD_FIELDMAP_H
diff --git a/include/map_obj_8097404.h b/include/map_obj_8097404.h
index 6296febe4..e3b2b1efc 100644
--- a/include/map_obj_8097404.h
+++ b/include/map_obj_8097404.h
@@ -2,8 +2,8 @@
// Created by scott on 9/7/2017.
//
-#ifndef POKEEMERALD_MAP_OBJ_8097404_H
-#define POKEEMERALD_MAP_OBJ_8097404_H
+#ifndef GUARD_MAP_OBJ_8097404_H
+#define GUARD_MAP_OBJ_8097404_H
// Exported type declarations
@@ -12,4 +12,4 @@
// Exported ROM declarations
void sub_8097AC8(struct Sprite *);
-#endif //POKEEMERALD_MAP_OBJ_8097404_H
+#endif //GUARD_MAP_OBJ_8097404_H
diff --git a/include/rom4.h b/include/rom4.h
index 78dca24c4..d4ece109e 100644
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -1,6 +1,6 @@
-#ifndef POKEEMERALD_ROM4_H
-#define POKEEMERALD_ROM4_H
+#ifndef GUARD_ROM4_H
+#define GUARD_ROM4_H
struct UnkPlayerStruct
{
@@ -28,4 +28,4 @@ void strange_npc_table_clear(void);
const struct MapHeader *get_mapheader_by_bank_and_number(u8, u8);
void FieldObjectMoveDestCoords(struct MapObject *, u32, s16 *, s16 *);
-#endif //POKEEMERALD_ROM4_H
+#endif //GUARD_ROM4_H
diff --git a/include/rom_818CFC8.h b/include/rom_818CFC8.h
index 9b6f96893..1d0626b2b 100644
--- a/include/rom_818CFC8.h
+++ b/include/rom_818CFC8.h
@@ -2,10 +2,10 @@
// Created by Scott Norton on 9/6/17.
//
-#ifndef POKEEMERALD_ROM_818CFC8_H
-#define POKEEMERALD_ROM_818CFC8_H
+#ifndef GUARD_ROM_818CFC8_H
+#define GUARD_ROM_818CFC8_H
bool8 InBattlePyramid(void);
u8 sub_81AAA40(void);
-#endif //POKEEMERALD_ROM_818CFC8_H
+#endif //GUARD_ROM_818CFC8_H
diff --git a/include/rom_81BE66C.h b/include/rom_81BE66C.h
index e4e39fb08..5b4f80249 100644
--- a/include/rom_81BE66C.h
+++ b/include/rom_81BE66C.h
@@ -2,11 +2,11 @@
// Created by Scott Norton on 9/6/17.
//
-#ifndef POKEEMERALD_ROM_81BE66C_H
-#define POKEEMERALD_ROM_81BE66C_H
+#ifndef GUARD_ROM_81BE66C_H
+#define GUARD_ROM_81BE66C_H
bool32 InTrainerHill(void);
bool8 FieldObjectIsFarawayIslandMew(struct MapObject *);
u32 sub_81D427C(void);
-#endif //POKEEMERALD_ROM_81BE66C_H
+#endif //GUARD_ROM_81BE66C_H