diff options
| author | SammygoodTunes <sygamerz@gmail.com> | 2025-04-01 21:25:04 +0200 |
|---|---|---|
| committer | SammygoodTunes <sygamerz@gmail.com> | 2025-04-01 21:25:04 +0200 |
| commit | 7608f9c8086f3978dde9bf285f4fff592f67f085 (patch) | |
| tree | 315c1f03de982299039b809b8812a12f3a94ea93 /include | |
| parent | 6b9df2f4701f6790739bba8b07badcf002c7f72e (diff) | |
Resolve conflict
Diffstat (limited to 'include')
| -rw-r--r-- | include/Map/MapBase.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/Map/MapBase.hpp b/include/Map/MapBase.hpp index 0675c1e4..9491e968 100644 --- a/include/Map/MapBase.hpp +++ b/include/Map/MapBase.hpp @@ -112,8 +112,8 @@ public: /* 188 */ unk8 mUnk_188[0x14]; /* 19c */ unk32 mUnk_19c; /* 1a0 */ Vec3p mUnk_1a0; - /* 1ac */ s16 mUnk_1ac; - /* 1ae */ unk8 mUnk_1ae[2]; + /* 1a0 */ unk8 mUnk_1a0[0xc]; + /* 1ac */ unk32 mUnk_1ac; /* 1b0 */ /* 00 */ virtual ~MapBase(); |