diff --git a/asm/include/main_02059AF8.inc b/asm/include/main_02059B08.inc similarity index 99% rename from asm/include/main_02059AF8.inc rename to asm/include/main_02059B08.inc index ce6b1449..cd22dfb8 100644 --- a/asm/include/main_02059AF8.inc +++ b/asm/include/main_02059B08.inc @@ -448,4 +448,5 @@ .public sub_02056E04 .public sub_02058C30 .public sub_02059AE8 +.public sub_02059AF8 .public vsprintf diff --git a/asm/main_02059AF8.s b/asm/main_02059B08.s similarity index 99% rename from asm/main_02059AF8.s rename to asm/main_02059B08.s index a796cdb5..aafc63a2 100644 --- a/asm/main_02059AF8.s +++ b/asm/main_02059B08.s @@ -1,17 +1,8 @@ .include "asm/macros.inc" - .include "main_02059AF8.inc" + .include "main_02059B08.inc" .text - arm_func_start sub_02059AF8 -sub_02059AF8: ; 0x02059AF8 - ldr ip, _02059B04 ; =CopyBitsTo - mov r2, #7 - bx ip - .align 2, 0 -_02059B04: .word CopyBitsTo - arm_func_end sub_02059AF8 - arm_func_start sub_02059B08 sub_02059B08: ; 0x02059B08 ldr ip, _02059B14 ; =GetResolvedPerformanceProgressFlag diff --git a/include/main_02059A74.h b/include/main_02059A74.h index 9b63b8b2..a7aa7f80 100644 --- a/include/main_02059A74.h +++ b/include/main_02059A74.h @@ -3,5 +3,6 @@ u32 sub_02059A74(u32 a, u32 b); void sub_02059AE8(void *p0, void *p1); +void sub_02059AF8(void *dest, void *src); #endif //PMDSKY_MAIN_02059A74_H diff --git a/main.lsf b/main.lsf index 732f365e..454affb6 100644 --- a/main.lsf +++ b/main.lsf @@ -134,7 +134,7 @@ Static main Object src/main_02059334.o Object asm/main_0205956C.o Object src/main_02059A74.o - Object asm/main_02059AF8.o + Object asm/main_02059B08.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_02059A74.c b/src/main_02059A74.c index 041a2333..c5a21d03 100644 --- a/src/main_02059A74.c +++ b/src/main_02059A74.c @@ -7,6 +7,7 @@ extern void sub_02059824(void *v0, u32 v1); extern void sub_020509BC(void *v0); extern void sub_020584F8(void *v0); extern void CopyBitsFrom(void *read_info, void *buf_read, s32 nbits); +extern void CopyBitsTo(void *ctx, void *src, s32 nbits); u32 sub_02059A74(u32 a, u32 b) { @@ -31,3 +32,8 @@ void sub_02059AE8(void *p0, void *p1) { CopyBitsFrom(p0, p1, 7); } + +void sub_02059AF8(void *dest, void *src) +{ + CopyBitsTo(dest, src, 7); +}