diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-01-20 15:24:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-20 15:24:20 -0800 |
| commit | 185846f20840c03ba1616c4d0c6eca949147512c (patch) | |
| tree | 2ee03f3c11f552976589d1ac0b0de474bf78fb96 /src/scene | |
| parent | e2a0522780d7124a392bf028c9c1f50c4213b460 (diff) | |
| parent | 003ed9293b2c51f0481ed31f0e0459cbecbf757e (diff) | |
Merge pull request #544 from huderlem/weather
Further document weather
Diffstat (limited to 'src/scene')
| -rw-r--r-- | src/scene/cable_car.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/scene/cable_car.c b/src/scene/cable_car.c index d8e099130..7faa8d844 100644 --- a/src/scene/cable_car.c +++ b/src/scene/cable_car.c @@ -18,6 +18,7 @@ #include "event_data.h" #include "cable_car_util.h" #include "constants/map_objects.h" +#include "constants/weather.h" // Static type declarations @@ -328,7 +329,7 @@ static void sub_8123740(void) i = 0; sub_8123FBC(0); gSpriteCoordOffsetX = 0; - sub_807C9B4(0); + sub_807C9B4(WEATHER_NONE); for (; i < 20; i++) { gWeatherPtr->sprites.s2.ashSprites[i] = NULL; @@ -357,7 +358,7 @@ static void sub_8123878(u8 taskId) case 0: if (sCableCarPtr->unk_0006 == sCableCarPtr->unk_0004) { - DoWeatherEffect(sCableCarPtr->unk_0002); + ChangeWeather(sCableCarPtr->unk_0002); sCableCarPtr->unk_0001 = 1; } break; @@ -769,7 +770,7 @@ static void LoadSprites(void) gSprites[spriteId].data[1] = 0x63; sCableCarPtr->unk_0002 = 7; sCableCarPtr->unk_0004 = 0x15e; - sub_807C9B4(2); + sub_807C9B4(WEATHER_SUNNY); break; case 1: CableCarUtil_CopyWrapped(sCableCarPtr->unk_00fc, eCableCar2->mtChimneyTilemap + 0x24, 0x18, 0x1a, 0x0c, 0x03); @@ -793,7 +794,7 @@ static void LoadSprites(void) gSprites[spriteId].data[1] = 0x41; sCableCarPtr->unk_0002 = 2; sCableCarPtr->unk_0004 = 0x109; - sub_807C9B4(7); + sub_807C9B4(WEATHER_ASH); break; } for (i = 0; i < 9; i++) |