diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-18 02:59:01 -0400 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-10-18 02:59:01 -0400 |
| commit | 2db57c612570c5a74e6b30bec8074f70132636b1 (patch) | |
| tree | d0c14d87edf3aa209d274d0987e875334a3e9462 /include/global.h | |
| parent | fbbe7c5e4c42f6c4a25c40216e4eda1d1b1fb89e (diff) | |
| parent | a335716a41ebed9b221a7569ab426a2efdd5d719 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into clean_bike
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 6b0a0cb01..7c1ac9c68 100644 --- a/include/global.h +++ b/include/global.h @@ -130,12 +130,12 @@ struct UCoords16 struct SecretBaseRecord { - /*ID?*/ /*0x1A08*/ u8 sbr_field_0; + /*0x1A08*/ u8 secretBaseId; /*0x1A09*/ u8 sbr_field_1_0:4; /*0x1A09*/ u8 gender:1; /*0x1A09*/ u8 sbr_field_1_5:1; /*0x1A09*/ u8 sbr_field_1_6:2; - /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes? + /*0x1A0A*/ u8 playerName[OT_NAME_LENGTH]; /*0x1A11*/ u8 trainerId[4]; // byte 0 is used for determining trainer class /*0x1A16*/ u16 sbr_field_e; /*0x1A18*/ u8 sbr_field_10; |