diff options
| -rw-r--r-- | asm/ghost.s | 15 | ||||
| -rw-r--r-- | asm/pokemon_summary_screen.s | 10 |
2 files changed, 11 insertions, 14 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 diff --git a/asm/pokemon_summary_screen.s b/asm/pokemon_summary_screen.s index 2fa836876..55aba69ec 100644 --- a/asm/pokemon_summary_screen.s +++ b/asm/pokemon_summary_screen.s @@ -10482,7 +10482,7 @@ _08139BA0: bl __floatsidf str r0, [sp] str r1, [sp, 0x4] - ldr r3, _08139BDC @ =0x9999999a + ldr r3, _08139BD8+4 @ =0x9999999a ldr r2, _08139BD8 @ =0x3fe99999 bl __muldf3 adds r5, r1, 0 @@ -10503,11 +10503,10 @@ _08139BA0: movs r0, 0x2 b _08139C16 .align 2, 0 -_08139BD8: .4byte 0x3fe99999 -_08139BDC: .4byte 0x9999999a +_08139BD8: .double 0.8 _08139BE0: .4byte gUnknown_203B170 _08139BE4: - ldr r3, _08139C08 @ =0x33333333 + ldr r3, _08139C04+4 @ =0x33333333 ldr r2, _08139C04 @ =0x3fe33333 ldr r0, [sp] ldr r1, [sp, 0x4] @@ -10522,8 +10521,7 @@ _08139BE4: movs r0, 0x1 b _08139C16 .align 2, 0 -_08139C04: .4byte 0x3fe33333 -_08139C08: .4byte 0x33333333 +_08139C04: .double 0.6 _08139C0C: .4byte gUnknown_203B170 _08139C10: ldr r0, _08139C38 @ =gUnknown_203B170 |