summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/constants/map_scripts.h2
-rw-r--r--include/constants/trainer_hill.h2
-rw-r--r--include/pokemon.h2
-rw-r--r--include/pokemon_icon.h2
-rw-r--r--include/shop.h2
5 files changed, 5 insertions, 5 deletions
diff --git a/include/constants/map_scripts.h b/include/constants/map_scripts.h
index d5fd40156..26de3ebc6 100644
--- a/include/constants/map_scripts.h
+++ b/include/constants/map_scripts.h
@@ -9,4 +9,4 @@
#define MAP_SCRIPT_ON_DIVE_WARP 6
#define MAP_SCRIPT_ON_RETURN_TO_FIELD 7
-#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H \ No newline at end of file
+#endif // GUARD_CONSTANTS_MAP_SCRIPTS_H
diff --git a/include/constants/trainer_hill.h b/include/constants/trainer_hill.h
index e231a6043..4aae1dbbc 100644
--- a/include/constants/trainer_hill.h
+++ b/include/constants/trainer_hill.h
@@ -26,4 +26,4 @@
#define TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED 1
#define TRAINER_HILL_PLAYER_STATUS_NORMAL 2
-#endif \ No newline at end of file
+#endif
diff --git a/include/pokemon.h b/include/pokemon.h
index 0fc28f683..4aeb739bf 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -434,7 +434,7 @@ extern const u8 gPPUpGetMask[];
extern const u8 gPPUpSetMask[];
extern const u8 gPPUpAddMask[];
extern const u8 gStatStageRatios[][2];
-extern const u16 gUnknown_08329D54[];
+extern const u16 gFacilityClassPicsByIndex[];
extern const struct SpriteTemplate gUnknown_08329D98[];
extern const s8 gNatureStatTable[][5];
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index c7b895028..8af43c753 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -23,6 +23,6 @@ void LoadMonIconPalette(u16 species);
void sub_80D328C(struct Sprite *sprite);
void sub_80D3014(struct Sprite *sprite);
void sub_80D32C8(struct Sprite *sprite, u8 animNum);
-u8 sub_80D30A0(u16 species);
+u8 GetMonIconPaletteIndexFromSpecies(u16 species);
#endif // GUARD_POKEMON_ICON_H
diff --git a/include/shop.h b/include/shop.h
index 9a5f8eb14..10e2b1060 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -49,4 +49,4 @@ void CreateDecorationShop1Menu(const u16 *);
void CreateDecorationShop2Menu(const u16 *);
void CB2_ExitSellMenu(void);
-#endif // GUARD_SHOP_H \ No newline at end of file
+#endif // GUARD_SHOP_H