diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-01-06 20:57:36 -0500 |
| commit | 86f0291f63ff6bc580476dae3c00fc4d6d7b15da (patch) | |
| tree | 37d03c82f0b43a4a0b856610c5b36fe96dc3ebed /include/global.h | |
| parent | deac7fd3706ea9de855330881e2555a8c70d72f3 (diff) | |
| parent | 680d3fd7b980578024226eccffe2e01072826227 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'include/global.h')
| -rw-r--r-- | include/global.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/global.h b/include/global.h index 9c7a4fc08..4c118db13 100644 --- a/include/global.h +++ b/include/global.h @@ -15,9 +15,9 @@ #define INCBIN_S8 {0} #define INCBIN_S16 {0} #define INCBIN_S32 {0} -void * memcpy (void *, const void *, size_t); -void * memset (void *, int, size_t); -int strcmp (const char *, const char *); +void *memcpy (void *, const void *, size_t); +void *memset (void *, int, size_t); +int strcmp (const char *, const char *); #endif // Prevent cross-jump optimization. @@ -34,7 +34,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 @@ -683,7 +683,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 @@ -844,5 +844,6 @@ struct HallOfFame extern struct HallOfFame gHallOfFame; extern struct SaveBlock2 gSaveBlock2; +extern u8 ewram[]; #endif // GUARD_GLOBAL_H |