diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/field/field_weather.c | 2 | ||||
| -rw-r--r-- | src/field/fieldmap.c | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/src/field/field_weather.c b/src/field/field_weather.c index c954242a1..48d7da7f7 100644 --- a/src/field/field_weather.c +++ b/src/field/field_weather.c @@ -843,7 +843,7 @@ void fade_screen(u8 a, u8 delay) bool8 sub_807D770(void) { - return gWeatherPtr->unknown_6C6 ^ 1 ? TRUE : FALSE; + return (gWeatherPtr->unknown_6C6 != 1); } void sub_807D78C(u8 a) diff --git a/src/field/fieldmap.c b/src/field/fieldmap.c index 7a31ae720..7383bb174 100644 --- a/src/field/fieldmap.c +++ b/src/field/fieldmap.c @@ -86,18 +86,20 @@ void map_copy_with_padding(u16 *map, u16 width, u16 height) void sub_80560AC(struct MapHeader *mapHeader) { + // BUG: This results in a null pointer dereference when mapHeader->connections + // is NULL, causing count to be assigned a garbage value. This garbage value + // just so happens to have the most significant bit set, so it is treated as + // negative and the loop below thankfully never executes in this scenario. + int count = mapHeader->connections->count; + struct MapConnection *connection = mapHeader->connections->connections; int i; - struct MapConnection *connection; - struct MapHeader *cMap; - u32 offset; - int count; - count = mapHeader->connections->count; - connection = mapHeader->connections->connections; + gUnknown_0202E850 = sDummyConnectionFlags; for (i = 0; i < count; i++, connection++) { - cMap = mapconnection_get_mapheader(connection); - offset = connection->offset; + struct MapHeader *cMap = mapconnection_get_mapheader(connection); + u32 offset = connection->offset; + switch (connection->direction) { case CONNECTION_SOUTH: |