diff --git a/asm/include/main_0205BD78.inc b/asm/include/main_0205BD90.inc similarity index 100% rename from asm/include/main_0205BD78.inc rename to asm/include/main_0205BD90.inc diff --git a/asm/main_0205BD78.s b/asm/main_0205BD90.s similarity index 99% rename from asm/main_0205BD78.s rename to asm/main_0205BD90.s index d4e02a61..c1d1073f 100644 --- a/asm/main_0205BD78.s +++ b/asm/main_0205BD90.s @@ -1,18 +1,8 @@ .include "asm/macros.inc" - .include "main_0205BD78.inc" + .include "main_0205BD90.inc" .text - arm_func_start sub_0205BD78 -sub_0205BD78: ; 0x0205BD78 - stmdb sp!, {r3, lr} - mov r0, #2 - bl RandInt - orr r0, r0, #2 - and r0, r0, #0xff - ldmia sp!, {r3, pc} - arm_func_end sub_0205BD78 - arm_func_start sub_0205BD90 sub_0205BD90: ; 0x0205BD90 and r0, r0, #1 diff --git a/include/main_0205BD14.h b/include/main_0205BD14.h index 93c37e8c..42f68a7a 100644 --- a/include/main_0205BD14.h +++ b/include/main_0205BD14.h @@ -6,5 +6,6 @@ void sub_0205BD14(u32 *dest, s32 index); u32 sub_0205BD40(u32 val); bool8 sub_0205BD5C(u32 val); +u8 sub_0205BD78(void); #endif //PMDSKY_MAIN_0205BD14_H diff --git a/main.lsf b/main.lsf index f9c4ac97..6b81771d 100644 --- a/main.lsf +++ b/main.lsf @@ -158,7 +158,7 @@ Static main Object src/main_0205BBFC.o Object asm/main_0205BCC4.o Object src/main_0205BD14.o - Object asm/main_0205BD78.o + Object asm/main_0205BD90.o Object src/dungeon_init_2.o Object asm/main_0206A750.o Object src/main_0206C98C.o diff --git a/src/main_0205BD14.c b/src/main_0205BD14.c index d71d4af0..b5520756 100644 --- a/src/main_0205BD14.c +++ b/src/main_0205BD14.c @@ -1,4 +1,5 @@ #include "main_0205BD14.h" +#include "main_0200224C.h" #include "main_0205B690.h" extern union unkStruct_020B0A54_union _020B0A54; @@ -22,3 +23,8 @@ bool8 sub_0205BD5C(u32 val) { return sub_0205BD40(val) == 0; } + +u8 sub_0205BD78(void) +{ + return RandInt(2) | 2; +}