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 /include/heal_location.h | |
parent | c0a27d5455014bfe54f7ea73e8a38ce0ed8da6da (diff) | |
parent | e3c26e52ae6ab881ade913ca1fad2cd9629bbcb1 (diff) |
Merge remote-tracking branch 'origin/master'
Conflicts:
Makefile
Diffstat (limited to 'include/heal_location.h')
-rw-r--r-- | include/heal_location.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/heal_location.h b/include/heal_location.h index 785918bd6..94dac2417 100644 --- a/include/heal_location.h +++ b/include/heal_location.h @@ -5,10 +5,10 @@ struct HealLocation { - s8 group; - s8 map; - u16 x; - u16 y; + s8 group; + s8 map; + u16 x; + u16 y; }; u32 GetHealLocationIndexByMap(u16 mapGroup, u16 mapNum); |