Review comments and documentation

5 files changed, 12 insertions, 12 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 20e322bc1..56a51e67c 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4215,11 +4215,11 @@ extern const u8 gMonIcon_Unown_QuestionMark[];
 extern const u8 gMonIcon_QuestionMark[];
 
 // trade
-extern const u16 gUnknown_8E9CEDC[];
-extern const u16 gUnknown_8E9CF3C[];
-extern const u16 gUnknown_8E9CF5C[];
+extern const u16 gTradeMenu_Pal[];
+extern const u16 gTradeButtons_Pal[];
+extern const u16 gTradeMenu_Gfx[];
 extern const u16 gUnknown_8E9E9FC[];
-extern const u16 gUnknown_8E9E1DC[];
-extern const u16 gUnknown_8E9F1FC[];
+extern const u16 gTradeButtons_Gfx[];
+extern const u16 gTradeMenuMonBox_Tilemap[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/include/pokemon_icon.h b/include/pokemon_icon.h
index 13228e55e..cfc3c18f0 100644
--- a/include/pokemon_icon.h
+++ b/include/pokemon_icon.h
@@ -8,18 +8,18 @@ const u8 *GetMonIconTiles(u16 iconSpecies, bool32 extra);
 const u16 *GetValidMonIconPalettePtr(u16 speciesId);
 u16 sub_80D2E84(u16 speciesId);
 void sub_80D2F68(u16 iconId);
-u8 sub_80D2D78(u16 iconId, void callback(struct Sprite *), u16 x, u16 y, u16 a4, u8 a5);
+u8 sub_80D2D78(u16 iconId, SpriteCallback callback, u16 x, u16 y, u16 a4, u8 a5);
 void sub_80D2FF0(u16 iconId);
-void sub_80D2EF8(struct Sprite *sprite);
+void sub_80D2EF8(struct Sprite * sprite);
 void LoadMonIconPalettes(void);
 void FreeMonIconPalettes(void);
 u16 MailSpeciesToIconSpecies(u16);
-u8 CreateMonIcon_HandleDeoxys(u16 species, void (*callback)(struct Sprite *), s16 x, s16 y, u8 subpriority, bool32 extra);
+u8 CreateMonIcon_HandleDeoxys(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, bool32 extra);
 void DestroyMonIcon(struct Sprite *);
 u16 GetUnownLetterByPersonality(u32 personality);
 void SpriteCB_MonIcon(struct Sprite *);
 u8 CreateMonIcon(u16 species, SpriteCallback callback, s16 x, s16 y, u8 subpriority, u32 personality, bool32 extra);
-u8 UpdateMonIconFrame(struct Sprite *sprite);
+u8 UpdateMonIconFrame(struct Sprite * sprite);
 void LoadMonIconPalette(u16 iconId);
 void FreeMonIconPalette(u16 iconId);
 void MonIcon_SetAnim(struct Sprite * sprite, u8 animNum);
diff --git a/include/trade.h b/include/trade.h
index b1ae5669e..257357053 100644
--- a/include/trade.h
+++ b/include/trade.h
@@ -5,7 +5,7 @@ extern struct MailStruct gLinkPartnerMail[6];
 extern u8 gSelectedTradeMonPositions[2];
 
 extern const u16 gUnknown_826601C[];
-void sub_804C718(void);
+void CB2_ReturnFromLinkTrade(void);
 s32 sub_804FB34(void);
 
 #endif //GUARD_TRADE_H
diff --git a/include/trade_scene.h b/include/trade_scene.h
index 347df033f..13cb1a56c 100644
--- a/include/trade_scene.h
+++ b/include/trade_scene.h
@@ -9,7 +9,7 @@ u16 GetInGameTradeSpeciesInfo(void);
 u16 GetTradeSpecies(void);
 void sub_805049C(void);
 void sub_80504B0(void);
-void sub_80544FC(void);
+void LoadTradeAnimGfx(void);
 
 extern const u16 gUnknown_826601C[];
 extern const struct WindowTemplate gUnknown_826D1CC;
diff --git a/include/util.h b/include/util.h
index db86c184c..ef1c15faa 100644
--- a/include/util.h
+++ b/include/util.h
@@ -14,7 +14,7 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *);
 int CountTrailingZeroBits(u32 value);
 u16 CalcCRC16(const u8 *data, u32 length);
 u16 CalcCRC16WithTable(const u8 *data, u32 length);
-u32 CalcByteArraySum(const u8* data, u32 length);
+u32 CalcByteArraySum(const u8 *data, u32 length);
 void BlendPalette(u16 palOffset, u16 numEntries, u8 coeff, u16 blendColor);
 void DoBgAffineSet(struct BgAffineDstData * dest, u32 texX, u32 texY, s16 srcX, s16 srcY, s16 sx, s16 sy, u16 alpha);