diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-10 14:05:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 14:05:35 -0400 |
| commit | c08b4ff3e1bf49ca1d94a0daf3c8b17581893083 (patch) | |
| tree | b608515803784b47af6c69f8931e6dcaeda165c8 /include | |
| parent | 8188615db8e1e84dbd14bc74eb2ca096c69ea14b (diff) | |
| parent | 7a5deff0bc0f9ab00981e34680015c84618155b9 (diff) | |
Merge pull request #1019 from GriffinRichards/constants-party
Add misc party constant usage
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/global.h | 1 | ||||
| -rw-r--r-- | include/party_menu.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/constants/global.h b/include/constants/global.h index 7c96de511..c7063d71c 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -67,6 +67,7 @@ #define FRONTIER_DOUBLES_PARTY_SIZE 4 #define FRONTIER_MULTI_PARTY_SIZE 2 #define MAX_FRONTIER_PARTY_SIZE FRONTIER_DOUBLES_PARTY_SIZE +#define UNION_ROOM_PARTY_SIZE 2 // string lengths #define ITEM_NAME_LENGTH 14 diff --git a/include/party_menu.h b/include/party_menu.h index 126931762..7f51d08c9 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -24,8 +24,8 @@ extern struct PartyMenu gPartyMenu; extern bool8 gPartyMenuUseExitCallback; extern u8 gSelectedMonPartyId; extern MainCallback gPostMenuFieldCallback; -extern u8 gSelectedOrderFromParty[4]; -extern u8 gBattlePartyCurrentOrder[3]; +extern u8 gSelectedOrderFromParty[MAX_FRONTIER_PARTY_SIZE]; +extern u8 gBattlePartyCurrentOrder[PARTY_SIZE / 2]; extern void (*gItemUseCB)(u8, TaskFunc); |