Finish trade code

include/constants/flags.h

@@ -1310,11 +1310,7 @@
 #define FLAG_TRAINER_FLAG_START  0x500
 
 // Vanilla: SYS_FLAGS = 0x800
-#if (NUM_TRAINERS) & 31
 #define SYS_FLAGS (FLAG_TRAINER_FLAG_START + ((NUM_TRAINERS) + 31) / 32 * 32)
-#else
-#define SYS_FLAGS (FLAG_TRAINER_FLAG_START + (NUM_TRAINERS))
-#endif
 
 // SYSTEM FLAGS
 

include/load_save.h

@@ -26,7 +26,7 @@ void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 void ApplyNewEncryptionKeyToBagItems(u32 encryptionKey);
 void ApplyNewEncryptionKeyToWord(u32 * word, u32 encryptionKey);
 void ApplyNewEncryptionKeyToHword(u16 * hword, u32 encryptionKey);
-void sav2_gender2_inplace_and_xFE(void);
-void sub_804C1C0(void);
+void ClearContinueGameWarpStatus2(void);
+void SetContinueGameWarpStatusToDynamicWarp(void);
 
 #endif // GUARD_LOAD_SAVE_H

include/mevent.h

@@ -68,5 +68,6 @@ bool32 WonderCard_Test_Unk_08_6(void);
 u32 MENews_GetInput(u16 input);
 void sub_8143D24(void);
 u16 sub_81445C0(u32 command);
+void sub_8144714(u32 a0, u32 a1);
 
 #endif //GUARD_MEVENT_H

include/party_menu.h

@@ -87,5 +87,6 @@ void PartyMenuInit_FromPlayerPc(void);
 void CB2_PartyMenuFromStartMenu(void);
 void sub_8128198(void);
 void sub_8127FF4(u8 slot, u8 slot2);
+void LoadHeldItemIcons(void);
 
 #endif // GUARD_PARTY_MENU_H

include/strings.h

@@ -666,5 +666,6 @@ extern const u8 gText_XWillBeSentToY[];
 extern const u8 gText_ByeByeVar1[];
 extern const u8 gText_XSentOverY[];
 extern const u8 gText_TakeGoodCareOfX[];
+extern const u8 gUnknown_841E325[];
 
 #endif //GUARD_STRINGS_H