summaryrefslogtreecommitdiff
path: root/include/global.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-08 18:09:24 -0500
commit31d31d326034fde26dedaf2dadb1c608e00fb92f (patch)
treebe13ed87df14390256c9a3e582fb11adbe4090b8 /include/global.h
parent26f7ba482384ad4f63063797a527b7fb33572aa1 (diff)
Sync compare macros, some event_scripts.s doc, begin map_scripts constants
Diffstat (limited to 'include/global.h')
-rw-r--r--include/global.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/global.h b/include/global.h
index f4d21704b..d8ea62d5c 100644
--- a/include/global.h
+++ b/include/global.h
@@ -295,8 +295,6 @@ struct SaveBlock2
extern struct SaveBlock2 *gSaveBlock2Ptr;
-#define PARTY_SIZE 6
-
struct SecretBaseParty
{
u32 personality[PARTY_SIZE];
@@ -406,7 +404,7 @@ struct UnkMauvilleOldManStruct
u8 unk_2D95;
/*0x2D96*/ u16 mauvilleOldMan_ecArray[6];
/*0x2DA2*/ u16 mauvilleOldMan_ecArray2[6];
- /*0x2DAE*/ u8 playerName[8];
+ /*0x2DAE*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
/*0x2DB6*/ u8 filler_2DB6[0x3];
/*0x2DB9*/ u8 playerTrainerId[4];
u8 unk_2DBD;