diff options
| author | red031000 <rubenru09@aol.com> | 2020-11-18 14:22:17 +0000 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2020-11-18 14:22:17 +0000 |
| commit | 89476f60f8b7bdef718c566252421922c1ace7a2 (patch) | |
| tree | 1676b950292e2107366c20286b6b11675c4ba024 /arm9/modules | |
| parent | bc3be40047d1b9ec45e7b355dff2280e7c5faa0a (diff) | |
mod21_02254990
Diffstat (limited to 'arm9/modules')
| -rw-r--r-- | arm9/modules/21/asm/mod21_02254854_asm.s | 16 | ||||
| -rw-r--r-- | arm9/modules/21/include/mod21_02254854.h | 1 | ||||
| -rw-r--r-- | arm9/modules/21/src/mod21_02254854_src.c | 14 |
3 files changed, 16 insertions, 15 deletions
diff --git a/arm9/modules/21/asm/mod21_02254854_asm.s b/arm9/modules/21/asm/mod21_02254854_asm.s index 8da8777f..ee8a1d56 100644 --- a/arm9/modules/21/asm/mod21_02254854_asm.s +++ b/arm9/modules/21/asm/mod21_02254854_asm.s @@ -3,21 +3,7 @@ .section .text .balign 4, 0 - thumb_func_start MOD21_02254990 -MOD21_02254990: ; 0x02254990 - ldrb r2, [r0, #2] - cmp r2, #0 - bne _02254998 - b _0225499A -_02254998: - mov r1, #2 -_0225499A: - strb r1, [r0] - mov r1, #0 - strb r1, [r0, #1] - bx lr - .align 2, 0 - thumb_func_end MOD21_02254990 + .extern MOD21_02254990 thumb_func_start MOD21_022549A4 MOD21_022549A4: ; 0x022549A4 diff --git a/arm9/modules/21/include/mod21_02254854.h b/arm9/modules/21/include/mod21_02254854.h index dabacf1c..26ef3e87 100644 --- a/arm9/modules/21/include/mod21_02254854.h +++ b/arm9/modules/21/include/mod21_02254854.h @@ -21,5 +21,6 @@ void MOD21_02254918(UnkStruct02254854 *param0); void MOD21_02254930(u32 param0, UnkStruct02254854 *param1); void MOD21_0225496C(UnkStruct02254854 *param0); void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct02254854 * param3); +void MOD21_02254990(UnkStruct02254854 * param0, u8 param1); #endif //POKEDIAMOND_MOD21_02254854_H diff --git a/arm9/modules/21/src/mod21_02254854_src.c b/arm9/modules/21/src/mod21_02254854_src.c index f7fbe221..eaa8d7ad 100644 --- a/arm9/modules/21/src/mod21_02254854_src.c +++ b/arm9/modules/21/src/mod21_02254854_src.c @@ -122,3 +122,17 @@ THUMB_FUNC void MOD21_02254974(u32 param0, u32 param1, u32 param2, UnkStruct0225 return; } } + +THUMB_FUNC void MOD21_02254990(UnkStruct02254854 * param0, u8 param1) +{ + if (param0->bytearray[2] == 0) + { + param0->bytearray[0] = param1; + } + else + { + param0->bytearray[0] = 2; + } + param0->bytearray[1] = 0; +} + |