diff options
| author | garak <garakmon@gmail.com> | 2019-12-12 16:10:45 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2019-12-17 15:05:23 -0500 |
| commit | 7a0edab5732b816536a35b0556d8fa1db13afa30 (patch) | |
| tree | 72ff670401204029da8370356cc4d6348d3f13b9 /include | |
| parent | fc13e1ef6f0daa127b1ab0425d7cfcbed6aeafac (diff) | |
fix rebase conflicts
Diffstat (limited to 'include')
| -rw-r--r-- | include/global.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/global.h b/include/global.h index ea94512f7..abc41a9de 100644 --- a/include/global.h +++ b/include/global.h @@ -745,7 +745,7 @@ struct SaveBlock1 /*0x0638*/ u16 trainerRematchStepCounter; /*0x063A*/ u8 ALIGNED(2) trainerRematches[100]; /*0x06A0*/ struct ObjectEvent objectEvents[MAP_OBJECTS_COUNT]; - /*0x08E0*/ struct ObjectEventTemplate mapObjectTemplates[64]; + /*0x08E0*/ struct ObjectEventTemplate objectEventTemplates[64]; /*0x0EE0*/ u8 flags[FLAGS_COUNT]; /*0x1000*/ u16 vars[VARS_COUNT]; /*0x1200*/ u32 gameStats[NUM_GAME_STATS]; |