diff options
| -rw-r--r-- | arm9/modules/63/asm/mod63_021DB450_asm.s | 39 | ||||
| -rw-r--r-- | arm9/modules/63/include/mod63_021DB450.h | 1 | ||||
| -rw-r--r-- | arm9/modules/63/src/mod63_021DB450.c | 15 |
3 files changed, 15 insertions, 40 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index 323f9ea7..88f93b68 100644 --- a/arm9/modules/63/asm/mod63_021DB450_asm.s +++ b/arm9/modules/63/asm/mod63_021DB450_asm.s @@ -2,45 +2,6 @@ .include "global.inc" .section .text - thumb_func_start MOD63_021DB784 -MOD63_021DB784: ; 0x021DB784 - 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 r0, r4, #0 - sub r2, r1, #3 - bl FUN_020079E0 - mov r1, #1 - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x13 - bl FUN_020079E0 - ldrb r0, [r5, #0x1d] - add r0, r0, #1 - strb r0, [r5, #0x1d] - ldrb r0, [r5, #0x1d] - cmp r0, #6 - blo _021DB7CC - 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} -_021DB7CC: - mov r0, #0 - pop {r3, r4, r5, pc} - thumb_func_end MOD63_021DB784 - thumb_func_start MOD63_021DB7D0 MOD63_021DB7D0: ; 0x021DB7D0 push {r3, r4, r5, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 68c8432f..8a94489f 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -68,5 +68,6 @@ void MOD63_021DB598(UnkStruct63_021DB598 *param0); 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); #endif //POKEDIAMOND_MOD63_021DB450_H diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 7587e0f3..fa41895e 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -41,7 +41,6 @@ extern BOOL FUN_020133C8(u32); extern void FUN_020079E0(u32, u32, s32); //todo funcs -extern BOOL MOD63_021DB784(struct UnkStruct63_021DB5CC *, u32); extern BOOL MOD63_021DB7D0(struct UnkStruct63_021DB5CC *, u32); extern BOOL MOD63_021DB838(struct UnkStruct63_021DB5CC *, u32); extern BOOL MOD63_021DB884(struct UnkStruct63_021DB5CC *, u32); @@ -212,3 +211,17 @@ THUMB_FUNC BOOL MOD63_021DB720(UnkStruct63_021DB5CC *param0, u32 param1) return FALSE; } +THUMB_FUNC BOOL MOD63_021DB784(UnkStruct63_021DB5CC *param0, u32 param1) +{ + u32 field = param0->field_04[param1]; + FUN_020079E0(field, 0x0, -0x3); + FUN_020079E0(field, 0x1, -0x12); + param0->field_1D++; + if (param0->field_1D >= 6) + { + FUN_02007558(field, 0xC, 0x100); + FUN_02007558(field, 0xD, 0x100); + return TRUE; + } + return FALSE; +} |