diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-06 10:15:45 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-06 10:15:45 -0500 |
| commit | e6d86ff7748e67d22ec22e7f842bd9552fd8f292 (patch) | |
| tree | 7c3be19b73aae2f31f0cca77e94621aced62c7be /include/global.h | |
| parent | e03aeeec0de589ce361eb37edb4fc091f0959a1a (diff) | |
| parent | 818dfa314e1658ab797af686fedd464c9fda6557 (diff) | |
Merge branch 'master' into cable_car
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 8c13ad502..eea1574b7 100644 --- a/include/global.h +++ b/include/global.h @@ -33,7 +33,7 @@ int strcmp (const char *, const char *); #define POKEMON_NAME_LENGTH 10 #define OT_NAME_LENGTH 7 -#define min(a, b) ((a) <= (b) ? (a) : (b)) +#define min(a, b) ((a) < (b) ? (a) : (b)) #define max(a, b) ((a) >= (b) ? (a) : (b)) // why does GF hate 2d arrays @@ -682,7 +682,7 @@ struct SaveBlock1 /* 0x02025734 */ /*0x2B40*/ u16 unk2B40[6]; } easyChats; /*0x2B4C*/ struct MailStruct mail[16]; - /*0x2D8C*/ u8 unk2D8C[4]; + /*0x2D8C*/ u8 unk2D8C[4]; // What is this? Apparently it's supposed to be 64 bytes in size. /*0x2D90*/ u8 filler_2D90[0x4]; /*0x2D94*/ union MauvilleMan mauvilleMan; /*0x2DD4*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff |