summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-15 03:40:57 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-15 03:40:57 -0500
commit986d3d8b2fc03bc3e384da15e5d1be4af8507e7b (patch)
tree0dbc9b94fb4d643ed06a5e253eb65b7f0659ae94 /include/global.h
parente95140270be790b03e693f539770abfd6473916e (diff)
Finish and polish new_game.c
Only one function is left undocumented. I tried to go into the assembly to at least name it, but it clears fields in the save block that aren't even documented yet.
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/global.h b/include/global.h
index 14a6387cd..82f31ad53 100644
--- a/include/global.h
+++ b/include/global.h
@@ -376,7 +376,7 @@ struct BattleFrontier
/*0xEBC*/ u32 battlesCount;
/*0xEC0*/ u16 field_EC0[16];
/*0xEE0*/ u8 field_EE0;
- /*0xEE1*/ u8 field_EE1[2][PLAYER_NAME_LENGTH + 1];
+ /*0xEE1*/ u8 opponentName[2][PLAYER_NAME_LENGTH + 1];
/*0xEF1*/ u8 field_EF1[2][4];
/*0xEF9*/ u8 field_EF9_0:7;
/*0xEF9*/ u8 field_EF9_1:1;
@@ -446,7 +446,7 @@ struct SaveBlock2
/*0x90*/ u8 filler_90[0x8];
/*0x98*/ struct Time localTimeOffset;
/*0xA0*/ struct Time lastBerryTreeUpdate;
- /*0xA8*/ u32 field_A8;
+ /*0xA8*/ u32 unusedFlagField; // Written to, but never read.
/*0xAC*/ u32 encryptionKey;
/*0xB0*/ struct PlayersApprentice playerApprentice;
/*0xDC*/ struct Apprentice apprentices[4]; // From record mixing.
@@ -787,7 +787,7 @@ struct WaldaPhrase
bool8 patternUnlocked;
};
-struct UnkSaveSubstruct_3b98
+struct TrainerNameRecord
{
u32 trainerId;
u8 trainerName[PLAYER_NAME_LENGTH + 1];
@@ -891,7 +891,7 @@ struct SaveBlock1
/*0x3B14*/ struct RecordMixingGift recordMixingGift;
/*0x3B24*/ u8 seen2[DEX_FLAGS_NO];
/*0x3B58*/ LilycoveLady lilycoveLady;
- /*0x3B98*/ struct UnkSaveSubstruct_3b98 unk_3B98[20];
+ /*0x3B98*/ struct TrainerNameRecord trainerNameRecords[20];
/*0x3C88*/ u8 filler_3C88[0xDC];
/*0x3D64*/ struct SaveTrainerHill trainerHill;
/*0x3D70*/ struct WaldaPhrase waldaPhrase;