diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-21 22:29:35 -0600 |
| commit | 663ecd00145da49fda7d2509d629d737ea633cd8 (patch) | |
| tree | a4cfc7323151501d5603f1cd34e68a73f328434e /asm/unknown_task.s | |
| parent | a78b0636f50c012c3618d55a9b83f834319de6e0 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor
Diffstat (limited to 'asm/unknown_task.s')
| -rw-r--r-- | asm/unknown_task.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/unknown_task.s b/asm/unknown_task.s index f6b96287e..a8672ac8f 100644 --- a/asm/unknown_task.s +++ b/asm/unknown_task.s @@ -5,8 +5,8 @@ .text - thumb_func_start remove_some_task -remove_some_task: @ 80B9FB8 + thumb_func_start ScanlineEffect_Stop +ScanlineEffect_Stop: @ 80B9FB8 push {r4,lr} ldr r4, =gUnknown_02039B28 movs r0, 0 @@ -32,7 +32,7 @@ _080B9FE2: pop {r0} bx r0 .pool - thumb_func_end remove_some_task + thumb_func_end ScanlineEffect_Stop thumb_func_start dp12_8087EA4 dp12_8087EA4: @ 80B9FF8 |