diff options
| author | red031000 <rubenru09@aol.com> | 2020-07-31 16:29:57 +0100 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-03 15:58:15 -0400 |
| commit | 475016d9a70d83db91caf00b54200b59c94a9be3 (patch) | |
| tree | c1ece5b183b347d6c51c67f5458b39545a366023 | |
| parent | a49faa16ed0c60e88612b3d4a13fa8ada5429761 (diff) | |
mod63_021DB7D0
| -rw-r--r-- | arm9/modules/63/asm/mod63_021DB450_asm.s | 51 | ||||
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 1 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 17 |
3 files changed, 18 insertions, 51 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index 88f93b68..df57caeb 100644 --- a/arm9/modules/63/asm/mod63_021DB450_asm.s +++ b/arm9/modules/63/asm/mod63_021DB450_asm.s @@ -2,57 +2,6 @@ .include "global.inc" .section .text - thumb_func_start MOD63_021DB7D0 -MOD63_021DB7D0: ; 0x021DB7D0 - push {r3, r4, r5, lr} - add r5, r0, #0 - lsl r0, r1, #2 - add r0, r5, r0 - ldr r4, [r0, #4] - mov r1, #0 - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x10 - bl FUN_020079E0 - mov r1, #1 - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x11 - bl FUN_020079E0 - mov r1, #0xc - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x8c - bl FUN_020079E0 - mov r1, #0xd - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x8d - bl FUN_020079E0 - ldrb r0, [r5, #0x1d] - add r0, r0, #1 - strb r0, [r5, #0x1d] - ldrb r0, [r5, #0x1d] - cmp r0, #6 - blo _021DB832 - mov r1, #0xc - add r2, r1, #0 - add r0, r4, #0 - add r2, #0xf4 - bl FUN_02007558 - mov r1, #0xd - add r2, r1, #0 - add r0, r4, #0 - add r2, #0xf3 - bl FUN_02007558 - mov r0, #1 - pop {r3, r4, r5, pc} -_021DB832: - mov r0, #0 - pop {r3, r4, r5, pc} - .align 2, 0 - thumb_func_end MOD63_021DB7D0 - thumb_func_start MOD63_021DB838 MOD63_021DB838: ; 0x021DB838 push {r3, r4, r5, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 8a94489f..f233f186 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -69,5 +69,6 @@ void MOD63_021DB5A8(UnkStruct63_021DB5A8 *param0); BOOL MOD63_021DB5CC(UnkStruct63_021DB5CC *param0, u32 param1, s32 param2); BOOL MOD63_021DB720(UnkStruct63_021DB5CC *param0, u32 param1); BOOL MOD63_021DB784(UnkStruct63_021DB5CC *param0, u32 param1); +BOOL MOD63_021DB7D0(UnkStruct63_021DB5CC *param0, u32 param1); #endif //POKEDIAMOND_MOD63_021DB450_H diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index fa41895e..bac8ac54 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -225,3 +225,20 @@ THUMB_FUNC BOOL MOD63_021DB784(UnkStruct63_021DB5CC *param0, u32 param1) } return FALSE; } + +THUMB_FUNC BOOL MOD63_021DB7D0(UnkStruct63_021DB5CC *param0, u32 param1) +{ + u32 field = param0->field_04[param1]; + FUN_020079E0(field, 0x0, -0x10); + FUN_020079E0(field, 0x1, -0x10); + FUN_020079E0(field, 0xC, -0x80); + FUN_020079E0(field, 0xD, -0x80); + param0->field_1D++; + if (param0->field_1D >= 6) + { + FUN_02007558(field, 0xC, 0x100); + FUN_02007558(field, 0xD, 0x100); + return TRUE; + } + return FALSE; +} |