diff options
author | scnorton <scnorton@biociphers.org> | 2017-06-28 09:46:43 -0400 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-06-28 09:46:43 -0400 |
commit | 8f84aa839874e2b69bd0e31694fad7560ca90d17 (patch) | |
tree | 9ead9cc549308ca9de8e1ac503ec7e0e3ac5c68a | |
parent | a33c8cb4f38a6977d9b2d41c06555243892efa54 (diff) |
sub_810C1C8
-rwxr-xr-x | asm/pokeblock.s | 62 | ||||
-rwxr-xr-x | src/pokeblock.c | 21 |
2 files changed, 21 insertions, 62 deletions
diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 576a80930..c00294e94 100755 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -6,68 +6,6 @@ .text - thumb_func_start sub_810C1C8 -sub_810C1C8: @ 810C1C8 - push {r4-r6,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r1, 24 - ldr r6, _0810C22C @ =0x00001005 - cmp r1, 0 - bne _0810C1D8 - movs r6, 0x5 -_0810C1D8: - ldr r1, _0810C230 @ =gTasks - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r0, r1 - ldr r2, _0810C234 @ =gUnknown_02039248 - ldrb r1, [r2, 0x1] - ldrh r0, [r0, 0x8] - subs r0, r1 - lsls r1, r0, 16 - lsrs r0, r1, 16 - cmp r0, 0x8 - bhi _0810C226 - asrs r0, r1, 16 - ldrb r2, [r2] - cmp r0, r2 - beq _0810C226 - movs r2, 0 - lsls r0, 1 - adds r1, r0, 0x1 - lsls r5, r1, 5 - ldr r3, _0810C238 @ =gBGTilemapBuffers + 0x1000 - adds r0, 0x2 - lsls r4, r0, 5 -_0810C208: - adds r0, r2, 0 - adds r0, 0xF - adds r1, r5, r0 - lsls r1, 1 - adds r1, r3 - strh r6, [r1] - adds r0, r4, r0 - lsls r0, 1 - adds r0, r3 - strh r6, [r0] - adds r0, r2, 0x1 - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0xD - bls _0810C208 -_0810C226: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810C22C: .4byte 0x00001005 -_0810C230: .4byte gTasks -_0810C234: .4byte gUnknown_02039248 -_0810C238: .4byte gBGTilemapBuffers + 0x1000 - thumb_func_end sub_810C1C8 - thumb_func_start sub_810C23C sub_810C23C: @ 810C23C push {r4-r7,lr} diff --git a/src/pokeblock.c b/src/pokeblock.c index 0f1e36ee7..775bc42ab 100755 --- a/src/pokeblock.c +++ b/src/pokeblock.c @@ -689,3 +689,24 @@ void sub_810C0C8(u8 taskId) gTasks[taskId].func = sub_810BF7C; } } + +void sub_810C1C8(u8 taskId, u8 flag) +{ + u8 i; + u32 x; + s16 y; + u16 v0 = 0x1005; + if (!flag) + { + v0 = 0x0005; + } + y = gTasks[taskId].data[0] - gUnknown_02039248[1]; + if ((u16)y <= 8 && y != gUnknown_02039248[0]) + { + for (i=0; i<14; i++) + { + gBGTilemapBuffers[2][(2 * y + 1) * 32 + (x = i + 15)] = v0; + gBGTilemapBuffers[2][(2 * y + 2) * 32 + x] = v0; + } + } +} |