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, 16 insertions, 39 deletions
diff --git a/arm9/modules/63/asm/mod63_021DB450_asm.s b/arm9/modules/63/asm/mod63_021DB450_asm.s index 4f2988e7..06f5f9a4 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_021DB8E8 -MOD63_021DB8E8: ; 0x021DB8E8 - 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 - mov r2, #6 - bl FUN_020079E0 - mov r1, #1 - add r2, r1, #0 - add r0, r4, #0 - sub r2, #0x15 - bl FUN_020079E0 - ldrb r0, [r5, #0x1d] - add r0, r0, #1 - strb r0, [r5, #0x1d] - ldrb r0, [r5, #0x1d] - cmp r0, #6 - blo _021DB930 - 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} -_021DB930: - mov r0, #0 - pop {r3, r4, r5, pc} - thumb_func_end MOD63_021DB8E8 - thumb_func_start MOD63_021DB934 MOD63_021DB934: ; 0x021DB934 push {r3, lr} diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index 4505e8b4..1db9f6b7 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -72,5 +72,6 @@ BOOL MOD63_021DB784(UnkStruct63_021DB5CC *param0, u32 param1); BOOL MOD63_021DB7D0(UnkStruct63_021DB5CC *param0, u32 param1); BOOL MOD63_021DB838(UnkStruct63_021DB5CC *param0, u32 param1); BOOL MOD63_021DB884(UnkStruct63_021DB5CC *param0, u32 param1); +BOOL MOD63_021DB8E8(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 565ffdb5..c11e9c3e 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -271,3 +271,18 @@ THUMB_FUNC BOOL MOD63_021DB884(UnkStruct63_021DB5CC *param0, u32 param1) } return FALSE; } + +THUMB_FUNC BOOL MOD63_021DB8E8(UnkStruct63_021DB5CC *param0, u32 param1) +{ + u32 field = param0->field_04[param1]; + FUN_020079E0(field, 0, 0x6); + FUN_020079E0(field, 1, -0x14); + param0->field_1D++; + if (param0->field_1D >= 6) + { + FUN_02007558(field, 0xC, 0x100); + FUN_02007558(field, 0xD, 0x100); + return TRUE; + } + return FALSE; +} |