From d84e9bed58db84bbb7db568c366bfa803be87139 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Sun, 6 Oct 2019 00:48:48 -0700
Subject: Decompile/port new_game

---
 include/global.h | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index 55233a340..2af9bbc94 100644
--- a/include/global.h
+++ b/include/global.h
@@ -227,14 +227,20 @@ struct SaveBlock2
     /*0x098*/ struct Time localTimeOffset;
     /*0x0A0*/ struct Time lastBerryTreeUpdate;
     /*0x0A8*/ u32 field_A8;
-    /*0x0AC*/ u8 filler_AC[0x3F4];
+    /*0x0AC*/ u8 field_AC;
+    /*0x0AD*/ u8 field_AD;
+    /*0x0AE*/ u8 filler_AE[0x2];
+	/*0x0B0*/ u8 field_B0;
+	/*0x0B1*/ u8 filler_B1[0x3EF];
     /*0x4A0*/ u32 unk_4A0[0x2F];
     /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
     /*0x574*/ u8 filler_574[0x324];
     /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
-    /*0xB00*/ u8 filler_B00[0x420];
+    /*0xB00*/ struct PokemonJumpResults pokeJump;
+	/*0xB10*/ struct BerryPickingResults berryPick;
+	/*0xB20*/ u8 filler_B20[0x400];
     /*0xF20*/ u32 encryptionKey;
 };
 
-- 
cgit v1.2.3


From d4ba74fb34c78a6f80e5e51ac3ccc295191e7128 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Sun, 6 Oct 2019 09:13:15 -0700
Subject: Fix formatting.

---
 include/global.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index 2af9bbc94..c206cf5f1 100644
--- a/include/global.h
+++ b/include/global.h
@@ -230,8 +230,8 @@ struct SaveBlock2
     /*0x0AC*/ u8 field_AC;
     /*0x0AD*/ u8 field_AD;
     /*0x0AE*/ u8 filler_AE[0x2];
-	/*0x0B0*/ u8 field_B0;
-	/*0x0B1*/ u8 filler_B1[0x3EF];
+    /*0x0B0*/ u8 field_B0;
+    /*0x0B1*/ u8 filler_B1[0x3EF];
     /*0x4A0*/ u32 unk_4A0[0x2F];
     /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
     /*0x574*/ u8 filler_574[0x324];
@@ -239,8 +239,8 @@ struct SaveBlock2
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
     /*0xB00*/ struct PokemonJumpResults pokeJump;
-	/*0xB10*/ struct BerryPickingResults berryPick;
-	/*0xB20*/ u8 filler_B20[0x400];
+    /*0xB10*/ struct BerryPickingResults berryPick;
+    /*0xB20*/ u8 filler_B20[0x400];
     /*0xF20*/ u32 encryptionKey;
 };
 
-- 
cgit v1.2.3


From 52d40061ecdb2b47da10083c0359e06df5470eb1 Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Sun, 6 Oct 2019 14:47:08 -0700
Subject: Resolve review suggestions.

---
 include/global.h | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index c206cf5f1..98dd8ab2c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -205,6 +205,14 @@ struct UnkSaveBlock2Substruct_55C
     /* 0x016:0x572 */ u8 unk_16;
 }; // size: 0x018
 
+struct UnkSaveBlock2Substruct_B0
+{
+    /* 0x000:0x0B0 */ u8 field_0[0x3F0];
+    /* 0x3F0:0x4A0 */ u32 field_3F0[0x2F];
+    /* 0x4AC:0x55C */ struct UnkSaveBlock2Substruct_55C field_4AC;
+    /* 0x4C4:0x574 */ u8 field_4C4[0x324];
+}; // size: 0x7E8
+
 struct SaveBlock2
 {
     /*0x000*/ u8 playerName[PLAYER_NAME_LENGTH];
@@ -230,11 +238,7 @@ struct SaveBlock2
     /*0x0AC*/ u8 field_AC;
     /*0x0AD*/ u8 field_AD;
     /*0x0AE*/ u8 filler_AE[0x2];
-    /*0x0B0*/ u8 field_B0;
-    /*0x0B1*/ u8 filler_B1[0x3EF];
-    /*0x4A0*/ u32 unk_4A0[0x2F];
-    /*0x55c*/ struct UnkSaveBlock2Substruct_55C unk_55C;
-    /*0x574*/ u8 filler_574[0x324];
+    /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;    
     /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
-- 
cgit v1.2.3


From 355c82e13e4b4957c27854142990670ba6e4bf0d Mon Sep 17 00:00:00 2001
From: ultima-soul <akshayjhanji@hotmail.com>
Date: Sun, 6 Oct 2019 14:51:44 -0700
Subject: Remove trailing white space.

---
 include/global.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/global.h')

diff --git a/include/global.h b/include/global.h
index 98dd8ab2c..35f8de01b 100644
--- a/include/global.h
+++ b/include/global.h
@@ -238,7 +238,7 @@ struct SaveBlock2
     /*0x0AC*/ u8 field_AC;
     /*0x0AD*/ u8 field_AD;
     /*0x0AE*/ u8 filler_AE[0x2];
-    /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;    
+    /*0x0B0*/ struct UnkSaveBlock2Substruct_B0 unk_B0;
     /*0x898*/ u16 mapView[0x100];
     /*0xA98*/ struct LinkBattleRecords linkBattleRecords;
     /*0xAF0*/ struct BerryCrush berryCrush;
-- 
cgit v1.2.3