diff --git a/asm/include/main_02059B08.inc b/asm/include/main_02059B18.inc similarity index 100% rename from asm/include/main_02059B08.inc rename to asm/include/main_02059B18.inc diff --git a/asm/main_02059B08.s b/asm/main_02059B18.s similarity index 99% rename from asm/main_02059B08.s rename to asm/main_02059B18.s index aafc63a2..d872f280 100644 --- a/asm/main_02059B08.s +++ b/asm/main_02059B18.s @@ -1,17 +1,8 @@ .include "asm/macros.inc" - .include "main_02059B08.inc" + .include "main_02059B18.inc" .text - arm_func_start sub_02059B08 -sub_02059B08: ; 0x02059B08 - ldr ip, _02059B14 ; =GetResolvedPerformanceProgressFlag - mov r0, #0xa - bx ip - .align 2, 0 -_02059B14: .word GetResolvedPerformanceProgressFlag - arm_func_end sub_02059B08 - arm_func_start GetEvolutionPossibilities GetEvolutionPossibilities: ; 0x02059B18 stmdb sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, lr} diff --git a/include/main_02059A74.h b/include/main_02059A74.h index a7aa7f80..1987fee5 100644 --- a/include/main_02059A74.h +++ b/include/main_02059A74.h @@ -1,8 +1,11 @@ #ifndef PMDSKY_MAIN_02059A74_H #define PMDSKY_MAIN_02059A74_H +#include "util.h" + u32 sub_02059A74(u32 a, u32 b); void sub_02059AE8(void *p0, void *p1); void sub_02059AF8(void *dest, void *src); +bool8 sub_02059B08(void); #endif //PMDSKY_MAIN_02059A74_H diff --git a/main.lsf b/main.lsf index 454affb6..3f3bdff5 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_02059B08.o + Object asm/main_02059B18.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 c5a21d03..4a81fa5c 100644 --- a/src/main_02059A74.c +++ b/src/main_02059A74.c @@ -1,4 +1,5 @@ #include "main_02059A74.h" +#include "progression.h" extern u32 _020A3498[]; @@ -37,3 +38,8 @@ void sub_02059AF8(void *dest, void *src) { CopyBitsTo(dest, src, 7); } + +bool8 sub_02059B08(void) +{ + return GetResolvedPerformanceProgressFlag(10); +}