From 8950a41bfd1488c06aca80d38a6b1e56f135c704 Mon Sep 17 00:00:00 2001
From: GriffinR <griffin.g.richards@gmail.com>
Date: Tue, 21 Jun 2022 18:31:09 -0400
Subject: [PATCH] Update some GF rom header names

---
 src/rom_header_gf.c | 49 +++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 24 deletions(-)

diff --git a/src/rom_header_gf.c b/src/rom_header_gf.c
index 782a05c75..b854c899e 100644
--- a/src/rom_header_gf.c
+++ b/src/rom_header_gf.c
@@ -30,10 +30,10 @@ struct GFRomHeader
     u32 pokedexFlag;
     u32 mysteryEventFlag;
     u32 pokedexCount;
-    u8 unk1;
+    u8 playerNameLength;
     u8 unk2;
-    u8 unk3;
-    u8 unk4;
+    u8 pokemonNameLength1;
+    u8 pokemonNameLength2;
     u8 unk5;
     u8 unk6;
     u8 unk7;
@@ -79,8 +79,8 @@ struct GFRomHeader
     u32 pcItemsOffset;
     u32 giftRibbonsOffset;
     u32 enigmaBerryOffset;
-    u32 mapViewOffset;
-    u32 unk19;
+    u32 enigmaBerrySize;
+    const u8 * moveDescriptions;
     u32 unk20;
 };
 
@@ -110,23 +110,24 @@ static const struct GFRomHeader sGFRomHeader = {
     .pokedexFlag = FLAG_RECEIVED_POKEDEX_FROM_BIRCH,
     .mysteryEventFlag = FLAG_SYS_MYSTERY_EVENT_ENABLE,
     .pokedexCount = NATIONAL_DEX_COUNT,
-    .unk1 = 0x07,
-    .unk2 = 0x0a,
-    .unk3 = 0x0a,
-    .unk4 = 0x0a,
-    .unk5 = 0x0c,
-    .unk6 = 0x0c,
-    .unk7 = 0x06,
-    .unk8 = 0x0c,
-    .unk9 = 0x06,
-    .unk10 = 0x10,
-    .unk11 = 0x12,
-    .unk12 = 0x0c,
-    .unk13 = 0x0f,
-    .unk14 = 0x0b,
-    .unk15 = 0x01,
-    .unk16 = 0x08,
-    .unk17 = 0x0c,
+    .playerNameLength = PLAYER_NAME_LENGTH,
+    .unk2 = 10,
+    .pokemonNameLength1 = POKEMON_NAME_LENGTH,
+    .pokemonNameLength2 = POKEMON_NAME_LENGTH,
+    // Two of the below 12s are likely move/ability name length, given their presence in this header
+    .unk5 = 12,
+    .unk6 = 12,
+    .unk7 = 6,
+    .unk8 = 12,
+    .unk9 = 6,
+    .unk10 = 16,
+    .unk11 = 18,
+    .unk12 = 12,
+    .unk13 = 15,
+    .unk14 = 11,
+    .unk15 = 1,
+    .unk16 = 8,
+    .unk17 = 12,
     .saveBlock2Size = sizeof(struct SaveBlock2),
     .saveBlock1Size = sizeof(struct SaveBlock1),
     .partyCountOffset = offsetof(struct SaveBlock1, playerPartyCount),
@@ -159,7 +160,7 @@ static const struct GFRomHeader sGFRomHeader = {
     .pcItemsOffset = offsetof(struct SaveBlock1, pcItems),
     .giftRibbonsOffset = offsetof(struct SaveBlock1, giftRibbons),
     .enigmaBerryOffset = offsetof(struct SaveBlock1, enigmaBerry),
-    .mapViewOffset = offsetof(struct SaveBlock1, mapView),
-    .unk19 = 0x00000000,
+    .enigmaBerrySize = sizeof(struct EnigmaBerry),
+    .moveDescriptions = NULL,
     .unk20 = 0x00000000, // 0xFFFFFFFF in FRLG
 };