summaryrefslogtreecommitdiff
path: root/include/player_pc.h
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-06-17 19:46:25 -0500
committercamthesaxman <cameronghall@cox.net>2017-06-17 19:46:25 -0500
commit82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch)
tree26e39c75e92ca8cf128b9143c0e664b06bff23a9 /include/player_pc.h
parentc56305607a1bad264b89d07b7539eff3fe010e0d (diff)
parent13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff)
fix merge conflicts
Diffstat (limited to 'include/player_pc.h')
-rwxr-xr-xinclude/player_pc.h26
1 files changed, 23 insertions, 3 deletions
diff --git a/include/player_pc.h b/include/player_pc.h
index 5f53d80ac..f2446ebdf 100755
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -1,5 +1,5 @@
-#ifndef GUARD_PLAYERPC_H
-#define GUARD_PLAYERPC_H
+#ifndef GUARD_PLAYER_PC_H
+#define GUARD_PLAYER_PC_H
// general task defines
#define TASK gTasks[taskId]
@@ -84,4 +84,24 @@ void PlayerPC(void);
void ItemStorage_ReturnToMenuAfterDeposit(void);
void Mailbox_ReturnToMailListAfterDeposit(void);
-#endif
+void sub_813A240(u8);
+void sub_813A280(u8);
+void sub_813A468(u8);
+void sub_813A4B4(u8);
+void HandleQuantityRolling(u8);
+void sub_813A6FC(u8);
+void sub_813A794(u8);
+void sub_813A8F0(u8);
+void sub_813A984(u8);
+void sub_813A9EC(u8);
+void sub_813AA30(u8, u8);
+void sub_813ABE8(u8);
+void sub_813AD58(u16);
+void sub_813AE0C(u8);
+void sub_813AE6C(u8, u8);
+u8 sub_813AF3C(void);
+void sub_813AF78(void);
+void sub_813B108(u8);
+void sub_813B174(u8);
+
+#endif // GUARD_PLAYER_PC_H