ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 19:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

finish math_util

Browse Source
This commit is contained in:
PikalaxALT 2017-10-28 16:15:36 -04:00
parent 8613e8a54d
commit 6d3778948d
3 changed files with 24 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
asm/math_util.s
View File

@ -1,56 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
thumb_func_start sub_8151624
sub_8151624: @ 8151624
push {lr}
adds r1, r0, 0
movs r0, 0x80
lsls r0, 9
lsls r1, 16
asrs r1, 16
bl __divsi3
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_8151624
thumb_func_start sub_815163C
sub_815163C: @ 815163C
push {lr}
lsls r0, 24
lsrs r0, 24
movs r2, 0x80
lsls r2, 1
lsls r2, r0
lsls r1, 16
asrs r1, 16
adds r0, r2, 0
bl __divsi3
lsls r0, 16
asrs r0, 16
pop {r1}
bx r1
thumb_func_end sub_815163C
thumb_func_start sub_815165C
sub_815165C: @ 815165C
push {lr}
adds r2, r0, 0
ldr r1, _08151674
ldr r0, _08151670
asrs r3, r2, 31
bl __divdi3
pop {r1}
bx r1
.align 2, 0
_08151670: .4byte 0x00010000
_08151674: .4byte 0x00000000
thumb_func_end sub_815165C
.align 2, 0 @ Don't pad with nop.

1
ld_script.txt
View File

@ -192,7 +192,6 @@ SECTIONS {
src/battle_message.o(.text);
asm/cable_car.o(.text);
src/math_util.o(.text);
asm/math_util.o(.text);
asm/roulette_util.o(.text);
asm/cable_car_util.o(.text);
src/save.o(.text);

24
src/math_util.c
View File

@ -60,3 +60,27 @@ s32 sub_81515FC(s32 x, s32 y)
_x *= 256;
return _x / y;
}
s16 sub_8151624(s16 y)
{
s32 x;
x = 0x10000;
return x / y;
}
s16 sub_815163C(u8 s, s16 y)
{
s32 x;
x = 0x100 << s;
return x / y;
}
s32 sub_815165C(s32 y)
{
s64 x;
x = 0x10000;
return x / y;
}