diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-05-19 12:32:44 +0200 |
| commit | e44f35c7b7fb49a55073c5b40257a4b8052cd5a0 (patch) | |
| tree | ad35f76e058386824229a64290a1ef15a9f120c2 /include/global.h | |
| parent | 0c1f85f2002e911f64a3b188fa30d8f465c0fc7e (diff) | |
| parent | db898d0e4854c70a356d037919ea48aed1f62816 (diff) | |
fix record mixing merge conflicts
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 46413b197..a117a6391 100644 --- a/include/global.h +++ b/include/global.h @@ -281,7 +281,8 @@ struct SaveBlock2 /*0xAC*/ u32 encryptionKey; // TODO: fix and verify labels - /*0xB0*/ u8 field_B0[316]; + /*0xB0*/ u8 field_B0[0x2c]; + /*0xDC*/ u8 field_0DC[0x110]; /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; @@ -642,12 +643,13 @@ struct LilycoveLadyContest /*0x00e*/ u8 language; }; -typedef union // TODO +typedef union { struct LilycoveLadyQuiz quiz; struct LilycoveLadyFavour favour; struct LilycoveLadyContest contest; u8 id; + u8 pad[0x40]; } LilycoveLady; struct WaldaPhrase |