diff --git a/asm/include/main_02059AE8.inc b/asm/include/main_02059AF8.inc similarity index 99% rename from asm/include/main_02059AE8.inc rename to asm/include/main_02059AF8.inc index 4cc7e069..ce6b1449 100644 --- a/asm/include/main_02059AE8.inc +++ b/asm/include/main_02059AF8.inc @@ -447,4 +447,5 @@ .public sub_02056D70 .public sub_02056E04 .public sub_02058C30 +.public sub_02059AE8 .public vsprintf diff --git a/asm/main_02059AE8.s b/asm/main_02059AF8.s similarity index 99% rename from asm/main_02059AE8.s rename to asm/main_02059AF8.s index 886a653d..a796cdb5 100644 --- a/asm/main_02059AE8.s +++ b/asm/main_02059AF8.s @@ -1,17 +1,8 @@ .include "asm/macros.inc" - .include "main_02059AE8.inc" + .include "main_02059AF8.inc" .text - arm_func_start sub_02059AE8 -sub_02059AE8: ; 0x02059AE8 - ldr ip, _02059AF4 ; =CopyBitsFrom - mov r2, #7 - bx ip - .align 2, 0 -_02059AF4: .word CopyBitsFrom - arm_func_end sub_02059AE8 - arm_func_start sub_02059AF8 sub_02059AF8: ; 0x02059AF8 ldr ip, _02059B04 ; =CopyBitsTo diff --git a/include/main_02059A74.h b/include/main_02059A74.h index 82335a5f..9b63b8b2 100644 --- a/include/main_02059A74.h +++ b/include/main_02059A74.h @@ -2,5 +2,6 @@ #define PMDSKY_MAIN_02059A74_H u32 sub_02059A74(u32 a, u32 b); +void sub_02059AE8(void *p0, void *p1); #endif //PMDSKY_MAIN_02059A74_H diff --git a/main.lsf b/main.lsf index 166b1565..732f365e 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_02059AE8.o + Object asm/main_02059AF8.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 14dcbd66..041a2333 100644 --- a/src/main_02059A74.c +++ b/src/main_02059A74.c @@ -1,12 +1,13 @@ #include "main_02059A74.h" -void sub_02050974(void *v0, u32 v1, u32 v2); -void sub_02059824(void *v0, u32 v1); -void sub_020509BC(void *v0); -void sub_020584F8(void *v0); - extern u32 _020A3498[]; +extern void sub_02050974(void *v0, u32 v1, u32 v2); +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); + u32 sub_02059A74(u32 a, u32 b) { u32 obj1[4]; @@ -25,3 +26,8 @@ u32 sub_02059A74(u32 a, u32 b) return obj1[2]; } + +void sub_02059AE8(void *p0, void *p1) +{ + CopyBitsFrom(p0, p1, 7); +}