diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/asm.inc.h | 8 | ||||
-rw-r--r-- | include/global.h | 11 |
2 files changed, 13 insertions, 6 deletions
diff --git a/include/asm.inc.h b/include/asm.inc.h index f533d8729..1cae90e98 100644 --- a/include/asm.inc.h +++ b/include/asm.inc.h @@ -38,10 +38,10 @@ void CreatePokeballSprite(u8 r0, u8 r1, u8 r2, u8 r3, u8 s1, u8 s2, u8 s3, u16 s void CheckForFlashMemory(void); int sub_80479F8(); void sub_8047A04(); -void sub_8047A1C(void); -void sub_8047A34(void); -void save_serialize_game(void); -void save_deserialize_game(); +void SetSecretBase2Field_9_AndHideBG(void); +void ClearSecretBase2Field_9_2(void); +void SaveSerializedGame(void); +void LoadSerializedGame(void); // asm/berry_blender.o void sub_80516C4(u8, u16); diff --git a/include/global.h b/include/global.h index ce2267642..be35f1299 100644 --- a/include/global.h +++ b/include/global.h @@ -169,6 +169,11 @@ struct EasyChatPair u16 words[2]; }; /*size = 0x8*/ +struct SaveBlock1_2B4C_Struct +{ + u8 filler[0x24]; +}; + struct SaveBlock1 { /*0x00*/ struct Coords16 pos; @@ -230,7 +235,9 @@ struct SaveBlock1 /*0x2B0D*/ u8 outbreakPokemonProbability; /*0x2B0E*/ u8 filler_2B0E[0xE]; /*0x2B1C*/ u16 unk2B1C[4]; - /*0x2B24*/ u8 filler_2B24[0x2B0]; + /*0x2B24*/ u8 filler_2B24[0x28]; + /*0x2B4C*/ struct SaveBlock1_2B4C_Struct unkSave[16]; + /*0x2D8C*/ u8 filler_2D8C[0x48]; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff /*0x2DFC*/ u8 filler_2DFC[0x100]; /*0x2EFC*/ struct SB1_2EFC_Struct sb1_2EFC_struct[5]; @@ -284,7 +291,7 @@ struct SaveBlock2 { /*0x00*/ u8 playerName[8]; /*0x08*/ u8 playerGender; // MALE, FEMALE - /*0x09*/ u8 sb2_field_9; + /*0x09*/ u8 specialSaveWarp; /*0x0A*/ u8 playerTrainerId[4]; /*0x0E*/ u16 playTimeHours; /*0x10*/ u8 playTimeMinutes; |