diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /asm/field_weather.s | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'asm/field_weather.s')
| -rw-r--r-- | asm/field_weather.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_weather.s b/asm/field_weather.s index e8d3ba7ee..ac24101a7 100644 --- a/asm/field_weather.s +++ b/asm/field_weather.s @@ -2672,8 +2672,8 @@ _0807B054: .4byte gUnknown_2037F34 _0807B058: .4byte 0x000006d3 thumb_func_end sub_807B048 - thumb_func_start sub_807B05C -sub_807B05C: @ 807B05C + thumb_func_start SetWeatherScreenFadeOut +SetWeatherScreenFadeOut: @ 807B05C ldr r0, _0807B068 @ =gUnknown_2037F34 ldr r1, _0807B06C @ =0x000006c6 adds r0, r1 @@ -2683,7 +2683,7 @@ sub_807B05C: @ 807B05C .align 2, 0 _0807B068: .4byte gUnknown_2037F34 _0807B06C: .4byte 0x000006c6 - thumb_func_end sub_807B05C + thumb_func_end SetWeatherScreenFadeOut thumb_func_start sub_807B070 sub_807B070: @ 807B070 |