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 /asm | |
| parent | e2a0522780d7124a392bf028c9c1f50c4213b460 (diff) | |
| parent | 003ed9293b2c51f0481ed31f0e0459cbecbf757e (diff) | |
Merge pull request #544 from huderlem/weather
Further document weather
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/pokemon_storage_system.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 2ac873fcd..5b5dfbdd5 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -593,7 +593,7 @@ _08095EF4: .align 2, 0 _08095F18: .4byte gUnknown_083B600C _08095F1C: - bl sub_807D770 + bl IsWeatherNotFadingIn lsls r0, 24 cmp r0, 0 bne _08095F28 @@ -732,7 +732,7 @@ _08096030: .4byte gPCText_OnlyOne _08096034: movs r0, 0x1 movs r1, 0 - bl fade_screen + bl FadeScreen movs r0, 0x4 strh r0, [r4, 0x8] b _080960F4 |