diff options
author | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-08-09 20:00:17 -0400 |
---|---|---|
committer | U-Maria-PC\Maria <throwawaygolem@gmail.com> | 2017-08-09 20:00:17 -0400 |
commit | dcc56003d063500b867cce0e76d7723cc64b0187 (patch) | |
tree | f3f8f74943d46bdceaeb29f31e6ac0586bb37d54 | |
parent | 6c6afe1c8a58457a0caa0b1a5532622b4249cebf (diff) |
decompiled up to sub_80CC408
-rw-r--r-- | asm/battle_anim_80CA710.s | 970 | ||||
-rwxr-xr-x | src/battle_anim_80CA710.c | 543 |
2 files changed, 542 insertions, 971 deletions
diff --git a/asm/battle_anim_80CA710.s b/asm/battle_anim_80CA710.s index 3b42023eb..ebfb4f120 100644 --- a/asm/battle_anim_80CA710.s +++ b/asm/battle_anim_80CA710.s @@ -6,976 +6,6 @@ .text - - - - thumb_func_start sub_80CBCF8 -sub_80CBCF8: @ 80CBCF8 - push {r4-r6,lr} - adds r4, r0, 0 - ldr r5, _080CBD3C @ =gUnknown_083D680C - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r3, r0, r1 - adds r0, r5, 0x1 - adds r0, r3, r0 - ldrh r2, [r4, 0x32] - movs r6, 0x32 - ldrsh r1, [r4, r6] - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r1, r0 - bne _080CBD44 - adds r0, r5, 0x2 - adds r0, r3, r0 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - cmp r0, 0x7F - bne _080CBD30 - movs r0, 0 - strh r0, [r4, 0x2E] - ldr r0, _080CBD40 @ =sub_80CBDB0 - str r0, [r4, 0x1C] -_080CBD30: - movs r0, 0 - strh r0, [r4, 0x32] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - b _080CBDAA - .align 2, 0 -_080CBD3C: .4byte gUnknown_083D680C -_080CBD40: .4byte sub_80CBDB0 -_080CBD44: - adds r0, r2, 0x1 - strh r0, [r4, 0x32] - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsls r0, r1, 1 - adds r0, r1 - adds r1, r0, r5 - movs r2, 0 - ldrsb r2, [r1, r2] - adds r1, r5, 0x2 - adds r0, r1 - ldrb r0, [r0] - lsls r0, 24 - asrs r0, 24 - muls r0, r2 - ldrh r1, [r4, 0x30] - adds r0, r1 - movs r1, 0xFF - ands r0, r1 - strh r0, [r4, 0x30] - bl IsContest - lsls r0, 24 - cmp r0, 0 - bne _080CBD92 - ldrh r0, [r4, 0x30] - subs r0, 0x1 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0xBE - bhi _080CBD8A - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1F - b _080CBD90 -_080CBD8A: - adds r1, r4, 0 - adds r1, 0x43 - movs r0, 0x1D -_080CBD90: - strb r0, [r1] -_080CBD92: - movs r6, 0x30 - ldrsh r0, [r4, r6] - movs r1, 0x3C - bl Cos - strh r0, [r4, 0x24] - movs r1, 0x30 - ldrsh r0, [r4, r1] - movs r1, 0x14 - bl Sin - strh r0, [r4, 0x26] -_080CBDAA: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80CBCF8 - - thumb_func_start sub_80CBDB0 -sub_80CBDB0: @ 80CBDB0 - push {r4,lr} - adds r4, r0, 0 - movs r1, 0x2E - ldrsh r0, [r4, r1] - cmp r0, 0x14 - ble _080CBDC2 - adds r0, r4, 0 - bl move_anim_8072740 -_080CBDC2: - movs r0, 0x2E - ldrsh r1, [r4, r0] - lsrs r0, r1, 31 - adds r0, r1, r0 - asrs r0, 1 - lsls r0, 1 - subs r1, r0 - adds r3, r4, 0 - adds r3, 0x3E - movs r0, 0x1 - ands r1, r0 - lsls r1, 2 - ldrb r2, [r3] - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80CBDB0 - - thumb_func_start sub_80CBDF4 -sub_80CBDF4: @ 80CBDF4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r0, 24 - adds r6, r0, 0 - lsls r0, r6, 2 - adds r0, r6 - lsls r0, 3 - ldr r1, _080CBF48 @ =gTasks - adds r5, r0, r1 - ldr r4, _080CBF4C @ =gBattleAnimEnemyMonIndex - ldrb r0, [r4] - bl sub_8079E90 - lsls r0, 24 - lsrs r0, 24 - subs r0, 0x1 - strh r0, [r5, 0x10] - ldrb r0, [r4] - movs r1, 0x2 - bl sub_8077ABC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x14] - ldrb r0, [r4] - movs r1, 0x3 - bl sub_8077ABC - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0x16] - ldrb r0, [r4] - movs r1, 0x1 - bl sub_807A100 - strh r0, [r5, 0x1C] - ldrb r0, [r4] - movs r1, 0 - bl sub_807A100 - strh r0, [r5, 0x1E] - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - lsrs r0, 24 - movs r2, 0x1 - negs r2, r2 - adds r1, r2, 0 - cmp r0, 0x1 - bne _080CBE5C - movs r1, 0x1 -_080CBE5C: - strh r1, [r5, 0x12] - movs r3, 0x12 - ldrsh r0, [r5, r3] - lsls r0, 6 - movs r1, 0x38 - subs r1, r0 - strh r1, [r5, 0x1A] - ldrh r0, [r5, 0x16] - subs r0, r1 - ldrh r1, [r5, 0x14] - adds r0, r1 - strh r0, [r5, 0x18] - ldr r0, _080CBF50 @ =gSpriteTemplate_83D6884 - movs r2, 0x18 - ldrsh r1, [r5, r2] - movs r3, 0x1A - ldrsh r2, [r5, r3] - ldrb r3, [r5, 0x10] - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - strh r0, [r5, 0xC] - cmp r0, 0x40 - bne _080CBE94 - adds r0, r6, 0 - bl DestroyAnimVisualTask -_080CBE94: - ldr r4, _080CBF54 @ =gSprites - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - movs r1, 0xA - strh r1, [r0, 0x2E] - movs r2, 0xC - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r5, 0x18] - strh r1, [r0, 0x30] - movs r3, 0xC - ldrsh r0, [r5, r3] - lsls r2, r0, 4 - adds r2, r0 - lsls r2, 2 - adds r2, r4 - movs r1, 0x1C - ldrsh r0, [r5, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r5, r3] - muls r1, r0 - ldrh r0, [r5, 0x14] - subs r0, r1 - strh r0, [r2, 0x32] - movs r0, 0xC - ldrsh r1, [r5, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - ldrh r1, [r5, 0x1A] - strh r1, [r0, 0x34] - movs r1, 0xC - ldrsh r0, [r5, r1] - lsls r1, r0, 4 - adds r1, r0 - lsls r1, 2 - adds r1, r4 - movs r2, 0x1E - ldrsh r0, [r5, r2] - lsrs r2, r0, 31 - adds r0, r2 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r2, [r5, r3] - muls r0, r2 - ldrh r2, [r5, 0x16] - adds r0, r2 - strh r0, [r1, 0x36] - movs r3, 0xC - ldrsh r1, [r5, r3] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl sub_80CC338 - movs r1, 0xC - ldrsh r2, [r5, r1] - lsls r1, r2, 4 - adds r1, r2 - lsls r1, 2 - adds r1, r4 - strh r0, [r1, 0x38] - movs r2, 0xC - ldrsh r1, [r5, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r4 - bl sub_80786EC - ldr r0, _080CBF58 @ =sub_80CBF5C - str r0, [r5] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080CBF48: .4byte gTasks -_080CBF4C: .4byte gBattleAnimEnemyMonIndex -_080CBF50: .4byte gSpriteTemplate_83D6884 -_080CBF54: .4byte gSprites -_080CBF58: .4byte sub_80CBF5C - thumb_func_end sub_80CBDF4 - - thumb_func_start sub_80CBF5C -sub_80CBF5C: @ 80CBF5C - push {r4-r6,lr} - lsls r0, 24 - lsrs r2, r0, 24 - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - ldr r1, _080CBFA0 @ =gTasks - adds r6, r0, r1 - movs r0, 0xC - ldrsh r1, [r6, r0] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - ldr r1, _080CBFA4 @ =gSprites - adds r4, r0, r1 - movs r1, 0x8 - ldrsh r5, [r6, r1] - cmp r5, 0x7 - bne _080CBF84 - b _080CC1B4 -_080CBF84: - cmp r5, 0x7 - bgt _080CBFD2 - cmp r5, 0x3 - bne _080CBF8E - b _080CC0A6 -_080CBF8E: - cmp r5, 0x3 - bgt _080CBFA8 - cmp r5, 0x1 - beq _080CC038 - cmp r5, 0x1 - bgt _080CC088 - cmp r5, 0 - beq _080CC01A - b _080CC330 - .align 2, 0 -_080CBFA0: .4byte gTasks -_080CBFA4: .4byte gSprites -_080CBFA8: - cmp r5, 0x5 - bne _080CBFAE - b _080CC11C -_080CBFAE: - cmp r5, 0x5 - ble _080CBFB4 - b _080CC196 -_080CBFB4: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080CBFCA - b _080CC330 -_080CBFCA: - movs r0, 0x5 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CBFD2: - cmp r5, 0xB - bne _080CBFD8 - b _080CC298 -_080CBFD8: - cmp r5, 0xB - bgt _080CC006 - cmp r5, 0x9 - bne _080CBFE2 - b _080CC206 -_080CBFE2: - cmp r5, 0x9 - ble _080CBFE8 - b _080CC27C -_080CBFE8: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080CBFFE - b _080CC330 -_080CBFFE: - movs r0, 0x9 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CC006: - cmp r5, 0xD - bne _080CC00C - b _080CC30A -_080CC00C: - cmp r5, 0xD - bge _080CC012 - b _080CC2EA -_080CC012: - cmp r5, 0xFF - bne _080CC018 - b _080CC31A -_080CC018: - b _080CC330 -_080CC01A: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080CC030 - b _080CC330 -_080CC030: - movs r0, 0x1 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CC038: - ldrh r2, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r2, r3 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x14] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x16] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - ldrh r0, [r6, 0x10] - adds r0, 0x2 - strh r0, [r6, 0x10] - strh r5, [r6, 0xE] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC088: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080CC09E - b _080CC330 -_080CC09E: - movs r0, 0x3 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CC0A6: - ldrh r1, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r1, r0 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r1, r0 - ldrh r0, [r6, 0x14] - subs r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r1, 0x1E - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r2, 0x12 - ldrsh r1, [r6, r2] - muls r1, r0 - ldrh r0, [r6, 0x16] - subs r0, r1 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - movs r0, 0x2 - strh r0, [r6, 0xE] - ldrh r0, [r6, 0x10] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC11C: - ldrh r1, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r1, r3 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r0, r1 - ldrh r1, [r6, 0x14] - adds r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r2, 0x1E - ldrsh r0, [r6, r2] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r0, r1 - ldrh r1, [r6, 0x16] - adds r0, r1 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - subs r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x3 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC196: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - bne _080CC1AC - b _080CC330 -_080CC1AC: - movs r0, 0x7 - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CC1B4: - ldrh r2, [r4, 0x24] - ldrh r3, [r4, 0x20] - adds r2, r3 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x14] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x16] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - adds r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x4 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC206: - ldrh r1, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r1, r0 - movs r0, 0 - strh r1, [r4, 0x20] - ldrh r2, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r2, r3 - strh r2, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r1, [r4, 0x30] - movs r1, 0x1C - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r3, 0x12 - ldrsh r1, [r6, r3] - muls r1, r0 - ldrh r0, [r6, 0x14] - subs r0, r1 - strh r0, [r4, 0x32] - strh r2, [r4, 0x34] - movs r1, 0x1E - ldrsh r0, [r6, r1] - lsrs r1, r0, 31 - adds r0, r1 - asrs r0, 1 - adds r0, 0xA - movs r2, 0x12 - ldrsh r1, [r6, r2] - muls r0, r1 - ldrh r3, [r6, 0x16] - adds r0, r3 - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - movs r0, 0x5 - strh r0, [r6, 0xE] - ldrh r0, [r6, 0x10] - adds r1, r4, 0 - adds r1, 0x43 - strb r0, [r1] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC27C: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080CC330 - movs r0, 0xB - strh r0, [r6, 0x26] - movs r0, 0xFF - b _080CC32E -_080CC298: - ldrh r2, [r4, 0x24] - ldrh r0, [r4, 0x20] - adds r2, r0 - movs r0, 0 - strh r2, [r4, 0x20] - ldrh r1, [r4, 0x26] - ldrh r3, [r4, 0x22] - adds r1, r3 - strh r1, [r4, 0x22] - strh r0, [r4, 0x24] - strh r0, [r4, 0x26] - movs r0, 0xA - strh r0, [r4, 0x2E] - strh r2, [r4, 0x30] - ldrh r0, [r6, 0x18] - strh r0, [r4, 0x32] - strh r1, [r4, 0x34] - ldrh r0, [r6, 0x1A] - strh r0, [r4, 0x36] - adds r0, r4, 0 - bl sub_80CC338 - strh r0, [r4, 0x38] - ldrh r1, [r6, 0x10] - subs r1, 0x2 - strh r1, [r6, 0x10] - movs r0, 0x6 - strh r0, [r6, 0xE] - adds r0, r4, 0 - adds r0, 0x43 - strb r1, [r0] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - adds r0, r4, 0 - bl sub_80786EC - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC2EA: - adds r0, r6, 0 - adds r1, r2, 0 - bl sub_80CC358 - adds r0, r4, 0 - bl sub_8078718 - lsls r0, 24 - cmp r0, 0 - beq _080CC330 - adds r0, r4, 0 - bl DestroySprite - ldrh r0, [r6, 0x8] - adds r0, 0x1 - b _080CC32E -_080CC30A: - movs r1, 0x20 - ldrsh r0, [r6, r1] - cmp r0, 0 - bne _080CC330 - adds r0, r2, 0 - bl DestroyAnimVisualTask - b _080CC330 -_080CC31A: - ldrh r0, [r6, 0xA] - adds r0, 0x1 - strh r0, [r6, 0xA] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x5 - ble _080CC330 - movs r0, 0 - strh r0, [r6, 0xA] - ldrh r0, [r6, 0x26] -_080CC32E: - strh r0, [r6, 0x8] -_080CC330: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end sub_80CBF5C - - thumb_func_start sub_80CC338 -sub_80CC338: @ 80CC338 - push {lr} - movs r2, 0x8 - movs r3, 0x36 - ldrsh r1, [r0, r3] - movs r3, 0x22 - ldrsh r0, [r0, r3] - cmp r1, r0 - bge _080CC34E - negs r0, r2 - lsls r0, 16 - lsrs r2, r0, 16 -_080CC34E: - lsls r0, r2, 16 - asrs r0, 16 - pop {r1} - bx r1 - thumb_func_end sub_80CC338 - - thumb_func_start sub_80CC358 -sub_80CC358: @ 80CC358 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - lsls r1, 24 - lsrs r7, r1, 24 - ldrh r0, [r6, 0x24] - adds r0, 0x1 - strh r0, [r6, 0x24] - lsls r0, 16 - cmp r0, 0 - ble _080CC3EE - movs r0, 0 - strh r0, [r6, 0x24] - ldr r0, _080CC3F8 @ =gSprites - mov r8, r0 - movs r2, 0xC - ldrsh r1, [r6, r2] - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - add r0, r8 - ldrh r1, [r0, 0x24] - ldrh r2, [r0, 0x20] - adds r1, r2 - ldrh r2, [r0, 0x26] - ldrh r0, [r0, 0x22] - adds r2, r0 - ldr r0, _080CC3FC @ =gSpriteTemplate_83D6884 - lsls r1, 16 - asrs r1, 16 - lsls r2, 16 - asrs r2, 16 - ldrb r3, [r6, 0x10] - bl CreateSprite - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x40 - beq _080CC3EE - lsls r5, r0, 4 - adds r5, r0 - lsls r5, 2 - mov r0, r8 - adds r4, r5, r0 - strh r7, [r4, 0x3A] - movs r0, 0xC - strh r0, [r4, 0x3C] - ldr r0, _080CC400 @ =gTasks - lsls r1, r7, 2 - adds r1, r7 - lsls r1, 3 - adds r1, r0 - ldrh r0, [r1, 0x20] - adds r0, 0x1 - strh r0, [r1, 0x20] - ldrh r2, [r6, 0x22] - movs r0, 0x1 - ands r0, r2 - strh r0, [r4, 0x2E] - ldrh r0, [r1, 0x22] - adds r0, 0x1 - strh r0, [r1, 0x22] - ldrb r1, [r6, 0xE] - adds r0, r4, 0 - bl StartSpriteAnim - ldrh r0, [r6, 0x10] - adds r4, 0x43 - strb r0, [r4] - mov r0, r8 - adds r0, 0x1C - adds r5, r0 - ldr r0, _080CC404 @ =sub_80CC408 - str r0, [r5] -_080CC3EE: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080CC3F8: .4byte gSprites -_080CC3FC: .4byte gSpriteTemplate_83D6884 -_080CC400: .4byte gTasks -_080CC404: .4byte sub_80CC408 - thumb_func_end sub_80CC358 - - thumb_func_start sub_80CC408 -sub_80CC408: @ 80CC408 - push {r4,lr} - adds r4, r0, 0 - ldrh r0, [r4, 0x2E] - adds r0, 0x1 - strh r0, [r4, 0x2E] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x1 - ble _080CC46A - movs r0, 0 - strh r0, [r4, 0x2E] - adds r3, r4, 0 - adds r3, 0x3E - ldrb r2, [r3] - lsls r0, r2, 29 - lsrs r0, 31 - movs r1, 0x1 - eors r1, r0 - lsls r1, 2 - movs r0, 0x5 - negs r0, r0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3] - ldrh r0, [r4, 0x30] - adds r0, 0x1 - strh r0, [r4, 0x30] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x8 - ble _080CC46A - ldr r3, _080CC470 @ =gTasks - movs r0, 0x3C - ldrsh r1, [r4, r0] - lsls r1, 1 - movs r0, 0x3A - ldrsh r2, [r4, r0] - lsls r0, r2, 2 - adds r0, r2 - lsls r0, 3 - adds r1, r0 - adds r3, 0x8 - adds r1, r3 - ldrh r0, [r1] - subs r0, 0x1 - strh r0, [r1] - adds r0, r4, 0 - bl DestroySprite -_080CC46A: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080CC470: .4byte gTasks - thumb_func_end sub_80CC408 - thumb_func_start sub_80CC474 sub_80CC474: @ 80CC474 push {r4-r7,lr} diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c index 85ad92d7f..8befb4b4e 100755 --- a/src/battle_anim_80CA710.c +++ b/src/battle_anim_80CA710.c @@ -11,11 +11,17 @@ #include "task.h" #include "trig.h" +struct __attribute__((packed)) Some3ByteStruct { + u8 unkArr[3]; +}; + extern s16 gBattleAnimArgs[8]; extern u8 gBattleAnimPlayerMonIndex; extern u8 gBattleAnimEnemyMonIndex; extern struct SpriteTemplate gSpriteTemplate_83D631C; +extern struct SpriteTemplate gSpriteTemplate_83D6884; extern s16 gUnknown_03000728[]; +extern s8 gUnknown_083D680C[11][3]; void sub_80CA768(struct Sprite* sprite); void sub_80CA8B4(struct Sprite* sprite); @@ -36,6 +42,10 @@ void sub_80CB710(struct Sprite* sprite); void sub_80CBB60(struct Sprite* sprite); void sub_80CBC8C(struct Sprite* sprite); void sub_80CBCF8(struct Sprite* sprite); +void sub_80CBDB0(struct Sprite* sprite); +void sub_80CC408(struct Sprite* sprite); + +s16 sub_80CC338(struct Sprite* sprite); void sub_80787B0(struct Sprite *sprite, u8 a2); void sub_8078764(struct Sprite *sprite, u8 a2); @@ -47,6 +57,7 @@ void sub_8078CC0(struct Sprite *sprite); void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4); u8 sub_8079ED4(u8 slot); s8 sub_8076F98(s8 a); +int sub_807A100(u8 slot, u8 a2); void move_anim_8074EE0(struct Sprite *sprite); bool8 sub_8078718(struct Sprite *sprite); @@ -54,6 +65,8 @@ bool8 sub_8078CE8(struct Sprite *sprite); void sub_80CB3A8(u8 taskId); void sub_80CB438(u8 taskId); +void sub_80CBF5C(u8 taskId); +void sub_80CC358(struct Task* task, u8 taskId); void sub_80CA710(struct Sprite* sprite) { @@ -1561,4 +1574,532 @@ void sub_80CBC8C(struct Sprite* sprite) break; } } -}
\ No newline at end of file +} + + + +void sub_80CBCF8(struct Sprite* sprite) +{ + if(sprite->data2 == gUnknown_083D680C[sprite->data0][1]) + { + if(gUnknown_083D680C[sprite->data0][2] == 0x7F) + { + sprite->data0 = 0; + sprite->callback = sub_80CBDB0; + } + sprite->data2 = 0; + sprite->data0++; + } + else + { + sprite->data2++; + sprite->data1 = (gUnknown_083D680C[sprite->data0][0] * gUnknown_083D680C[sprite->data0][2] + sprite->data1) & 0xFF; + if (!IsContest()) + { + if((u16)(sprite->data1 - 1) <= 0xBE) + { + sprite->subpriority = 31; + } + else + { + sprite->subpriority = 29; + } + } + sprite->pos2.x = Cos(sprite->data1, 0x3C); + sprite->pos2.y = Sin(sprite->data1, 20); + } +} + +void sub_80CBDB0(struct Sprite* sprite) +{ + if(sprite->data0 > 20) move_anim_8072740(sprite); + sprite->invisible = sprite->data0 % 2; + sprite->data0++; +} + +#ifdef NONMATCHING +void sub_80CBDF4(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + task->data[4] = sub_8079E90(gBattleAnimEnemyMonIndex) - 1; + task->data[6] = sub_8077ABC(gBattleAnimEnemyMonIndex, 2); + task->data[7] = sub_8077ABC(gBattleAnimEnemyMonIndex, 3); + task->data[10] = sub_807A100(gBattleAnimEnemyMonIndex, 1); + task->data[11] = sub_807A100(gBattleAnimEnemyMonIndex, 0); + if(GetBankSide(gBattleAnimEnemyMonIndex) == 1) + { + task->data[5] = 1; + } + else + { + task->data[5] = -1; + } + task->data[9] = 0x38 - (task->data[5] * 64); + task->data[8] = task->data[7] - task->data[9] + task->data[6]; + task->data[2] = CreateSprite(&gSpriteTemplate_83D6884, task->data[8], task->data[9], task->data[4]); + if(task->data[2] == 0x40) DestroyAnimVisualTask(taskId); + gSprites[task->data[2]].data0 = 10; + gSprites[task->data[2]].data1 = task->data[8]; + gSprites[task->data[2]].data2 = task->data[6] - (((task->data[10] / 2) + 10) * task->data[5]); + gSprites[task->data[2]].data3 = task->data[9]; + gSprites[task->data[2]].data4 = ((task->data[11] / 2) + 10) * task->data[5] + task->data[7]; + gSprites[task->data[2]].data5 = sub_80CC338(&gSprites[task->data[2]]); + sub_80786EC(&gSprites[task->data[2]]); + task->func = sub_80CBF5C; +} +#else +__attribute__((naked)) +void sub_80CBDF4(u8 taskId) +{ + asm(".syntax unified\n\ + push {r4-r6,lr}\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + adds r6, r0, 0\n\ + lsls r0, r6, 2\n\ + adds r0, r6\n\ + lsls r0, 3\n\ + ldr r1, _080CBF48 @ =gTasks\n\ + adds r5, r0, r1\n\ + ldr r4, _080CBF4C @ =gBattleAnimEnemyMonIndex\n\ + ldrb r0, [r4]\n\ + bl sub_8079E90\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + subs r0, 0x1\n\ + strh r0, [r5, 0x10]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x2\n\ + bl sub_8077ABC\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x14]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x3\n\ + bl sub_8077ABC\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0x16]\n\ + ldrb r0, [r4]\n\ + movs r1, 0x1\n\ + bl sub_807A100\n\ + strh r0, [r5, 0x1C]\n\ + ldrb r0, [r4]\n\ + movs r1, 0\n\ + bl sub_807A100\n\ + strh r0, [r5, 0x1E]\n\ + ldrb r0, [r4]\n\ + bl GetBankSide\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + movs r2, 0x1\n\ + negs r2, r2\n\ + adds r1, r2, 0\n\ + cmp r0, 0x1\n\ + bne _080CBE5C\n\ + movs r1, 0x1\n\ +_080CBE5C:\n\ + strh r1, [r5, 0x12]\n\ + movs r3, 0x12\n\ + ldrsh r0, [r5, r3]\n\ + lsls r0, 6\n\ + movs r1, 0x38\n\ + subs r1, r0\n\ + strh r1, [r5, 0x1A]\n\ + ldrh r0, [r5, 0x16]\n\ + subs r0, r1\n\ + ldrh r1, [r5, 0x14]\n\ + adds r0, r1\n\ + strh r0, [r5, 0x18]\n\ + ldr r0, _080CBF50 @ =gSpriteTemplate_83D6884\n\ + movs r2, 0x18\n\ + ldrsh r1, [r5, r2]\n\ + movs r3, 0x1A\n\ + ldrsh r2, [r5, r3]\n\ + ldrb r3, [r5, 0x10]\n\ + bl CreateSprite\n\ + lsls r0, 24\n\ + lsrs r0, 24\n\ + strh r0, [r5, 0xC]\n\ + cmp r0, 0x40\n\ + bne _080CBE94\n\ + adds r0, r6, 0\n\ + bl DestroyAnimVisualTask\n\ +_080CBE94:\n\ + ldr r4, _080CBF54 @ =gSprites\n\ + movs r0, 0xC\n\ + ldrsh r1, [r5, r0]\n\ + lsls r0, r1, 4\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + movs r1, 0xA\n\ + strh r1, [r0, 0x2E]\n\ + movs r2, 0xC\n\ + ldrsh r1, [r5, r2]\n\ + lsls r0, r1, 4\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + ldrh r1, [r5, 0x18]\n\ + strh r1, [r0, 0x30]\n\ + movs r3, 0xC\n\ + ldrsh r0, [r5, r3]\n\ + lsls r2, r0, 4\n\ + adds r2, r0\n\ + lsls r2, 2\n\ + adds r2, r4\n\ + movs r1, 0x1C\n\ + ldrsh r0, [r5, r1]\n\ + lsrs r1, r0, 31\n\ + adds r0, r1\n\ + asrs r0, 1\n\ + adds r0, 0xA\n\ + movs r3, 0x12\n\ + ldrsh r1, [r5, r3]\n\ + muls r1, r0\n\ + ldrh r0, [r5, 0x14]\n\ + subs r0, r1\n\ + strh r0, [r2, 0x32]\n\ + movs r0, 0xC\n\ + ldrsh r1, [r5, r0]\n\ + lsls r0, r1, 4\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + ldrh r1, [r5, 0x1A]\n\ + strh r1, [r0, 0x34]\n\ + movs r1, 0xC\n\ + ldrsh r0, [r5, r1]\n\ + lsls r1, r0, 4\n\ + adds r1, r0\n\ + lsls r1, 2\n\ + adds r1, r4\n\ + movs r2, 0x1E\n\ + ldrsh r0, [r5, r2]\n\ + lsrs r2, r0, 31\n\ + adds r0, r2\n\ + asrs r0, 1\n\ + adds r0, 0xA\n\ + movs r3, 0x12\n\ + ldrsh r2, [r5, r3]\n\ + muls r0, r2\n\ + ldrh r2, [r5, 0x16]\n\ + adds r0, r2\n\ + strh r0, [r1, 0x36]\n\ + movs r3, 0xC\n\ + ldrsh r1, [r5, r3]\n\ + lsls r0, r1, 4\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + bl sub_80CC338\n\ + movs r1, 0xC\n\ + ldrsh r2, [r5, r1]\n\ + lsls r1, r2, 4\n\ + adds r1, r2\n\ + lsls r1, 2\n\ + adds r1, r4\n\ + strh r0, [r1, 0x38]\n\ + movs r2, 0xC\n\ + ldrsh r1, [r5, r2]\n\ + lsls r0, r1, 4\n\ + adds r0, r1\n\ + lsls r0, 2\n\ + adds r0, r4\n\ + bl sub_80786EC\n\ + ldr r0, _080CBF58 @ =sub_80CBF5C\n\ + str r0, [r5]\n\ + pop {r4-r6}\n\ + pop {r0}\n\ + bx r0\n\ + .align 2, 0\n\ +_080CBF48: .4byte gTasks\n\ +_080CBF4C: .4byte gBattleAnimEnemyMonIndex\n\ +_080CBF50: .4byte gSpriteTemplate_83D6884\n\ +_080CBF54: .4byte gSprites\n\ +_080CBF58: .4byte sub_80CBF5C\n\ + .syntax divided\n"); +} +#endif + +void sub_80CBF5C(u8 taskId) +{ + struct Task* task = &gTasks[taskId]; + struct Sprite* sprite = &gSprites[task->data[2]]; + int a = task->data[0]; + switch(a) + { + case 4: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + else + { + task->data[15] = 5; + task->data[0] = 0xFF; + break; + } + } + case 8: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + else + { + task->data[15] = 9; + task->data[0] = 0xFF; + break; + } + } + case 0: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + task->data[15] = 1; + task->data[0] = 0xFF; + break; + } + case 1: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[6]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[7]; + sprite->data5 = sub_80CC338(sprite); + task->data[4] += 2; + task->data[3] = a; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 2: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + task->data[15] = 3; + task->data[0] = 0xFF; + break; + } + case 3: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[7] - ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data5 = sub_80CC338(sprite); + task->data[3] = 2; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 5: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[6] + ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data5 = sub_80CC338(sprite); + task->data[4] -= 2; + task->data[3] = 3; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 6: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + task->data[15] = 7; + task->data[0] = 0xFF; + break; + } + case 7: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[6]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[7]; + sprite->data5 = sub_80CC338(sprite); + task->data[4] += 2; + task->data[3] = 4; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 9: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[6] - ((task->data[10] / 2) + 10) * task->data[5]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[7] + ((task->data[11] / 2) + 10) * task->data[5]; + sprite->data5 = sub_80CC338(sprite); + task->data[3] = 5; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 10: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) == 0) + { + break; + } + else + { + task->data[15] = 11; + task->data[0] = 0xFF; + break; + } + } + case 11: + { + sprite->pos1.x += sprite->pos2.x; + sprite->pos1.y += sprite->pos2.y; + sprite->pos2.x = 0; + sprite->pos2.y = 0; + sprite->data0 = 10; + sprite->data1 = sprite->pos1.x; + sprite->data2 = task->data[8]; + sprite->data3 = sprite->pos1.y; + sprite->data4 = task->data[9]; + sprite->data5 = sub_80CC338(sprite); + task->data[4] -= 2; + task->data[3] = 6; + sprite->subpriority = task->data[4]; + StartSpriteAnim(sprite, task->data[3]); + sub_80786EC(sprite); + task->data[0]++; + break; + } + case 12: + { + sub_80CC358(task, taskId); + if(sub_8078718(sprite) != 0) + { + DestroySprite(sprite); + task->data[0]++; + } + break; + } + case 13: + { + if(task->data[12] == 0) + { + DestroyAnimVisualTask(taskId); + break; + } + break; + } + case 255: + { + task->data[1]++; + if(task->data[1] > 5) + { + task->data[1] = 0; + task->data[0] = task->data[15]; + } + } + } +} + +s16 sub_80CC338(struct Sprite* sprite) +{ + s16 var = 8; + if(sprite->data4 < sprite->pos1.y) var = -var; + return var; +} + +void sub_80CC358(struct Task* task, u8 taskId) +{ + task->data[14]++; + if(task->data[14] > 0) + { + u8 spriteId; + s16 spriteX; + s16 spriteY; + task->data[14] = 0; + spriteX = gSprites[task->data[2]].pos1.x + gSprites[task->data[2]].pos2.x; + spriteY = gSprites[task->data[2]].pos1.y + gSprites[task->data[2]].pos2.y; + spriteId = CreateSprite(&gSpriteTemplate_83D6884, spriteX, spriteY, task->data[4]); + if (spriteId != 0x40) + { + gSprites[spriteId].data6 = taskId; + gSprites[spriteId].data7 = 12; + gTasks[taskId].data[12]++; + gSprites[spriteId].data0 = task->data[13] & 1; + gTasks[taskId].data[13]++; + StartSpriteAnim(&gSprites[spriteId], task->data[3]); + gSprites[spriteId].subpriority = task->data[4]; + gSprites[spriteId].callback = sub_80CC408; + } + } +} + +void sub_80CC408(struct Sprite* sprite) +{ + sprite->data0++; + if (sprite->data0 > 1) + { + sprite->data0 = 0; + sprite->invisible ^= 1; + sprite->data1++; + if(sprite->data1 > 8) + { + gTasks[sprite->data6].data[sprite->data7]--; + DestroySprite(sprite); + } + } +} + |