diff --git a/data/Memory-ng.xml b/data/Memory-ng.xml index 1db405dae..d34825c3e 100644 --- a/data/Memory-ng.xml +++ b/data/Memory-ng.xml @@ -885,7 +885,7 @@
-
+
@@ -1454,7 +1454,32 @@ - + + + + +
+ 0x01482874 - current race + +
+
+
+
+
+
+ + +
+ + +
+ + +
+ + + + 31.13 WEATHER_START 0147E94E .-"""-. ' \ |,. ,-. | _________________________ @@ -1804,7 +1829,7 @@
-
+
diff --git a/library/modules/World.cpp b/library/modules/World.cpp index 009b696ac..3e1a670de 100644 --- a/library/modules/World.cpp +++ b/library/modules/World.cpp @@ -133,12 +133,22 @@ uint32_t World::ReadCurrentDay() uint8_t World::ReadCurrentWeather() { if (d->Inited && d->StartedWeather) - return(d->owner->readByte(d->weather_offset)); + return(d->owner->readByte(d->weather_offset + 12)); return 0; } - +/* void World::SetCurrentWeather(uint8_t weather) { if (d->Inited && d->StartedWeather) d->owner->writeByte(d->weather_offset,weather); } +*/ +void World::SetCurrentWeather(uint8_t weather) +{ + if (d->Inited && d->StartedWeather) + { + uint8_t buf[25]; + memset(&buf,weather, sizeof(buf)); + d->owner->write(d->weather_offset,sizeof(buf),buf); + } +}