summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-10-08 12:10:33 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-10-08 12:10:33 -0400
commit7040e8e9568a21ef8417c7de6e47fd636dcd7865 (patch)
tree798c013a06652158fdb64e5da9d1b8a8df5040c4 /include/global.h
parentf285a81e859bb045725acac3d33f2d7d665ee8c5 (diff)
sub_8146C30
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h21
1 files changed, 20 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h
index 75911b9f2..2b35e303d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -466,6 +466,14 @@ struct RecordMixingDayCareMail
bool16 holdsItem[DAYCARE_MON_COUNT];
};
+struct MysteryEventStruct
+{
+ u8 unk_0_0:2;
+ u8 unk_0_2:6;
+ u8 unk_1;
+ u8 filler_2[0x1ba];
+};
+
#define MAP_OBJECTS_COUNT 16
#define BERRY_TREES_COUNT 128
#define FLAGS_COUNT 300
@@ -476,7 +484,18 @@ struct SaveBlock1
{
/*0x0000*/ u8 filler[0x4];
/*0x0004*/ struct WarpData location;
- /*0x000C*/ u8 fillerC[0x3610];
+ /*0x0C*/ struct WarpData warp1;
+ /*0x14*/ struct WarpData warp2;
+ /*0x1C*/ struct WarpData lastHealLocation;
+ /*0x24*/ struct WarpData warp4;
+ /*0x002C*/ u8 filler2C[0x60C];
+ /*0x638*/ u8 trainerRematchStepCounter;
+ u8 filler_639;
+ /*0x63a*/ u8 trainerRematches[100];
+ /*0x06A0*/ struct MapObject mapObjects[MAP_OBJECTS_COUNT];
+ /*0x08E0*/ struct MapObjectTemplate mapObjectTemplates[64];
+ /*0x0EE0*/ u8 fillerEE0[0x2580];
+ /*0x3460*/ struct MysteryEventStruct unk_3460;
/*0x361C*/ struct RamScript ramScript;
/*0x3A08*/ u8 filler3A08[0x44];
/*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH];