diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-16 23:22:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-16 23:22:52 +0800 |
| commit | c7d3ad06b062abf6acb2eaa2b19da86a7acdab19 (patch) | |
| tree | dda0c0701f1f73921fc2d7ca3fd1b6133473aad4 /asm/ghost.s | |
| parent | b7bdad5b2594b847a7d9c70970505c45dabca462 (diff) | |
| parent | e13e7eccafdc48b648bf20f8e02f72130c51d1ab (diff) | |
Merge branch 'master' into pokemon
Diffstat (limited to 'asm/ghost.s')
| -rw-r--r-- | asm/ghost.s | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/asm/ghost.s b/asm/ghost.s index e3665a210..2d550e6f7 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -2349,7 +2349,7 @@ _080B64A4: asrs r0, 16 bl __floatsidf ldr r2, _080B658C @ =0x3fb00000 - ldr r3, _080B6590 @ =0x00000000 + ldr r3, _080B658C+4 @ =0x00000000 bl __muldf3 adds r5, r1, 0 adds r4, r0, 0 @@ -2375,7 +2375,7 @@ _080B64A4: asrs r0, 16 bl __floatsidf ldr r2, _080B658C @ =0x3fb00000 - ldr r3, _080B6590 @ =0x00000000 + ldr r3, _080B658C+4 @ =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -2398,8 +2398,8 @@ _080B64A4: lsls r0, r2, 16 asrs r0, 16 bl __floatsidf - ldr r2, _080B658C @ =0x3fb00000 - ldr r3, _080B6590 @ =0x00000000 + ldr r2, _080B658C @ =0x3fb00000 + ldr r3, _080B658C+4 @ =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -2416,8 +2416,8 @@ _080B64A4: lsls r0, r1, 16 asrs r0, 16 bl __floatsidf - ldr r2, _080B658C @ =0x3fb00000 - ldr r3, _080B6590 @ =0x00000000 + ldr r2, _080B658C @ =0x3fb00000 + ldr r3, _080B658C+4 @ =0x00000000 bl __muldf3 ldr r2, [sp, 0x18] ldr r3, [sp, 0x1C] @@ -2433,8 +2433,7 @@ _080B64A4: b _080B65C2 .align 2, 0 _080B6588: .4byte gTasks -_080B658C: .4byte 0x3fb00000 -_080B6590: .4byte 0x00000000 +_080B658C: .double 0.0625 _080B6594: movs r2, 0 mov r9, r2 |