diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-07-26 08:51:21 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-07-26 09:52:22 -0500 |
| commit | 1a378c07c6f95a6805d96852e55e3847e32c03b5 (patch) | |
| tree | 9b7e0d4ca982e48fb1847f6c97329b0f52360248 /include | |
| parent | 016e0e6da31b8a8f7d2f30a48127721ed6187b19 (diff) | |
Fix nonmatching SetPlayerSecretBaseRecordMixingParty()
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 | ||||
| -rw-r--r-- | include/secret_base.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/global.h b/include/global.h index 830f7704a..36e1db978 100644 --- a/include/global.h +++ b/include/global.h @@ -176,7 +176,7 @@ struct SecretBaseRecord /*0x1A19*/ u8 sbr_field_11; /*0x1A1A*/ u8 decorations[16]; /*0x1A2A*/ u8 decorationPos[16]; - /*0x1A3A*/ u32 partyPersonality[6]; + /*0x1A3C*/ u32 partyPersonality[6]; /*0x1A54*/ u16 partyMoves[6 * 4]; /*0x1A84*/ u16 partySpecies[6]; /*0x1A90*/ u16 partyHeldItems[6]; diff --git a/include/secret_base.h b/include/secret_base.h index 4748c83d7..a9a205bc4 100644 --- a/include/secret_base.h +++ b/include/secret_base.h @@ -15,7 +15,7 @@ void SetCurrentSecretBaseFromPosition(struct MapPosition *, struct MapEvents *); void sub_80BC038(struct MapPosition *, struct MapEvents *); u8 sub_80BC050(); u8 *GetSecretBaseMapName(u8 *dest); -void sub_80BC300(); +void SetPlayerSecretBaseRecordMixingParty(); u8 sub_80BCCA4(u8 secretBaseIndex); const u8 *GetSecretBaseTrainerLoseText(void); void sub_80BCF1C(u8 taskId); |