diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
| commit | 153858af6035015ca8aae24f44640ce7f25679bc (patch) | |
| tree | 66e6c438d0bb15348d0016195e17e19389cf6f99 /include/global.h | |
| parent | 04d176334ad590d3462e3c1eb75c1313705ae183 (diff) | |
| parent | 3170b753442da34dbdff6f141f0d2223973c0e83 (diff) | |
Merge master into doc-questlog
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index 606b8f9b3..180a1e0a3 100644 --- a/include/global.h +++ b/include/global.h @@ -712,6 +712,12 @@ struct TrainerRematchState u8 rematches[100]; }; +struct TrainerNameRecord +{ + u32 trainerId; + u8 trainerName[PLAYER_NAME_LENGTH]; +}; + struct SaveBlock1 { /*0x0000*/ struct Coords16 pos; @@ -766,7 +772,8 @@ struct SaveBlock1 /*0x3A18*/ u8 seen2[DEX_FLAGS_NO]; /*0x3A4C*/ u8 rivalName[PLAYER_NAME_LENGTH]; /*0x3A54*/ struct FameCheckerSaveData fameChecker[NUM_FAMECHECKER_PERSONS]; - /*0x3A94*/ u8 filler3A94[0x204]; + /*0x3A94*/ u8 filler3A94[0x114]; + /*0x3BA8*/ struct TrainerNameRecord trainerNameRecords[20]; /*0x3C98*/ struct DaycareMon route5DayCareMon; /*0x3D24*/ u8 filler3D24[0x10]; /*0x3D34*/ u32 unkArrayIdx; |