diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/clock.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/clock.s')
| -rw-r--r-- | asm/clock.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/clock.s b/asm/clock.s index 01c7e964e..5d771a8b6 100644 --- a/asm/clock.s +++ b/asm/clock.s @@ -27,8 +27,8 @@ sub_809E778: @ 809E778 .pool thumb_func_end sub_809E778 - thumb_func_start sub_809E7B0 -sub_809E7B0: @ 809E7B0 + thumb_func_start DoTimeBasedEvents +DoTimeBasedEvents: @ 809E7B0 push {r4,lr} ldr r0, =0x00000895 bl FlagGet @@ -50,7 +50,7 @@ _0809E7DA: pop {r0} bx r0 .pool - thumb_func_end sub_809E7B0 + thumb_func_end DoTimeBasedEvents thumb_func_start sub_809E7E8 sub_809E7E8: @ 809E7E8 |