diff --git a/asm/include/main_0205B560.inc b/asm/include/main_0205B584.inc similarity index 99% rename from asm/include/main_0205B560.inc rename to asm/include/main_0205B584.inc index f7745c14..676f96f4 100644 --- a/asm/include/main_0205B560.inc +++ b/asm/include/main_0205B584.inc @@ -390,4 +390,5 @@ .public sub_02059AE8 .public sub_02059AF8 .public sub_0205B44C +.public sub_0205B560 .public vsprintf diff --git a/asm/main_0205B560.s b/asm/main_0205B584.s similarity index 99% rename from asm/main_0205B560.s rename to asm/main_0205B584.s index 749be144..274fdbdd 100644 --- a/asm/main_0205B560.s +++ b/asm/main_0205B584.s @@ -1,21 +1,8 @@ .include "asm/macros.inc" - .include "main_0205B560.inc" + .include "main_0205B584.inc" .text - arm_func_start sub_0205B560 -sub_0205B560: ; 0x0205B560 - ldr r3, [r0] - ldr r2, [r1] - cmp r3, r2 - ldreq r2, [r0, #4] - ldreq r0, [r1, #4] - cmpeq r2, r0 - moveq r0, #1 - movne r0, #0 - bx lr - arm_func_end sub_0205B560 - arm_func_start sub_0205B584 sub_0205B584: ; 0x0205B584 stmdb sp!, {r4, lr} diff --git a/include/main_0205B554.h b/include/main_0205B554.h index 5babd798..17188ae4 100644 --- a/include/main_0205B554.h +++ b/include/main_0205B554.h @@ -1,6 +1,14 @@ #ifndef PMDSKY_MAIN_0205B554_H #define PMDSKY_MAIN_0205B554_H -void sub_0205B554(void); +#include "util.h" + +struct unkStruct_0205B560 { + u32 unk0; + u32 unk1; +}; + +void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2); +bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2); #endif //PMDSKY_MAIN_0205B554_H diff --git a/main.lsf b/main.lsf index 0f699053..46ef8bfa 100644 --- a/main.lsf +++ b/main.lsf @@ -146,7 +146,7 @@ Static main Object src/main_0205B440.o Object asm/main_0205B478.o Object src/main_0205B554.o - Object asm/main_0205B560.o + Object asm/main_0205B584.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_0205B554.c b/src/main_0205B554.c index bbdb69d7..cbadb13e 100644 --- a/src/main_0205B554.c +++ b/src/main_0205B554.c @@ -1,8 +1,16 @@ #include "main_0205B554.h" -extern void sub_0205B560(void); - -void sub_0205B554(void) +void sub_0205B554(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2) { - sub_0205B560(); + sub_0205B560(v1, v2); +} + +bool8 sub_0205B560(struct unkStruct_0205B560 *v1, struct unkStruct_0205B560 *v2) +{ + if (v1->unk0 == v2->unk0 && v1->unk1 == v2->unk1) + { + return TRUE; + } + + return FALSE; }