dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dodrio_berry_picking

Browse Source
This commit is contained in:
PikalaxALT
2019-04-05 08:41:31 -04:00
parent a677d1f4cb 9e74409bb2
commit a58d9a16dd
306 changed files with 20985 additions and 31720 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/global.h
View File

@@ -821,7 +821,7 @@ struct MysteryEventStruct
u8 unk_1;
};
struct MEventBuffer_3120_Sub
struct WonderNews
{
u16 unk_00;
u8 unk_02;
@@ -830,13 +830,13 @@ struct MysteryEventStruct
u8 unk_2C[10][40];
};
struct MEventBuffer_3120
struct WonderNewsSaveStruct
{
u32 crc;
struct MEventBuffer_3120_Sub data;
struct WonderNews data;
};
struct MEventBuffer_32E0_Sub
struct WonderCard
{
u16 unk_00;
u16 unk_02;
@@ -852,10 +852,10 @@ struct MysteryEventStruct
u8 unk_122[40];
};
struct MEventBuffer_32E0
struct WonderCardSaveStruct
{
u32 crc;
struct MEventBuffer_32E0_Sub data;
struct WonderCard data;
};
struct MEventBuffer_3430_Sub
@@ -875,8 +875,8 @@ struct MysteryEventStruct
struct MEventBuffers
{
/*0x000 0x322C*/ struct MEventBuffer_3120 buffer_000;
/*0x1c0 0x33EC*/ struct MEventBuffer_32E0 buffer_1c0;
/*0x000 0x322C*/ struct WonderNewsSaveStruct wonderNews;
/*0x1c0 0x33EC*/ struct WonderCardSaveStruct wonderCard;
/*0x310 0x353C*/ struct MEventBuffer_3430 buffer_310;
/*0x338 0x3564*/ u16 unk_338[4];
/*0x340 0x356C*/ struct MysteryEventStruct unk_340;
@@ -967,7 +967,8 @@ struct SaveBlock1
/*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
/*0x3B58*/ LilycoveLady lilycoveLady;
/*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
/*0x3C88*/ u8 unk3C88[11][20];
/*0x3C88*/ u8 unk3C88[10][21];
/*0x3D5A*/ u8 filler3D5A[0xA];
/*0x3D64*/ struct SaveTrainerHill trainerHill;
/*0x3D70*/ struct WaldaPhrase waldaPhrase;
// sizeof: 0x3D88