mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-27 04:04:17 +01:00
Merge pull request #1695 from GriffinRichards/update-gfromh
Update some GF rom header names
This commit is contained in:
commit
650f033c2b
@ -30,10 +30,10 @@ struct GFRomHeader
|
|||||||
u32 pokedexFlag;
|
u32 pokedexFlag;
|
||||||
u32 mysteryEventFlag;
|
u32 mysteryEventFlag;
|
||||||
u32 pokedexCount;
|
u32 pokedexCount;
|
||||||
u8 unk1;
|
u8 playerNameLength;
|
||||||
u8 unk2;
|
u8 unk2;
|
||||||
u8 unk3;
|
u8 pokemonNameLength1;
|
||||||
u8 unk4;
|
u8 pokemonNameLength2;
|
||||||
u8 unk5;
|
u8 unk5;
|
||||||
u8 unk6;
|
u8 unk6;
|
||||||
u8 unk7;
|
u8 unk7;
|
||||||
@ -79,8 +79,8 @@ struct GFRomHeader
|
|||||||
u32 pcItemsOffset;
|
u32 pcItemsOffset;
|
||||||
u32 giftRibbonsOffset;
|
u32 giftRibbonsOffset;
|
||||||
u32 enigmaBerryOffset;
|
u32 enigmaBerryOffset;
|
||||||
u32 mapViewOffset;
|
u32 enigmaBerrySize;
|
||||||
u32 unk19;
|
const u8 * moveDescriptions;
|
||||||
u32 unk20;
|
u32 unk20;
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -110,23 +110,24 @@ static const struct GFRomHeader sGFRomHeader = {
|
|||||||
.pokedexFlag = FLAG_RECEIVED_POKEDEX_FROM_BIRCH,
|
.pokedexFlag = FLAG_RECEIVED_POKEDEX_FROM_BIRCH,
|
||||||
.mysteryEventFlag = FLAG_SYS_MYSTERY_EVENT_ENABLE,
|
.mysteryEventFlag = FLAG_SYS_MYSTERY_EVENT_ENABLE,
|
||||||
.pokedexCount = NATIONAL_DEX_COUNT,
|
.pokedexCount = NATIONAL_DEX_COUNT,
|
||||||
.unk1 = 0x07,
|
.playerNameLength = PLAYER_NAME_LENGTH,
|
||||||
.unk2 = 0x0a,
|
.unk2 = 10,
|
||||||
.unk3 = 0x0a,
|
.pokemonNameLength1 = POKEMON_NAME_LENGTH,
|
||||||
.unk4 = 0x0a,
|
.pokemonNameLength2 = POKEMON_NAME_LENGTH,
|
||||||
.unk5 = 0x0c,
|
// Two of the below 12s are likely move/ability name length, given their presence in this header
|
||||||
.unk6 = 0x0c,
|
.unk5 = 12,
|
||||||
.unk7 = 0x06,
|
.unk6 = 12,
|
||||||
.unk8 = 0x0c,
|
.unk7 = 6,
|
||||||
.unk9 = 0x06,
|
.unk8 = 12,
|
||||||
.unk10 = 0x10,
|
.unk9 = 6,
|
||||||
.unk11 = 0x12,
|
.unk10 = 16,
|
||||||
.unk12 = 0x0c,
|
.unk11 = 18,
|
||||||
.unk13 = 0x0f,
|
.unk12 = 12,
|
||||||
.unk14 = 0x0b,
|
.unk13 = 15,
|
||||||
.unk15 = 0x01,
|
.unk14 = 11,
|
||||||
.unk16 = 0x08,
|
.unk15 = 1,
|
||||||
.unk17 = 0x0c,
|
.unk16 = 8,
|
||||||
|
.unk17 = 12,
|
||||||
.saveBlock2Size = sizeof(struct SaveBlock2),
|
.saveBlock2Size = sizeof(struct SaveBlock2),
|
||||||
.saveBlock1Size = sizeof(struct SaveBlock1),
|
.saveBlock1Size = sizeof(struct SaveBlock1),
|
||||||
.partyCountOffset = offsetof(struct SaveBlock1, playerPartyCount),
|
.partyCountOffset = offsetof(struct SaveBlock1, playerPartyCount),
|
||||||
@ -159,7 +160,7 @@ static const struct GFRomHeader sGFRomHeader = {
|
|||||||
.pcItemsOffset = offsetof(struct SaveBlock1, pcItems),
|
.pcItemsOffset = offsetof(struct SaveBlock1, pcItems),
|
||||||
.giftRibbonsOffset = offsetof(struct SaveBlock1, giftRibbons),
|
.giftRibbonsOffset = offsetof(struct SaveBlock1, giftRibbons),
|
||||||
.enigmaBerryOffset = offsetof(struct SaveBlock1, enigmaBerry),
|
.enigmaBerryOffset = offsetof(struct SaveBlock1, enigmaBerry),
|
||||||
.mapViewOffset = offsetof(struct SaveBlock1, mapView),
|
.enigmaBerrySize = sizeof(struct EnigmaBerry),
|
||||||
.unk19 = 0x00000000,
|
.moveDescriptions = NULL,
|
||||||
.unk20 = 0x00000000, // 0xFFFFFFFF in FRLG
|
.unk20 = 0x00000000, // 0xFFFFFFFF in FRLG
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user