Merge branch 'port' of https://github.com/fgsfdsfgs/perfect_dark into port-net

src/include/game/filemgr.h

@@ -25,7 +25,7 @@ void filemgrEraseCorruptFile(void);
 char *filemgrMenuTextInsertOriginalPak(struct menuitem *item);
 void filemgrRetrySave(s32 arg0);
 bool filemgrAttemptOperation(s32 device, bool closeonsuccess);
-bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, u32 playernum);
+bool filemgrSaveOrLoad(struct fileguid *guid, s32 fileop, uintptr_t playernum);
 void filemgrDeleteCurrentFile(void);
 void func0f1097d0(s32 device);
 void filemgrSaveGameToDevice(s32 device);

src/include/game/player.h

@@ -21,6 +21,7 @@ void playerStartCutscene(s16 anim_id);
 void playerReorientForCutsceneStop(s32 tweenduration60);
 void playerTickCutscene(bool arg0);
 f32 playerGetCutsceneBlurFrac(void);
+void playerClampGunZoomFovY(s32 playernum);
 void playerSetZoomFovY(f32 fovy, f32 timemax);
 f32 playerGetZoomFovY(void);
 void playerTweenFovY(f32 targetfovy);

src/include/game/savebuffer.h

@@ -15,7 +15,7 @@ void savebufferOr(struct savebuffer *buffer, u32 arg1, s32 arg2);
 void savebufferWriteBits(struct savebuffer *buffer, u32 value, s32 numbits, u8 *dst);
 u32 savebufferReadBits(struct savebuffer *buffer, s32 offset);
 void savebufferClear(struct savebuffer *buffer);
-void func0f0d5484(struct savebuffer *buffer, u8 *data, u8 len);
+void savebufferWriteData(struct savebuffer *buffer, u8 *data, u8 len);
 void func0f0d54c4(struct savebuffer *buffer);
 void savebufferReadString(struct savebuffer *buffer, char *dst, bool addlinebreak);
 void func0f0d55a4(struct savebuffer *buffer, char *src);

src/include/types.h

@@ -3822,7 +3822,7 @@ struct menudata_filemgr {
 	/*0xe42*/ u8 fileop;
 	union {
 		void *unke44;
-		s32 mpplayernum;
+		intptr_t mpplayernum;
 	};
 	/*0xe48*/ u32 fileid;
 	/*0xe4c*/ u32 deviceserial;