diff options
| author | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-03-22 18:34:29 -0400 |
| commit | 7acbfe40778bfbd03b0e2d357efef9ee9b0a34e9 (patch) | |
| tree | 90c0b95146f3d768b536658eac6a63ff9adcaaec /src/event_data.c | |
| parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
| parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) | |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'src/event_data.c')
| -rw-r--r-- | src/event_data.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/event_data.c b/src/event_data.c index b1c0632ec..c6aecf13c 100644 --- a/src/event_data.c +++ b/src/event_data.c @@ -2,29 +2,34 @@ #include "event_data.h" #include "pokedex.h" -extern u8 gUnknown_0202E8E2[]; +#define TEMP_FLAGS_SIZE 0x4 +#define TEMP_UPPER_FLAGS_SIZE 0x8 +#define TEMP_VARS_SIZE 0x20 + +extern u8 gUnknown_0202E8E2[16]; extern u16 *gSpecialVars[]; void InitEventData(void) { memset(gSaveBlock1.flags, 0, sizeof(gSaveBlock1.flags)); memset(gSaveBlock1.vars, 0, sizeof(gSaveBlock1.vars)); - memset(gUnknown_0202E8E2, 0, 16); + memset(gUnknown_0202E8E2, 0, sizeof(gUnknown_0202E8E2)); } void ClearTempFieldEventData(void) { - memset(gSaveBlock1.flags, 0, 4); - memset(gSaveBlock1.vars, 0, 32); + memset(gSaveBlock1.flags, 0, TEMP_FLAGS_SIZE); + memset(gSaveBlock1.vars, 0, TEMP_VARS_SIZE); FlagReset(SYS_ENC_UP_ITEM); FlagReset(SYS_ENC_DOWN_ITEM); FlagReset(SYS_USE_STRENGTH); FlagReset(SYS_CTRL_OBJ_DELETE); } +// probably had different flag splits at one point. void ClearUpperFlags(void) { - memset(gSaveBlock1.flags + 0x118, 0, 8); + memset(gSaveBlock1.flags + 0x118, 0, TEMP_UPPER_FLAGS_SIZE); } void DisableNationalPokedex(void) |