diff options
author | Garak <thomastaps194@comcast.net> | 2018-07-17 09:24:30 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-17 09:24:30 -0400 |
commit | 5e46a0fcc57d421879c1f65b40b4692bbe65a813 (patch) | |
tree | 398b53f56158397a04e0e8de8159e00eeba9acc3 /src/fieldmap.c | |
parent | e06b63efc9ea39875b17f00e5ff20c2e0fcb0415 (diff) | |
parent | 06b3ce408f774c7192202308e783cc22bb8e7643 (diff) |
Merge pull request #2 from pret/master
sync with source repo
Diffstat (limited to 'src/fieldmap.c')
-rw-r--r-- | src/fieldmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index 2561bceb7..f57c4b48f 100644 --- a/src/fieldmap.c +++ b/src/fieldmap.c @@ -380,7 +380,7 @@ u8 MapGridGetZCoordAt(int x, int y) { return 0; } - + return block >> 12; } @@ -559,7 +559,7 @@ void mapdata_from_sav2(void) a0 = 1; else a0 = -1; - + for (j = x; j < x + 15; j++) { if (!sub_8088BF0(&gUnknown_02032318[j + width * i], width, a0)) @@ -922,7 +922,7 @@ bool8 sub_8088BF0(u16* a0, u16 a1, u8 a2) { if (a2 == 0xFF) return FALSE; - + if (a2 == 0) a0 -= a1; else |