diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-24 21:18:36 -0700 |
| commit | e92e2cb0aa31adf9872b147a1b6deb9d9844b7e8 (patch) | |
| tree | b3e357be8cec0c64a84773a7b63f54f97825cbaf /src/fieldmap.c | |
| parent | 156fb472e10c10751268d2339b2526c8bd07e34f (diff) | |
| parent | 5883f867f00b8cc3f3630a8ab4aa2e9d21406949 (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
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 |