diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-10-17 20:03:31 -0400 |
| commit | 2c6d634acdf7bd22fb7e5c4933ff2e13712d2ec3 (patch) | |
| tree | 9d51a6c1c07da6946022fe5867e34300bd71493d /include/global.h | |
| parent | 65a0c48eec7d2184478841d232d1fb3c3350fa37 (diff) | |
| parent | f67bbbdaaa905833f1c2a315624128aafef9a4cb (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_party_menu
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 60 |
1 files changed, 45 insertions, 15 deletions
diff --git a/include/global.h b/include/global.h index 9ae892b5c..027065481 100644 --- a/include/global.h +++ b/include/global.h @@ -61,8 +61,6 @@ #define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) -#define HEAP_SIZE 0x1C000 - extern u8 gStringVar1[]; extern u8 gStringVar2[]; extern u8 gStringVar3[]; @@ -178,12 +176,14 @@ enum OPTIONS_BATTLE_STYLE_SET }; -struct Coords8 { +struct Coords8 +{ s8 x; s8 y; }; -struct UCoords8 { +struct UCoords8 +{ u8 x; u8 y; }; @@ -295,11 +295,25 @@ struct UnknownSaveBlock2Struct u8 field_EB; }; // sizeof = 0xEC -struct UnkRecordMixingStruct +struct ApprenticeMon { - u8 field_0[0x34]; + u16 species; + u16 moves[4]; + u16 item; +}; + +struct Apprentice +{ + u8 id:5; + u8 lvlMode:2; // + 1 + u8 field_1; + u8 number; + struct ApprenticeMon monData[3]; + u16 easyChatWords[6]; u8 playerId[4]; - u8 field_38[10]; + u8 playerName[PLAYER_NAME_LENGTH]; + u8 language; + u32 unk40; }; struct UnknownPokemonStruct @@ -466,6 +480,28 @@ struct BattleFrontier /*0xEFC*/ struct FrontierMonData field_EFC[3]; }; +struct Sav2_B8 +{ + u8 unk0_0:2; + u8 unk0_1:2; + u8 unk0_2:2; + u8 unk0_3:2; + u16 unk2; +}; + +struct PlayersApprentice +{ + /*0xB0*/ u8 id; + /*0xB1*/ u8 activeLvlMode:2; // +1, 0 means not active + /*0xB1*/ u8 field_B1_1:4; + /*0xB1*/ u8 field_B1_2:2; + /*0xB2*/ u8 field_B2_0:3; + /*0xB2*/ u8 field_B2_1:2; + /*0xB3*/ u8 field_B3; + /*0xB4*/ u8 monIds[3]; + /*0xB8*/ struct Sav2_B8 field_B8[9]; +}; + struct SaveBlock2 { /*0x00*/ u8 playerName[PLAYER_NAME_LENGTH + 1]; @@ -489,14 +525,8 @@ struct SaveBlock2 /*0xA0*/ struct Time lastBerryTreeUpdate; /*0xA8*/ u32 field_A8; /*0xAC*/ u32 encryptionKey; - - // TODO: fix and verify labels - /*0xB0*/ u8 field_B0; - /*0xB1*/ u8 field_B1; - /*0xB2*/ u8 field_B2_0:3; - /*0xB2*/ u8 field_B2_1:2; - /*0xB3*/ u8 field_B3[0x29]; - /*0xDC*/ struct UnkRecordMixingStruct field_DC[4]; + /*0xB0*/ struct PlayersApprentice playerApprentice; + /*0xDC*/ struct Apprentice apprentices[4]; /*0x1EC*/ struct BerryCrush berryCrush; /*0x1FC*/ struct PokemonJumpResults pokeJump; /*0x20C*/ struct BerryPickingResults berryPick; |