diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-17 14:09:06 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-17 14:09:06 -0500 |
| commit | 3c2b1731eeb7037a1b681444b1c126fc239a904e (patch) | |
| tree | 62a669899696f21e7991c226e0eb7e999b3c3ee5 /asm/field_screen.s | |
| parent | 5b526906e1dc4b3dd55cc739670836718a90dff7 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/field_screen.s')
| -rw-r--r-- | asm/field_screen.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/field_screen.s b/asm/field_screen.s index c4028555d..92c2a4924 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -7777,8 +7777,8 @@ _080AEFB6: bx r1 thumb_func_end sub_80AEEE8 - thumb_func_start sub_80AEFBC -sub_80AEFBC: @ 80AEFBC + thumb_func_start UpdateWeatherPerDay +UpdateWeatherPerDay: @ 80AEFBC lsls r0, 16 ldr r1, =gSaveBlock1Ptr ldr r2, [r1] @@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC strb r1, [r2] bx lr .pool - thumb_func_end sub_80AEFBC + thumb_func_end UpdateWeatherPerDay thumb_func_start sub_80AEFDC sub_80AEFDC: @ 80AEFDC |