diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_9.s | 2840 | ||||
| -rw-r--r-- | asm/battle_anim_812C144.s | 272 | ||||
| -rw-r--r-- | asm/battle_anim_813F0F4.s | 58 | ||||
| -rw-r--r-- | asm/current.s | 70 | ||||
| -rw-r--r-- | asm/flying.s | 74 | ||||
| -rw-r--r-- | asm/ghost.s | 56 | ||||
| -rw-r--r-- | asm/ground.s | 46 | ||||
| -rw-r--r-- | asm/ice.s | 74 | ||||
| -rw-r--r-- | asm/normal.s | 62 | ||||
| -rw-r--r-- | asm/water.s | 28 |
10 files changed, 370 insertions, 3210 deletions
diff --git a/asm/battle_9.s b/asm/battle_9.s deleted file mode 100644 index 3f162df12..000000000 --- a/asm/battle_9.s +++ /dev/null @@ -1,2840 +0,0 @@ - .include "constants/gba_constants.inc" - .include "include/macros.inc" - - .syntax unified - - .text - - thumb_func_start AI_SwitchIfPerishSong -AI_SwitchIfPerishSong: @ 8035FEC - push {lr} - ldr r1, _08036038 @ =gStatuses3 - ldr r0, _0803603C @ =gActiveBank - ldrb r2, [r0] - lsls r0, r2, 2 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0803604C - ldr r0, _08036040 @ =gDisableStructs - lsls r1, r2, 3 - subs r1, r2 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0xF] - lsls r0, 28 - cmp r0, 0 - bne _0803604C - adds r0, r2, 0 - bl GetBankIdentity - ldr r1, _08036044 @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r2, _08036048 @ =0x000160c8 - adds r0, r2 - adds r0, r1 - movs r1, 0x6 - strb r1, [r0] - movs r0, 0x1 - movs r1, 0x2 - movs r2, 0 - bl Emitcmd33 - movs r0, 0x1 - b _0803604E - .align 2, 0 -_08036038: .4byte gStatuses3 -_0803603C: .4byte gActiveBank -_08036040: .4byte gDisableStructs -_08036044: .4byte gSharedMem -_08036048: .4byte 0x000160c8 -_0803604C: - movs r0, 0 -_0803604E: - pop {r1} - bx r1 - thumb_func_end AI_SwitchIfPerishSong - - thumb_func_start AI_SwitchIfWonderguard -AI_SwitchIfWonderguard: @ 8036054 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r0, _0803606C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080360A0 - b _080361C8 - .align 2, 0 -_0803606C: .4byte gBattleTypeFlags -_08036070: - ldr r0, _08036094 @ =gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - ldr r1, _08036098 @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r2, _0803609C @ =0x000160c8 - adds r0, r2 - adds r0, r1 - strb r6, [r0] - movs r0, 0x1 - movs r1, 0x2 - movs r2, 0 - bl Emitcmd33 - movs r0, 0x1 - b _080361CA - .align 2, 0 -_08036094: .4byte gActiveBank -_08036098: .4byte gSharedMem -_0803609C: .4byte 0x000160c8 -_080360A0: - ldr r4, _080361D8 @ =gBattleMons - movs r0, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x58 - muls r0, r1 - adds r0, r4 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, 0x19 - beq _080360BC - b _080361C8 -_080360BC: - movs r0, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r2, r0, 24 - movs r6, 0 - adds r7, r4, 0 - movs r5, 0x58 - adds r0, r2, 0 - muls r0, r5 - adds r4, r0, r7 - movs r3, 0x20 - adds r3, r4 - mov r8, r3 -_080360D8: - lsls r1, r6, 1 - ldr r0, _080361DC @ =gActiveBank - ldrb r0, [r0] - muls r0, r5 - adds r1, r0 - adds r0, r7, 0 - adds r0, 0xC - adds r1, r0 - ldrh r0, [r1] - cmp r0, 0 - beq _08036104 - ldrh r1, [r4] - mov r3, r8 - ldrb r2, [r3] - bl AI_TypeCalc - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0x2 - ands r1, r0 - cmp r1, 0 - bne _080361C8 -_08036104: - adds r6, 0x1 - cmp r6, 0x3 - ble _080360D8 - movs r6, 0 - ldr r0, _080361E0 @ =gEnemyParty - mov r9, r0 -_08036110: - movs r0, 0x64 - adds r5, r6, 0 - muls r5, r0 - mov r2, r9 - adds r4, r5, r2 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _080361C2 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - beq _080361C2 - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080361C2 - ldr r1, _080361E4 @ =gBattlePartyID - ldr r0, _080361DC @ =gActiveBank - ldrb r0, [r0] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r6, r0 - beq _080361C2 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - adds r0, r4, 0 - movs r1, 0x2E - bl GetMonData - movs r0, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r2, r0, 24 - movs r4, 0 - mov r8, r5 - ldr r1, _080361D8 @ =gBattleMons - movs r0, 0x58 - muls r0, r2 - adds r5, r0, r1 - adds r7, r5, 0 - adds r7, 0x20 -_0803617C: - adds r1, r4, 0 - adds r1, 0xD - mov r0, r8 - add r0, r9 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - beq _080361BC - ldrh r1, [r5] - ldrb r2, [r7] - bl AI_TypeCalc - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0x2 - ands r1, r0 - cmp r1, 0 - beq _080361BC - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x1 - bhi _080361BC - b _08036070 -_080361BC: - adds r4, 0x1 - cmp r4, 0x3 - ble _0803617C -_080361C2: - adds r6, 0x1 - cmp r6, 0x5 - ble _08036110 -_080361C8: - movs r0, 0 -_080361CA: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080361D8: .4byte gBattleMons -_080361DC: .4byte gActiveBank -_080361E0: .4byte gEnemyParty -_080361E4: .4byte gBattlePartyID - thumb_func_end AI_SwitchIfWonderguard - - thumb_func_start sub_80361E8 -sub_80361E8: @ 80361E8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - movs r0, 0x1 - bl ai_has_super_effective_move_on_field - lsls r0, 24 - cmp r0, 0 - beq _08036214 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0x3 - bl __umodsi3 - lsls r0, 16 - cmp r0, 0 - beq _08036214 - b _08036400 -_08036214: - ldr r1, _0803627C @ =gLastLandedMoves - ldr r5, _08036280 @ =gActiveBank - ldrb r3, [r5] - lsls r0, r3, 1 - adds r4, r0, r1 - ldrh r1, [r4] - cmp r1, 0 - bne _08036226 - b _08036400 -_08036226: - ldr r0, _08036284 @ =0x0000ffff - cmp r1, r0 - bne _0803622E - b _08036400 -_0803622E: - ldr r2, _08036288 @ =gBattleMoves - ldrh r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0 - bne _08036242 - b _08036400 -_08036242: - ldr r0, _0803628C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080362AE - mov r8, r3 - mov r0, r8 - bl GetBankIdentity - movs r4, 0x2 - eors r0, r4 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - ldr r1, _08036290 @ =gAbsentBankFlags - ldrb r1, [r1] - ldr r2, _08036294 @ =gBitTable - lsls r0, 24 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08036298 - ldrb r7, [r5] - b _080362B2 - .align 2, 0 -_0803627C: .4byte gLastLandedMoves -_08036280: .4byte gActiveBank -_08036284: .4byte 0x0000ffff -_08036288: .4byte gBattleMoves -_0803628C: .4byte gBattleTypeFlags -_08036290: .4byte gAbsentBankFlags -_08036294: .4byte gBitTable -_08036298: - ldrb r0, [r5] - bl GetBankIdentity - eors r0, r4 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - lsls r0, 24 - lsrs r7, r0, 24 - b _080362B2 -_080362AE: - adds r7, r3, 0 - mov r8, r7 -_080362B2: - ldr r3, _080362D4 @ =gBattleMoves - ldr r1, _080362D8 @ =gLastLandedMoves - ldr r2, _080362DC @ =gActiveBank - ldrb r0, [r2] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldrb r0, [r0, 0x2] - adds r1, r2, 0 - cmp r0, 0xA - bne _080362E0 - movs r0, 0x12 - b _080362F2 - .align 2, 0 -_080362D4: .4byte gBattleMoves -_080362D8: .4byte gLastLandedMoves -_080362DC: .4byte gActiveBank -_080362E0: - cmp r0, 0xB - bne _080362EA - movs r2, 0xB - mov r10, r2 - b _080362F4 -_080362EA: - cmp r0, 0xD - beq _080362F0 - b _08036400 -_080362F0: - movs r0, 0xA -_080362F2: - mov r10, r0 -_080362F4: - ldr r2, _08036308 @ =gBattleMons - ldrb r1, [r1] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, r10 - bne _0803633C - b _08036400 - .align 2, 0 -_08036308: .4byte gBattleMons -_0803630C: - ldr r0, _08036330 @ =gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - ldr r1, _08036334 @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r2, _08036338 @ =0x000160c8 - adds r0, r2 - adds r0, r1 - strb r6, [r0] - movs r0, 0x1 - movs r1, 0x2 - movs r2, 0 - bl Emitcmd33 - movs r0, 0x1 - b _08036402 - .align 2, 0 -_08036330: .4byte gActiveBank -_08036334: .4byte gSharedMem -_08036338: .4byte 0x000160c8 -_0803633C: - movs r6, 0 - ldr r0, _080363CC @ =gBaseStats - mov r9, r0 -_08036342: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, _080363D0 @ =gEnemyParty - adds r5, r1, r0 - adds r0, r5, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _080363FA - adds r0, r5, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - beq _080363FA - adds r0, r5, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080363FA - ldr r1, _080363D4 @ =gBattlePartyID - mov r2, r8 - lsls r0, r2, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r6, r0 - beq _080363FA - lsls r0, r7, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r6, r0 - beq _080363FA - ldr r1, _080363D8 @ =gSharedMem - ldr r0, _080363DC @ =0x00016068 - add r0, r8 - adds r0, r1 - ldrb r0, [r0] - cmp r6, r0 - beq _080363FA - ldr r2, _080363DC @ =0x00016068 - adds r0, r7, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r6, r0 - beq _080363FA - adds r0, r5, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0 - movs r1, 0x2E - bl GetMonData - cmp r0, 0 - beq _080363E0 - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - add r0, r9 - ldrb r0, [r0, 0x17] - b _080363EA - .align 2, 0 -_080363CC: .4byte gBaseStats -_080363D0: .4byte gEnemyParty -_080363D4: .4byte gBattlePartyID -_080363D8: .4byte gSharedMem -_080363DC: .4byte 0x00016068 -_080363E0: - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - add r0, r9 - ldrb r0, [r0, 0x16] -_080363EA: - cmp r10, r0 - bne _080363FA - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - bne _0803630C -_080363FA: - adds r6, 0x1 - cmp r6, 0x5 - ble _08036342 -_08036400: - movs r0, 0 -_08036402: - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80361E8 - - thumb_func_start AI_SwitchIfNaturalCure -AI_SwitchIfNaturalCure: @ 8036410 - push {r4,r5,lr} - ldr r3, _08036468 @ =gBattleMons - ldr r5, _0803646C @ =gActiveBank - ldrb r4, [r5] - movs r0, 0x58 - adds r2, r4, 0 - muls r2, r0 - adds r0, r3, 0 - adds r0, 0x4C - adds r0, r2, r0 - ldr r0, [r0] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - beq _080364D8 - adds r1, r2, r3 - adds r0, r1, 0 - adds r0, 0x20 - ldrb r0, [r0] - cmp r0, 0x1E - bne _080364D8 - ldrh r0, [r1, 0x2C] - ldrh r1, [r1, 0x28] - lsrs r0, 1 - cmp r1, r0 - bcc _080364D8 - ldr r1, _08036470 @ =gLastLandedMoves - lsls r0, r4, 1 - adds r0, r1 - ldrh r1, [r0] - cmp r1, 0 - beq _08036456 - ldr r0, _08036474 @ =0x0000ffff - cmp r1, r0 - bne _08036478 -_08036456: - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _08036478 - ldrb r0, [r5] - b _080364E0 - .align 2, 0 -_08036468: .4byte gBattleMons -_0803646C: .4byte gActiveBank -_08036470: .4byte gLastLandedMoves -_08036474: .4byte 0x0000ffff -_08036478: - ldr r2, _080364A4 @ =gBattleMoves - ldr r1, _080364A8 @ =gLastLandedMoves - ldr r4, _080364AC @ =gActiveBank - ldrb r0, [r4] - lsls r0, 1 - adds r0, r1 - ldrh r1, [r0] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0 - bne _080364B0 - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - beq _080364B0 - ldrb r0, [r4] - b _080364E0 - .align 2, 0 -_080364A4: .4byte gBattleMoves -_080364A8: .4byte gLastLandedMoves -_080364AC: .4byte gActiveBank -_080364B0: - movs r0, 0x8 - movs r1, 0x1 - bl sub_80366A4 - lsls r0, 24 - cmp r0, 0 - bne _080364FE - movs r0, 0x4 - movs r1, 0x1 - bl sub_80366A4 - lsls r0, 24 - cmp r0, 0 - bne _080364FE - bl Random - movs r1, 0x1 - ands r1, r0 - cmp r1, 0 - bne _080364DC -_080364D8: - movs r0, 0 - b _08036500 -_080364DC: - ldr r0, _08036508 @ =gActiveBank - ldrb r0, [r0] -_080364E0: - bl GetBankIdentity - ldr r1, _0803650C @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r2, _08036510 @ =0x000160c8 - adds r0, r2 - adds r0, r1 - movs r1, 0x6 - strb r1, [r0] - movs r0, 0x1 - movs r1, 0x2 - movs r2, 0 - bl Emitcmd33 -_080364FE: - movs r0, 0x1 -_08036500: - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_08036508: .4byte gActiveBank -_0803650C: .4byte gSharedMem -_08036510: .4byte 0x000160c8 - thumb_func_end AI_SwitchIfNaturalCure - - thumb_func_start ai_has_super_effective_move_on_field -ai_has_super_effective_move_on_field: @ 8036514 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - movs r0, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _080365AC @ =gAbsentBankFlags - ldrb r1, [r0] - ldr r2, _080365B0 @ =gBitTable - lsls r0, r3, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _0803659C - movs r4, 0 - ldr r6, _080365B4 @ =gBattleMons - movs r7, 0x58 - adds r0, r3, 0 - muls r0, r7 - adds r5, r0, r6 - movs r0, 0x20 - adds r0, r5 - mov r9, r0 -_08036550: - lsls r1, r4, 1 - ldr r0, _080365B8 @ =gActiveBank - ldrb r0, [r0] - muls r0, r7 - adds r1, r0 - adds r0, r6, 0 - adds r0, 0xC - adds r1, r0 - ldrh r0, [r1] - cmp r0, 0 - beq _08036596 - ldrh r1, [r5] - mov r3, r9 - ldrb r2, [r3] - bl AI_TypeCalc - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0x2 - ands r1, r0 - cmp r1, 0 - beq _08036596 - mov r0, r8 - cmp r0, 0 - bne _080365C0 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xA - bl __umodsi3 - lsls r0, 16 - cmp r0, 0 - bne _080365C0 -_08036596: - adds r4, 0x1 - cmp r4, 0x3 - ble _08036550 -_0803659C: - ldr r0, _080365BC @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _080365C4 - b _0803663E - .align 2, 0 -_080365AC: .4byte gAbsentBankFlags -_080365B0: .4byte gBitTable -_080365B4: .4byte gBattleMons -_080365B8: .4byte gActiveBank -_080365BC: .4byte gBattleTypeFlags -_080365C0: - movs r0, 0x1 - b _08036640 -_080365C4: - movs r0, 0x2 - bl GetBankByIdentity - lsls r0, 24 - lsrs r3, r0, 24 - ldr r0, _0803664C @ =gAbsentBankFlags - ldrb r1, [r0] - ldr r2, _08036650 @ =gBitTable - lsls r0, r3, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - bne _0803663E - movs r4, 0 - ldr r6, _08036654 @ =gBattleMons - movs r7, 0x58 - adds r0, r3, 0 - muls r0, r7 - adds r5, r0, r6 - movs r3, 0x20 - adds r3, r5 - mov r9, r3 -_080365F2: - lsls r1, r4, 1 - ldr r0, _08036658 @ =gActiveBank - ldrb r0, [r0] - muls r0, r7 - adds r1, r0 - adds r0, r6, 0 - adds r0, 0xC - adds r1, r0 - ldrh r0, [r1] - cmp r0, 0 - beq _08036638 - ldrh r1, [r5] - mov r3, r9 - ldrb r2, [r3] - bl AI_TypeCalc - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0x2 - ands r1, r0 - cmp r1, 0 - beq _08036638 - mov r0, r8 - cmp r0, 0 - bne _080365C0 - bl Random - lsls r0, 16 - lsrs r0, 16 - movs r1, 0xA - bl __umodsi3 - lsls r0, 16 - cmp r0, 0 - bne _080365C0 -_08036638: - adds r4, 0x1 - cmp r4, 0x3 - ble _080365F2 -_0803663E: - movs r0, 0 -_08036640: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0803664C: .4byte gAbsentBankFlags -_08036650: .4byte gBitTable -_08036654: .4byte gBattleMons -_08036658: .4byte gActiveBank - thumb_func_end ai_has_super_effective_move_on_field - - thumb_func_start AI_AreStatsRaised -AI_AreStatsRaised: @ 803665C - push {r4,lr} - movs r4, 0 - ldr r1, _0803669C @ =gBattleMons - ldr r0, _080366A0 @ =gActiveBank - ldrb r2, [r0] - movs r0, 0x58 - muls r0, r2 - adds r1, 0x18 - adds r2, r0, r1 - movs r3, 0x7 -_08036670: - ldrb r1, [r2] - movs r0, 0 - ldrsb r0, [r2, r0] - cmp r0, 0x6 - ble _08036686 - subs r1, 0x6 - lsls r0, r4, 24 - asrs r0, 24 - adds r0, r1 - lsls r0, 24 - lsrs r4, r0, 24 -_08036686: - adds r2, 0x1 - subs r3, 0x1 - cmp r3, 0 - bge _08036670 - movs r0, 0 - cmp r4, 0x3 - bls _08036696 - movs r0, 0x1 -_08036696: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0803669C: .4byte gBattleMons -_080366A0: .4byte gActiveBank - thumb_func_end AI_AreStatsRaised - - thumb_func_start sub_80366A4 -sub_80366A4: @ 80366A4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r1, 24 - lsrs r1, 24 - str r1, [sp, 0x4] - ldr r1, _08036730 @ =gLastLandedMoves - ldr r5, _08036734 @ =gActiveBank - ldrb r3, [r5] - lsls r0, r3, 1 - adds r4, r0, r1 - ldrh r1, [r4] - cmp r1, 0 - bne _080366CE - b _080368D8 -_080366CE: - ldr r0, _08036738 @ =0x0000ffff - cmp r1, r0 - bne _080366D6 - b _080368D8 -_080366D6: - ldr r0, _0803673C @ =gUnknown_02024C5C - adds r0, r3, r0 - ldrb r0, [r0] - cmp r0, 0xFF - bne _080366E2 - b _080368D8 -_080366E2: - ldr r2, _08036740 @ =gBattleMoves - ldrh r1, [r4] - lsls r0, r1, 1 - adds r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x1] - cmp r0, 0 - bne _080366F6 - b _080368D8 -_080366F6: - ldr r0, _08036744 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08036798 - mov r9, r3 - mov r0, r9 - bl GetBankIdentity - movs r4, 0x2 - eors r0, r4 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - ldr r1, _08036748 @ =gAbsentBankFlags - ldrb r1, [r1] - ldr r2, _0803674C @ =gBitTable - lsls r0, 24 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08036750 - ldrb r5, [r5] - mov r10, r5 - b _0803679C - .align 2, 0 -_08036730: .4byte gLastLandedMoves -_08036734: .4byte gActiveBank -_08036738: .4byte 0x0000ffff -_0803673C: .4byte gUnknown_02024C5C -_08036740: .4byte gBattleMoves -_08036744: .4byte gBattleTypeFlags -_08036748: .4byte gAbsentBankFlags -_0803674C: .4byte gBitTable -_08036750: - ldrb r0, [r5] - bl GetBankIdentity - eors r0, r4 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - b _0803679C -_08036768: - ldr r0, _0803678C @ =gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - ldr r1, _08036790 @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r2, _08036794 @ =0x000160c8 - adds r0, r2 - adds r0, r1 - strb r6, [r0] - movs r0, 0x1 - movs r1, 0x2 - movs r2, 0 - bl Emitcmd33 - movs r0, 0x1 - b _080368DA - .align 2, 0 -_0803678C: .4byte gActiveBank -_08036790: .4byte gSharedMem -_08036794: .4byte 0x000160c8 -_08036798: - mov r9, r3 - mov r10, r9 -_0803679C: - movs r6, 0 -_0803679E: - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - ldr r0, _08036830 @ =gEnemyParty - adds r5, r1, r0 - adds r0, r5, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - bne _080367B6 - b _080368D0 -_080367B6: - adds r0, r5, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - bne _080367C4 - b _080368D0 -_080367C4: - adds r0, r5, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080368D0 - ldr r1, _08036834 @ =gBattlePartyID - mov r2, r9 - lsls r0, r2, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r6, r0 - beq _080368D0 - mov r2, r10 - lsls r0, r2, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r6, r0 - beq _080368D0 - ldr r1, _08036838 @ =gSharedMem - ldr r0, _0803683C @ =0x00016068 - add r0, r9 - adds r0, r1 - ldrb r0, [r0] - cmp r6, r0 - beq _080368D0 - ldr r0, _0803683C @ =0x00016068 - add r0, r10 - adds r0, r1 - ldrb r0, [r0] - cmp r6, r0 - beq _080368D0 - adds r0, r5, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - adds r0, r5, 0 - movs r1, 0x2E - bl GetMonData - cmp r0, 0 - beq _08036844 - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - ldr r1, _08036840 @ =gBaseStats - adds r0, r1 - ldrb r2, [r0, 0x17] - b _08036850 - .align 2, 0 -_08036830: .4byte gEnemyParty -_08036834: .4byte gBattlePartyID -_08036838: .4byte gSharedMem -_0803683C: .4byte 0x00016068 -_08036840: .4byte gBaseStats -_08036844: - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 2 - ldr r2, _080368EC @ =gBaseStats - adds r0, r2 - ldrb r2, [r0, 0x16] -_08036850: - ldr r1, _080368F0 @ =gLastLandedMoves - ldr r5, _080368F4 @ =gActiveBank - ldrb r0, [r5] - lsls r0, 1 - adds r0, r1 - ldrh r0, [r0] - adds r1, r4, 0 - bl AI_TypeCalc - ldr r1, [sp] - ands r1, r0 - cmp r1, 0 - beq _080368D0 - ldr r1, _080368F8 @ =gUnknown_02024C5C - ldrb r0, [r5] - adds r0, r1 - ldrb r0, [r0] - mov r9, r0 - movs r4, 0 - movs r0, 0x64 - adds r1, r6, 0 - muls r1, r0 - mov r8, r1 - ldr r1, _080368FC @ =gBattleMons - movs r0, 0x58 - mov r2, r9 - muls r2, r0 - adds r0, r2, 0 - adds r5, r0, r1 - adds r7, r5, 0 - adds r7, 0x20 -_0803688E: - ldr r0, _08036900 @ =gEnemyParty - adds r1, r4, 0 - adds r1, 0xD - add r0, r8 - bl GetMonData - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - beq _080368CA - ldrh r1, [r5] - ldrb r2, [r7] - bl AI_TypeCalc - lsls r0, 24 - lsrs r1, r0, 24 - movs r0, 0x2 - ands r1, r0 - cmp r1, 0 - beq _080368CA - bl Random - lsls r0, 16 - lsrs r0, 16 - ldr r1, [sp, 0x4] - bl __modsi3 - cmp r0, 0 - bne _080368CA - b _08036768 -_080368CA: - adds r4, 0x1 - cmp r4, 0x3 - ble _0803688E -_080368D0: - adds r6, 0x1 - cmp r6, 0x5 - bgt _080368D8 - b _0803679E -_080368D8: - movs r0, 0 -_080368DA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_080368EC: .4byte gBaseStats -_080368F0: .4byte gLastLandedMoves -_080368F4: .4byte gActiveBank -_080368F8: .4byte gUnknown_02024C5C -_080368FC: .4byte gBattleMons -_08036900: .4byte gEnemyParty - thumb_func_end sub_80366A4 - - thumb_func_start AI_ShouldSwitch -AI_ShouldSwitch: @ 8036904 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x4 - ldr r6, _080369E0 @ =gBattleMons - ldr r4, _080369E4 @ =gActiveBank - ldrb r2, [r4] - movs r5, 0x58 - adds r0, r2, 0 - muls r0, r5 - adds r1, r6, 0 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - ldr r1, _080369E8 @ =0x0400e000 - ands r0, r1 - cmp r0, 0 - beq _0803692A - b _08036AFC -_0803692A: - ldr r0, _080369EC @ =gStatuses3 - lsls r1, r2, 2 - adds r1, r0 - ldr r1, [r1] - movs r0, 0x80 - lsls r0, 3 - ands r1, r0 - cmp r1, 0 - beq _0803693E - b _08036AFC -_0803693E: - str r1, [sp] - movs r0, 0xC - adds r1, r2, 0 - movs r2, 0x17 - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _08036956 - b _08036AFC -_08036956: - ldrb r1, [r4] - str r0, [sp] - movs r0, 0xC - movs r2, 0x47 - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _0803696E - b _08036AFC -_0803696E: - str r0, [sp] - movs r0, 0xE - movs r1, 0 - movs r2, 0x2A - movs r3, 0 - bl AbilityBattleEffects - lsls r0, 24 - cmp r0, 0 - beq _080369A0 - ldrb r0, [r4] - muls r0, r5 - adds r1, r0, r6 - adds r0, r1, 0 - adds r0, 0x21 - ldrb r0, [r0] - cmp r0, 0x8 - bne _08036994 - b _08036AFC -_08036994: - adds r0, r1, 0 - adds r0, 0x22 - ldrb r0, [r0] - cmp r0, 0x8 - bne _080369A0 - b _08036AFC -_080369A0: - movs r0, 0 - mov r8, r0 - ldr r0, _080369F0 @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08036A12 - ldr r4, _080369E4 @ =gActiveBank - ldrb r7, [r4] - adds r0, r7, 0 - bl GetBankIdentity - movs r5, 0x2 - eors r0, r5 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - ldr r1, _080369F4 @ =gAbsentBankFlags - ldrb r1, [r1] - ldr r2, _080369F8 @ =gBitTable - lsls r0, 24 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _080369FC - ldrb r6, [r4] - b _08036A18 - .align 2, 0 -_080369E0: .4byte gBattleMons -_080369E4: .4byte gActiveBank -_080369E8: .4byte 0x0400e000 -_080369EC: .4byte gStatuses3 -_080369F0: .4byte gBattleTypeFlags -_080369F4: .4byte gAbsentBankFlags -_080369F8: .4byte gBitTable -_080369FC: - ldrb r0, [r4] - bl GetBankIdentity - eors r0, r5 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - lsls r0, 24 - lsrs r6, r0, 24 - b _08036A18 -_08036A12: - ldr r0, _08036AE8 @ =gActiveBank - ldrb r6, [r0] - adds r7, r6, 0 -_08036A18: - movs r5, 0 -_08036A1A: - movs r0, 0x64 - adds r1, r5, 0 - muls r1, r0 - ldr r0, _08036AEC @ =gEnemyParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _08036A7E - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - beq _08036A7E - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _08036A7E - ldr r1, _08036AF0 @ =gBattlePartyID - lsls r0, r7, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r5, r0 - beq _08036A7E - lsls r0, r6, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r5, r0 - beq _08036A7E - ldr r1, _08036AF4 @ =gSharedMem - ldr r2, _08036AF8 @ =0x00016068 - adds r0, r7, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r5, r0 - beq _08036A7E - adds r0, r6, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r5, r0 - beq _08036A7E - movs r0, 0x1 - add r8, r0 -_08036A7E: - adds r5, 0x1 - cmp r5, 0x5 - ble _08036A1A - mov r2, r8 - cmp r2, 0 - beq _08036AFC - bl AI_SwitchIfPerishSong - lsls r0, 24 - cmp r0, 0 - bne _08036AE4 - bl AI_SwitchIfWonderguard - lsls r0, 24 - cmp r0, 0 - bne _08036AE4 - bl sub_80361E8 - lsls r0, 24 - cmp r0, 0 - bne _08036AE4 - bl AI_SwitchIfNaturalCure - lsls r0, 24 - cmp r0, 0 - bne _08036AE4 - movs r0, 0 - bl ai_has_super_effective_move_on_field - lsls r0, 24 - cmp r0, 0 - bne _08036AFC - bl AI_AreStatsRaised - lsls r0, 24 - cmp r0, 0 - bne _08036AFC - movs r0, 0x8 - movs r1, 0x2 - bl sub_80366A4 - lsls r0, 24 - cmp r0, 0 - bne _08036AE4 - movs r0, 0x4 - movs r1, 0x3 - bl sub_80366A4 - lsls r0, 24 - cmp r0, 0 - beq _08036AFC -_08036AE4: - movs r0, 0x1 - b _08036AFE - .align 2, 0 -_08036AE8: .4byte gActiveBank -_08036AEC: .4byte gEnemyParty -_08036AF0: .4byte gBattlePartyID -_08036AF4: .4byte gSharedMem -_08036AF8: .4byte 0x00016068 -_08036AFC: - movs r0, 0 -_08036AFE: - add sp, 0x4 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end AI_ShouldSwitch - -.if DEBUG - thumb_func_start sub_8036B0C -sub_8036B0C: -.syntax divided - push {r4, r5, r6, lr} - ldr r5, ._205 @ gBattleTypeFlags - ldrh r1, [r5] - mov r0, #0x8 - and r0, r0, r1 - cmp r0, #0 - bne ._197 @cond_branch - b ._216 -._197: - bl AI_ShouldSwitch - lsl r0, r0, #0x18 - cmp r0, #0 - bne ._199 @cond_branch - b ._200 -._199: - ldr r4, ._205 + 4 @ 0x2000000 - ldr r0, ._205 + 8 @ gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - lsl r0, r0, #0x18 - lsr r0, r0, #0x19 - ldr r1, ._205 + 12 @ 0x160c8 - add r0, r0, r1 - add r0, r0, r4 - ldrb r0, [r0] - cmp r0, #0x6 - bne ._201 @cond_branch - bl sub_8036CD4 - lsl r0, r0, #0x18 - lsr r4, r0, #0x18 - cmp r4, #0x6 - bne ._211 @cond_branch - ldrh r1, [r5] - mov r0, #0x1 - and r0, r0, r1 - cmp r0, #0 - bne ._203 @cond_branch - mov r0, #0x1 - bl GetBankByIdentity - lsl r0, r0, #0x18 - lsr r5, r0, #0x18 - add r6, r5, #0 - b ._204 -._206: - .align 2, 0 -._205: - .word gBattleTypeFlags - .word 0x2000000 - .word gActiveBank - .word 0x160c8 -._203: - mov r0, #0x1 - bl GetBankByIdentity - lsl r0, r0, #0x18 - lsr r6, r0, #0x18 - mov r0, #0x3 - bl GetBankByIdentity - lsl r0, r0, #0x18 - lsr r5, r0, #0x18 -._204: - mov r4, #0x0 -._212: - mov r0, #0x64 - mul r0, r0, r4 - ldr r1, ._214 @ gEnemyParty - add r0, r0, r1 - mov r1, #0x39 - bl GetMonData - cmp r0, #0 - beq ._210 @cond_branch - ldr r1, ._214 + 4 @ gBattlePartyID - lsl r0, r6, #0x1 - add r0, r0, r1 - ldrh r0, [r0] - cmp r4, r0 - beq ._210 @cond_branch - lsl r0, r5, #0x1 - add r0, r0, r1 - ldrh r0, [r0] - cmp r4, r0 - beq ._210 @cond_branch - ldr r1, ._214 + 8 @ 0x2000000 - ldr r2, ._214 + 12 @ 0x16068 - add r0, r6, r2 - add r0, r0, r1 - ldrb r0, [r0] - cmp r4, r0 - beq ._210 @cond_branch - add r0, r5, r2 - add r0, r0, r1 - ldrb r0, [r0] - cmp r4, r0 - bne ._211 @cond_branch -._210: - add r4, r4, #0x1 - cmp r4, #0x5 - ble ._212 @cond_branch -._211: - ldr r0, ._214 + 16 @ gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - ldr r1, ._214 + 8 @ 0x2000000 - lsl r0, r0, #0x18 - lsr r0, r0, #0x19 - ldr r3, ._214 + 20 @ 0x160c8 - add r0, r0, r3 - add r0, r0, r1 - strb r4, [r0] -._201: - ldr r4, ._214 + 16 @ gActiveBank - ldrb r0, [r4] - bl GetBankIdentity - ldr r2, ._214 + 8 @ 0x2000000 - ldrb r1, [r4] - ldr r3, ._214 + 12 @ 0x16068 - add r1, r1, r3 - add r1, r1, r2 - lsl r0, r0, #0x18 - lsr r0, r0, #0x19 - add r3, r3, #0x60 - add r0, r0, r3 - add r0, r0, r2 - ldrb r0, [r0] - strb r0, [r1] - b ._217 -._215: - .align 2, 0 -._214: - .word gEnemyParty - .word gBattlePartyID - .word 0x2000000 - .word 0x16068 - .word gActiveBank - .word 0x160c8 -._200: - ldr r0, ._218 @ gUnknown_02023A14 - ldrb r1, [r0] - mov r0, #0x20 - and r0, r0, r1 - cmp r0, #0 - bne ._216 @cond_branch - bl AI_ShouldUseItem - lsl r0, r0, #0x18 - cmp r0, #0 - bne ._217 @cond_branch -._216: - ldr r0, ._218 + 4 @ gActiveBank - ldrb r0, [r0] - mov r2, #0x1 - eor r2, r2, r0 - lsl r2, r2, #0x8 - mov r0, #0x1 - mov r1, #0x0 - bl Emitcmd33 -._217: - pop {r4, r5, r6} - pop {r0} - bx r0 -._219: - .align 2, 0 -._218: - .word gUnknown_02023A14+0x50 - .word gActiveBank -.syntax unified - thumb_func_end sub_8036B0C -.else - thumb_func_start sub_8036B0C -sub_8036B0C: @ 8036B0C - push {r4-r6,lr} - ldr r5, _08036B68 @ =gBattleTypeFlags - ldrh r1, [r5] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _08036B1C - b _08036C2E -_08036B1C: - bl AI_ShouldSwitch - lsls r0, 24 - cmp r0, 0 - bne _08036B28 - b _08036C24 -_08036B28: - ldr r4, _08036B6C @ =gSharedMem - ldr r0, _08036B70 @ =gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - lsls r0, 24 - lsrs r0, 25 - ldr r1, _08036B74 @ =0x000160c8 - adds r0, r1 - adds r0, r4 - ldrb r0, [r0] - cmp r0, 0x6 - bne _08036BEA - bl sub_8036CD4 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0x6 - bne _08036BD4 - ldrh r1, [r5] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _08036B78 - movs r0, 0x1 - bl GetBankByIdentity - lsls r0, 24 - lsrs r5, r0, 24 - adds r6, r5, 0 - b _08036B8C - .align 2, 0 -_08036B68: .4byte gBattleTypeFlags -_08036B6C: .4byte gSharedMem -_08036B70: .4byte gActiveBank -_08036B74: .4byte 0x000160c8 -_08036B78: - movs r0, 0x1 - bl GetBankByIdentity - lsls r0, 24 - lsrs r6, r0, 24 - movs r0, 0x3 - bl GetBankByIdentity - lsls r0, 24 - lsrs r5, r0, 24 -_08036B8C: - movs r4, 0 -_08036B8E: - movs r0, 0x64 - muls r0, r4 - ldr r1, _08036C0C @ =gEnemyParty - adds r0, r1 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _08036BCE - ldr r1, _08036C10 @ =gBattlePartyID - lsls r0, r6, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r4, r0 - beq _08036BCE - lsls r0, r5, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r4, r0 - beq _08036BCE - ldr r1, _08036C14 @ =gSharedMem - ldr r2, _08036C18 @ =0x00016068 - adds r0, r6, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r4, r0 - beq _08036BCE - adds r0, r5, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r4, r0 - bne _08036BD4 -_08036BCE: - adds r4, 0x1 - cmp r4, 0x5 - ble _08036B8E -_08036BD4: - ldr r0, _08036C1C @ =gActiveBank - ldrb r0, [r0] - bl GetBankIdentity - ldr r1, _08036C14 @ =gSharedMem - lsls r0, 24 - lsrs r0, 25 - ldr r3, _08036C20 @ =0x000160c8 - adds r0, r3 - adds r0, r1 - strb r4, [r0] -_08036BEA: - ldr r4, _08036C1C @ =gActiveBank - ldrb r0, [r4] - bl GetBankIdentity - ldr r2, _08036C14 @ =gSharedMem - ldrb r1, [r4] - ldr r3, _08036C18 @ =0x00016068 - adds r1, r3 - adds r1, r2 - lsls r0, 24 - lsrs r0, 25 - adds r3, 0x60 - adds r0, r3 - adds r0, r2 - ldrb r0, [r0] - strb r0, [r1] - b _08036C40 - .align 2, 0 -_08036C0C: .4byte gEnemyParty -_08036C10: .4byte gBattlePartyID -_08036C14: .4byte gSharedMem -_08036C18: .4byte 0x00016068 -_08036C1C: .4byte gActiveBank -_08036C20: .4byte 0x000160c8 -_08036C24: - bl AI_ShouldUseItem - lsls r0, 24 - cmp r0, 0 - bne _08036C40 -_08036C2E: - ldr r0, _08036C48 @ =gActiveBank - ldrb r0, [r0] - movs r2, 0x1 - eors r2, r0 - lsls r2, 8 - movs r0, 0x1 - movs r1, 0 - bl Emitcmd33 -_08036C40: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08036C48: .4byte gActiveBank - thumb_func_end sub_8036B0C -.endif - - thumb_func_start sub_8036C4C -sub_8036C4C: @ 8036C4C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - adds r6, r3, 0 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - movs r7, 0 - ldr r0, _08036CD0 @ =gTypeEffectiveness - mov r10, r0 - ldrb r0, [r0] - cmp r0, 0xFF - beq _08036CBE - mov r5, r10 -_08036C7A: - ldrb r0, [r5] - cmp r0, 0xFE - beq _08036CB0 - ldr r1, [sp] - cmp r0, r1 - bne _08036CB0 - ldrb r4, [r5, 0x1] - cmp r4, r9 - bne _08036C9A - ldrb r1, [r6] - ldrb r0, [r5, 0x2] - muls r0, r1 - movs r1, 0xA - bl __divsi3 - strb r0, [r6] -_08036C9A: - cmp r4, r8 - bne _08036CB0 - cmp r9, r8 - beq _08036CB0 - ldrb r1, [r6] - ldrb r0, [r5, 0x2] - muls r0, r1 - movs r1, 0xA - bl __divsi3 - strb r0, [r6] -_08036CB0: - adds r5, 0x3 - adds r7, 0x3 - mov r1, r10 - adds r0, r7, r1 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08036C7A -_08036CBE: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08036CD0: .4byte gTypeEffectiveness - thumb_func_end sub_8036C4C - - thumb_func_start sub_8036CD4 -sub_8036CD4: @ 8036CD4 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - ldr r0, _08036D1C @ =gBattleTypeFlags - ldrh r1, [r0] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08036D78 - ldr r4, _08036D20 @ =gActiveBank - ldrb r0, [r4] - str r0, [sp, 0xC] - bl GetBankIdentity - movs r5, 0x2 - eors r0, r5 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - ldr r1, _08036D24 @ =gAbsentBankFlags - ldrb r1, [r1] - ldr r2, _08036D28 @ =gBitTable - lsls r0, 24 - lsrs r0, 22 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08036D2C - ldrb r4, [r4] - str r4, [sp, 0x10] - b _08036D42 - .align 2, 0 -_08036D1C: .4byte gBattleTypeFlags -_08036D20: .4byte gActiveBank -_08036D24: .4byte gAbsentBankFlags -_08036D28: .4byte gBitTable -_08036D2C: - ldrb r0, [r4] - bl GetBankIdentity - eors r0, r5 - lsls r0, 24 - lsrs r0, 24 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x10] -_08036D42: - bl Random - movs r3, 0x2 - ands r0, r3 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, _08036D70 @ =gAbsentBankFlags - ldrb r1, [r0] - ldr r2, _08036D74 @ =gBitTable - mov r4, r10 - lsls r0, r4, 2 - adds r0, r2 - ldr r0, [r0] - ands r1, r0 - cmp r1, 0 - beq _08036D8C - eors r4, r3 - lsls r0, r4, 24 - lsrs r0, 24 - mov r10, r0 - b _08036D8C - .align 2, 0 -_08036D70: .4byte gAbsentBankFlags -_08036D74: .4byte gBitTable -_08036D78: - movs r0, 0 - bl GetBankByIdentity - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - ldr r0, _08036E5C @ =gActiveBank - ldrb r0, [r0] - str r0, [sp, 0x10] - str r0, [sp, 0xC] -_08036D8C: - movs r0, 0 - mov r9, r0 - mov r1, sp - str r1, [sp, 0x14] -_08036D94: - movs r2, 0 - str r2, [sp, 0x4] - movs r3, 0x6 - str r3, [sp, 0x8] - movs r7, 0 - ldr r4, _08036E60 @ =gBitTable - mov r8, r4 -_08036DA2: - movs r0, 0x64 - adds r1, r7, 0 - muls r1, r0 - ldr r0, _08036E64 @ =gEnemyParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - lsrs r5, r0, 16 - cmp r5, 0 - beq _08036E7C - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _08036E7C - mov r1, r8 - ldr r0, [r1] - mov r2, r9 - ands r0, r2 - cmp r0, 0 - bne _08036E7C - ldr r1, _08036E68 @ =gBattlePartyID - ldr r3, [sp, 0xC] - lsls r0, r3, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r7 - beq _08036E7C - ldr r4, [sp, 0x10] - lsls r0, r4, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r7 - beq _08036E7C - ldr r1, _08036E6C @ =gSharedMem - ldr r2, _08036E70 @ =0x00016068 - adds r0, r3, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r7, r0 - beq _08036E7C - adds r0, r4, r2 - adds r0, r1 - ldrb r0, [r0] - cmp r7, r0 - beq _08036E7C - ldr r1, _08036E74 @ =gBaseStats - lsls r0, r5, 3 - subs r0, r5 - lsls r0, 2 - adds r0, r1 - ldrb r5, [r0, 0x6] - ldrb r6, [r0, 0x7] - movs r0, 0xA - ldr r3, [sp, 0x14] - strb r0, [r3] - movs r0, 0x58 - mov r4, r10 - muls r4, r0 - ldr r0, _08036E78 @ =gBattleMons - adds r4, r0 - adds r0, r4, 0 - adds r0, 0x21 - ldrb r0, [r0] - adds r1, r5, 0 - adds r2, r6, 0 - mov r3, sp - bl sub_8036C4C - adds r4, 0x22 - ldrb r0, [r4] - adds r1, r5, 0 - adds r2, r6, 0 - mov r3, sp - bl sub_8036C4C - ldr r2, [sp, 0x4] - ldr r1, [sp, 0x14] - ldrb r1, [r1] - cmp r2, r1 - bcs _08036E8A - ldr r2, [sp, 0x14] - ldrb r2, [r2] - str r2, [sp, 0x4] - lsls r0, r7, 24 - lsrs r0, 24 - str r0, [sp, 0x8] - b _08036E8A - .align 2, 0 -_08036E5C: .4byte gActiveBank -_08036E60: .4byte gBitTable -_08036E64: .4byte gEnemyParty -_08036E68: .4byte gBattlePartyID -_08036E6C: .4byte gSharedMem -_08036E70: .4byte 0x00016068 -_08036E74: .4byte gBaseStats -_08036E78: .4byte gBattleMons -_08036E7C: - mov r3, r8 - ldr r0, [r3] - mov r4, r9 - orrs r4, r0 - lsls r0, r4, 24 - lsrs r0, 24 - mov r9, r0 -_08036E8A: - movs r0, 0x4 - add r8, r0 - adds r7, 0x1 - cmp r7, 0x5 - ble _08036DA2 - ldr r1, [sp, 0x8] - cmp r1, 0x6 - beq _08036EF8 - movs r7, 0 - movs r0, 0x64 - adds r5, r1, 0 - muls r5, r0 - ldr r6, _08036EEC @ =gEnemyParty -_08036EA4: - adds r1, r7, 0 - adds r1, 0xD - adds r0, r5, r6 - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - cmp r4, 0 - beq _08036ECA - ldr r0, _08036EF0 @ =gActiveBank - ldrb r1, [r0] - adds r0, r4, 0 - mov r2, r10 - bl TypeCalc - movs r1, 0x2 - ands r1, r0 - cmp r1, 0 - bne _08036ED0 -_08036ECA: - adds r7, 0x1 - cmp r7, 0x3 - ble _08036EA4 -_08036ED0: - cmp r7, 0x4 - beq _08036ED6 - b _08036FEE -_08036ED6: - ldr r2, [sp, 0x8] - lsls r0, r2, 2 - ldr r3, _08036EF4 @ =gBitTable - adds r0, r3 - ldr r0, [r0] - mov r4, r9 - orrs r4, r0 - lsls r0, r4, 24 - lsrs r0, 24 - b _08036EFA - .align 2, 0 -_08036EEC: .4byte gEnemyParty -_08036EF0: .4byte gActiveBank -_08036EF4: .4byte gBitTable -_08036EF8: - movs r0, 0x3F -_08036EFA: - mov r9, r0 - mov r1, r9 - cmp r1, 0x3F - beq _08036F04 - b _08036D94 -_08036F04: - ldr r0, _08037000 @ =gDynamicBasePower - movs r2, 0 - strh r2, [r0] - ldr r0, _08037004 @ =gSharedMem - ldr r3, _08037008 @ =0x0001601c - adds r1, r0, r3 - strb r2, [r1] - ldr r4, _0803700C @ =0x0001601f - adds r0, r4 - movs r1, 0x1 - strb r1, [r0] - ldr r0, _08037010 @ =gBattleMoveFlags - strb r2, [r0] - ldr r0, _08037014 @ =gCritMultiplier - strb r1, [r0] - movs r0, 0 - str r0, [sp, 0x4] - movs r1, 0x6 - str r1, [sp, 0x8] - movs r7, 0 -_08036F2C: - movs r0, 0x64 - adds r6, r7, 0 - muls r6, r0 - ldr r2, _08037018 @ =gEnemyParty - adds r4, r6, r2 - adds r0, r4, 0 - movs r1, 0xB - bl GetMonData - lsls r0, 16 - adds r3, r7, 0x1 - str r3, [sp, 0x18] - cmp r0, 0 - beq _08036FE8 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _08036FE8 - ldr r1, _0803701C @ =gBattlePartyID - ldr r4, [sp, 0xC] - lsls r0, r4, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r7 - beq _08036FE8 - ldr r2, [sp, 0x10] - lsls r0, r2, 1 - adds r0, r1 - ldrh r0, [r0] - cmp r0, r7 - beq _08036FE8 - ldr r1, _08037004 @ =gSharedMem - ldr r3, _08037020 @ =0x00016068 - adds r0, r4, r3 - adds r0, r1 - ldrb r0, [r0] - cmp r7, r0 - beq _08036FE8 - adds r0, r2, r3 - adds r0, r1 - ldrb r0, [r0] - cmp r7, r0 - beq _08036FE8 - movs r5, 0 - mov r9, r6 - ldr r4, _08037024 @ =gBattleMoveDamage - mov r8, r4 - ldr r6, _08037028 @ =gActiveBank -_08036F90: - adds r1, r5, 0 - adds r1, 0xD - ldr r0, _08037018 @ =gEnemyParty - add r0, r9 - bl GetMonData - lsls r0, 16 - lsrs r4, r0, 16 - movs r0, 0 - mov r1, r8 - str r0, [r1] - cmp r4, 0 - beq _08036FCC - ldr r0, _0803702C @ =gBattleMoves - lsls r1, r4, 1 - adds r1, r4 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x1] - cmp r0, 0x1 - beq _08036FCC - ldrb r0, [r6] - mov r1, r10 - bl AI_CalcDmg - ldrb r1, [r6] - adds r0, r4, 0 - mov r2, r10 - bl TypeCalc -_08036FCC: - mov r2, r8 - ldr r0, [r2] - ldr r3, [sp, 0x4] - cmp r3, r0 - bge _08036FE2 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x4] - lsls r0, r7, 24 - lsrs r0, 24 - str r0, [sp, 0x8] -_08036FE2: - adds r5, 0x1 - cmp r5, 0x3 - ble _08036F90 -_08036FE8: - ldr r7, [sp, 0x18] - cmp r7, 0x5 - ble _08036F2C -_08036FEE: - ldr r0, [sp, 0x8] - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08037000: .4byte gDynamicBasePower -_08037004: .4byte gSharedMem -_08037008: .4byte 0x0001601c -_0803700C: .4byte 0x0001601f -_08037010: .4byte gBattleMoveFlags -_08037014: .4byte gCritMultiplier -_08037018: .4byte gEnemyParty -_0803701C: .4byte gBattlePartyID -_08037020: .4byte 0x00016068 -_08037024: .4byte gBattleMoveDamage -_08037028: .4byte gActiveBank -_0803702C: .4byte gBattleMoves - thumb_func_end sub_8036CD4 - - thumb_func_start ai_identify_item_effect -ai_identify_item_effect: @ 8037030 - push {r4,lr} - adds r2, r1, 0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x13 - bne _08037040 - movs r0, 0x1 - b _08037086 -_08037040: - ldrb r1, [r2, 0x4] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _0803704E - movs r0, 0x2 - b _08037086 -_0803704E: - ldrb r4, [r2, 0x3] - movs r3, 0x3F - adds r0, r3, 0 - ands r0, r4 - cmp r0, 0 - beq _0803705E - movs r0, 0x3 - b _08037086 -_0803705E: - ldrb r1, [r2] - adds r0, r3, 0 - ands r0, r1 - cmp r0, 0 - bne _08037074 - ldrb r0, [r2, 0x1] - cmp r0, 0 - bne _08037074 - ldrb r0, [r2, 0x2] - cmp r0, 0 - beq _08037078 -_08037074: - movs r0, 0x4 - b _08037086 -_08037078: - movs r0, 0x80 - ands r0, r4 - cmp r0, 0 - bne _08037084 - movs r0, 0x6 - b _08037086 -_08037084: - movs r0, 0x5 -_08037086: - pop {r4} - pop {r1} - bx r1 - thumb_func_end ai_identify_item_effect - - thumb_func_start AI_ShouldUseItem -AI_ShouldUseItem: @ 803708C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - movs r0, 0 - str r0, [sp] - mov r8, r0 - mov r9, r0 -_080370A0: - movs r0, 0x64 - mov r1, r9 - muls r1, r0 - ldr r0, _08037170 @ =gEnemyParty - adds r4, r1, r0 - adds r0, r4, 0 - movs r1, 0x39 - bl GetMonData - cmp r0, 0 - beq _080370DC - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - cmp r0, 0 - beq _080370DC - adds r0, r4, 0 - movs r1, 0x41 - bl GetMonData - movs r1, 0xCE - lsls r1, 1 - cmp r0, r1 - beq _080370DC - ldr r0, [sp] - adds r0, 0x1 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] -_080370DC: - movs r1, 0x1 - add r9, r1 - mov r2, r9 - cmp r2, 0x5 - ble _080370A0 - movs r3, 0 - mov r9, r3 -_080370EA: - ldr r4, _08037174 @ =gSharedMem + 0x16A00 - mov r0, r9 - cmp r0, 0 - beq _08037106 - adds r0, r4, 0 - adds r0, 0x2C - ldrb r0, [r0] - mov r1, r9 - subs r0, r1 - adds r0, 0x1 - ldr r2, [sp] - cmp r2, r0 - ble _08037106 - b _080374EC -_08037106: - mov r3, r9 - lsls r1, r3, 1 - adds r0, r4, 0 - adds r0, 0x24 - adds r0, r1, r0 - ldrh r0, [r0] - mov r10, r0 - str r1, [sp, 0x4] - cmp r0, 0 - bne _0803711C - b _080374EC -_0803711C: - ldr r1, _08037178 @ =gItemEffectTable - subs r0, 0xD - lsls r0, 2 - adds r0, r1 - ldr r1, [r0] - cmp r1, 0 - bne _0803712C - b _080374EC -_0803712C: - adds r5, r1, 0 - mov r0, r10 - cmp r0, 0xAF - bne _08037136 - ldr r5, _0803717C @ =gSaveBlock1 + 0x3676 -_08037136: - mov r1, r10 - lsls r0, r1, 24 - lsrs r0, 24 - adds r1, r5, 0 - bl ai_identify_item_effect - ldr r2, _08037180 @ =0xfffe9600 - adds r4, r2 - ldr r3, _08037184 @ =gActiveBank - ldrb r1, [r3] - lsrs r1, 1 - ldr r2, _08037188 @ =0x000160d8 - adds r1, r2 - adds r1, r4 - strb r0, [r1] - ldrb r0, [r3] - lsrs r0, 1 - adds r0, r2 - adds r0, r4 - ldrb r0, [r0] - subs r0, 0x1 - cmp r0, 0x5 - bls _08037166 - b _080374A8 -_08037166: - lsls r0, 2 - ldr r1, _0803718C @ =_08037190 - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_08037170: .4byte gEnemyParty -_08037174: .4byte gSharedMem + 0x16A00 -_08037178: .4byte gItemEffectTable -_0803717C: .4byte gSaveBlock1 + 0x3676 -_08037180: .4byte 0xfffe9600 -_08037184: .4byte gActiveBank -_08037188: .4byte 0x000160d8 -_0803718C: .4byte _08037190 - .align 2, 0 -_08037190: - .4byte _080371A8 - .4byte _080371D0 - .4byte _0803721C - .4byte _08037388 - .4byte _08037468 - .4byte _080374F8 -_080371A8: - ldr r2, _080371C8 @ =gBattleMons - ldr r0, _080371CC @ =gActiveBank - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r0, r2 - ldrh r1, [r0, 0x2C] - ldrh r0, [r0, 0x28] - lsrs r1, 2 - cmp r0, r1 - bcc _080371C0 - b _080374A8 -_080371C0: - cmp r0, 0 - bne _080371C6 - b _080374A8 -_080371C6: - b _08037450 - .align 2, 0 -_080371C8: .4byte gBattleMons -_080371CC: .4byte gActiveBank -_080371D0: - mov r0, r10 - movs r1, 0x4 - movs r2, 0x4 - bl GetItemEffectParamOffset - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, 0 - bne _080371E4 - b _080374A8 -_080371E4: - ldr r2, _08037214 @ =gBattleMons - ldr r0, _08037218 @ =gActiveBank - ldrb r1, [r0] - movs r0, 0x58 - muls r0, r1 - adds r1, r0, r2 - ldrh r2, [r1, 0x28] - cmp r2, 0 - bne _080371F8 - b _080374A8 -_080371F8: - ldrh r3, [r1, 0x2C] - lsrs r0, r3, 2 - cmp r2, r0 - bcs _08037202 - b _08037496 -_08037202: - adds r0, r2, 0 - subs r0, r3, r0 - adds r1, r5, r4 - ldrb r1, [r1] - cmp r0, r1 - bgt _08037210 - b _080374A8 -_08037210: - b _08037496 - .align 2, 0 -_08037214: .4byte gBattleMons -_08037218: .4byte gActiveBank -_0803721C: - ldr r2, _08037378 @ =gSharedMem - ldr r3, _0803737C @ =gActiveBank - ldrb r0, [r3] - lsrs r0, 1 - ldr r6, _08037380 @ =0x000160da - adds r0, r6 - adds r0, r2 - movs r1, 0 - mov r12, r1 - movs r1, 0 - strb r1, [r0] - ldrb r1, [r5, 0x3] - movs r7, 0x20 - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08037264 - ldr r1, _08037384 @ =gBattleMons - ldrb r4, [r3] - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - beq _08037264 - lsrs r1, r4, 1 - adds r1, r6 - adds r1, r2 - ldrb r0, [r1] - orrs r0, r7 - strb r0, [r1] - movs r0, 0x1 - mov r8, r0 -_08037264: - ldrb r1, [r5, 0x3] - movs r6, 0x10 - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080372A0 - ldr r1, _08037384 @ =gBattleMons - ldrb r4, [r3] - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r1, [r0] - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - bne _0803728E - movs r0, 0x80 - ands r1, r0 - cmp r1, 0 - beq _080372A0 -_0803728E: - lsrs r1, r4, 1 - ldr r0, _08037380 @ =0x000160da - adds r1, r0 - adds r1, r2 - ldrb r0, [r1] - orrs r0, r6 - strb r0, [r1] - movs r1, 0x1 - mov r8, r1 -_080372A0: - ldrb r1, [r5, 0x3] - movs r6, 0x8 - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _080372D4 - ldr r1, _08037384 @ =gBattleMons - ldrb r4, [r3] - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080372D4 - lsrs r0, r4, 1 - ldr r1, _08037380 @ =0x000160da - adds r0, r1 - adds r0, r2 - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - movs r0, 0x1 - mov r8, r0 -_080372D4: - ldrb r1, [r5, 0x3] - movs r6, 0x4 - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08037308 - ldr r1, _08037384 @ =gBattleMons - ldrb r4, [r3] - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x20 - ands r0, r1 - cmp r0, 0 - beq _08037308 - lsrs r0, r4, 1 - ldr r1, _08037380 @ =0x000160da - adds r0, r1 - adds r0, r2 - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - movs r0, 0x1 - mov r8, r0 -_08037308: - ldrb r1, [r5, 0x3] - movs r6, 0x2 - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0803733C - ldr r1, _08037384 @ =gBattleMons - ldrb r4, [r3] - movs r0, 0x58 - muls r0, r4 - adds r1, 0x4C - adds r0, r1 - ldr r0, [r0] - movs r1, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0803733C - lsrs r0, r4, 1 - ldr r1, _08037380 @ =0x000160da - adds r0, r1 - adds r0, r2 - ldrb r1, [r0] - orrs r1, r6 - strb r1, [r0] - movs r0, 0x1 - mov r8, r0 -_0803733C: - ldrb r1, [r5, 0x3] - movs r4, 0x1 - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - bne _0803734A - b _080374A8 -_0803734A: - ldr r1, _08037384 @ =gBattleMons - ldrb r3, [r3] - movs r0, 0x58 - muls r0, r3 - adds r1, 0x50 - adds r0, r1 - ldr r0, [r0] - movs r1, 0x7 - ands r0, r1 - cmp r0, 0 - bne _08037362 - b _080374A8 -_08037362: - lsrs r0, r3, 1 - ldr r1, _08037380 @ =0x000160da - adds r0, r1 - adds r0, r2 - ldrb r1, [r0] - orrs r1, r4 - strb r1, [r0] - movs r2, 0x1 - mov r8, r2 - b _080374AE - .align 2, 0 -_08037378: .4byte gSharedMem -_0803737C: .4byte gActiveBank -_08037380: .4byte 0x000160da -_08037384: .4byte gBattleMons -_08037388: - ldr r6, _08037458 @ =gSharedMem - ldr r4, _0803745C @ =gActiveBank - ldrb r0, [r4] - lsrs r0, 1 - ldr r3, _08037460 @ =0x000160da - adds r0, r3 - adds r0, r6 - movs r1, 0 - mov r12, r1 - movs r1, 0 - strb r1, [r0] - ldr r1, _08037464 @ =gDisableStructs - ldrb r2, [r4] - lsls r0, r2, 3 - subs r0, r2 - lsls r0, 2 - adds r0, r1 - ldrb r0, [r0, 0x16] - cmp r0, 0 - beq _080374A8 - ldrb r1, [r5] - movs r7, 0xF - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _080373CA - lsrs r0, r2, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x1 - orrs r1, r2 - strb r1, [r0] -_080373CA: - ldrb r1, [r5, 0x1] - movs r2, 0xF0 - mov r8, r2 - mov r0, r8 - ands r0, r1 - cmp r0, 0 - beq _080373E8 - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x2 - orrs r1, r2 - strb r1, [r0] -_080373E8: - ldrb r1, [r5, 0x1] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _08037402 - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x4 - orrs r1, r2 - strb r1, [r0] -_08037402: - ldrb r1, [r5, 0x2] - adds r0, r7, 0 - ands r0, r1 - cmp r0, 0 - beq _0803741C - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x8 - orrs r1, r2 - strb r1, [r0] -_0803741C: - ldrb r1, [r5, 0x2] - mov r0, r8 - ands r0, r1 - cmp r0, 0 - beq _08037436 - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x20 - orrs r1, r2 - strb r1, [r0] -_08037436: - ldrb r1, [r5] - movs r0, 0x30 - ands r0, r1 - cmp r0, 0 - beq _08037450 - ldrb r0, [r4] - lsrs r0, 1 - adds r0, r3 - adds r0, r6 - ldrb r1, [r0] - movs r2, 0x80 - orrs r1, r2 - strb r1, [r0] -_08037450: - movs r3, 0x1 - mov r8, r3 - b _080374AE - .align 2, 0 -_08037458: .4byte gSharedMem -_0803745C: .4byte gActiveBank -_08037460: .4byte 0x000160da -_08037464: .4byte gDisableStructs -_08037468: - ldr r4, _0803749C @ =gActiveBank - ldrb r0, [r4] - bl GetBankSide - lsls r0, 24 - lsrs r3, r0, 24 - ldr r2, _080374A0 @ =gDisableStructs - ldrb r1, [r4] - lsls r0, r1, 3 - subs r0, r1 - lsls r0, 2 - adds r0, r2 - ldrb r0, [r0, 0x16] - cmp r0, 0 - beq _080374A8 - ldr r0, _080374A4 @ =gSideTimers - lsls r1, r3, 1 - adds r1, r3 - lsls r1, 2 - adds r1, r0 - ldrb r0, [r1, 0x2] - cmp r0, 0 - bne _080374A8 -_08037496: - movs r0, 0x1 - mov r8, r0 - b _080374AE - .align 2, 0 -_0803749C: .4byte gActiveBank -_080374A0: .4byte gDisableStructs -_080374A4: .4byte gSideTimers -_080374A8: - mov r1, r8 - cmp r1, 0 - beq _080374EC -_080374AE: - movs r0, 0x1 - movs r1, 0x1 - movs r2, 0 - bl Emitcmd33 - ldr r1, _080374DC @ =gSharedMem - ldr r0, _080374E0 @ =gActiveBank - ldrb r0, [r0] - lsrs r0, 1 - lsls r0, 1 - ldr r2, _080374E4 @ =0x000160d4 - adds r0, r2 - adds r0, r1 - movs r2, 0 - mov r3, r10 - strb r3, [r0] - ldr r0, _080374E8 @ =0x00016a24 - adds r1, r0 - ldr r3, [sp, 0x4] - adds r1, r3, r1 - strh r2, [r1] - mov r0, r8 - b _080374FA - .align 2, 0 -_080374DC: .4byte gSharedMem -_080374E0: .4byte gActiveBank -_080374E4: .4byte 0x000160d4 -_080374E8: .4byte 0x00016a24 -_080374EC: - movs r0, 0x1 - add r9, r0 - mov r1, r9 - cmp r1, 0x3 - bgt _080374F8 - b _080370EA -_080374F8: - movs r0, 0 -_080374FA: - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end AI_ShouldUseItem - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/battle_anim_812C144.s b/asm/battle_anim_812C144.s index d748a78f1..e49873ee6 100644 --- a/asm/battle_anim_812C144.s +++ b/asm/battle_anim_812C144.s @@ -92,7 +92,7 @@ sub_812C1D0: @ 812C1D0 ldr r6, _0812C21C @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 lsls r4, 24 lsrs r4, 8 @@ -102,7 +102,7 @@ sub_812C1D0: @ 812C1D0 asrs r4, 16 ldrb r0, [r6] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r1, r0, 0 lsls r1, 24 lsrs r1, 8 @@ -213,13 +213,13 @@ sub_812C2BC: @ 812C2BC ldr r4, _0812C348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r7, r0, 0 ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r6, r0, 0 @@ -806,7 +806,7 @@ sub_812C720: @ 812C720 bl SetAverageBattlerPositions ldr r0, _0812C788 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812C754 @@ -959,7 +959,7 @@ sub_812C848: @ 812C848 bne _0812C89C ldr r0, _0812C888 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _0812C88C @@ -1059,7 +1059,7 @@ sub_812C924: @ 812C924 lsrs r4, r0, 24 ldr r0, _0812C940 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1309,13 +1309,13 @@ sub_812CAFC: @ 812CAFC ldr r4, _0812CB74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1562,7 +1562,7 @@ _0812CD04: _0812CD06: ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x2] @@ -1570,7 +1570,7 @@ _0812CD06: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1688,7 +1688,7 @@ _0812CDF6: lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r7, r0, 24 adds r0, r6, 0 @@ -1977,13 +1977,13 @@ sub_812D008: @ 812D008 ldr r6, _0812D060 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xC] ldrb r0, [r6] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0xE] @@ -1993,7 +1993,7 @@ sub_812D008: @ 812D008 strh r0, [r4, 0x12] strh r5, [r4, 0x14] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] @@ -2366,13 +2366,13 @@ _0812D2F0: ldr r4, _0812D348 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -2409,7 +2409,7 @@ sub_812D350: @ 812D350 _0812D370: .4byte gTasks _0812D374: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2441,7 +2441,7 @@ sub_812D3AC: @ 812D3AC push {r4-r6,lr} adds r5, r0, 0 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x2E @@ -2463,13 +2463,13 @@ _0812D3D6: ldr r4, _0812D408 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2576,7 +2576,7 @@ sub_812D4B4: @ 812D4B4 adds r4, r0, 0 ldr r0, _0812D4CC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812D4D4 @@ -2610,7 +2610,7 @@ sub_812D4EC: @ 812D4EC strh r0, [r4, 0x2E] ldr r0, _0812D50C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812D510 @@ -2829,7 +2829,7 @@ sub_812D674: @ 812D674 cmp r0, 0 bne _0812D6B4 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2873,7 +2873,7 @@ sub_812D6CC: @ 812D6CC cmp r0, 0 bne _0812D70C movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -2922,7 +2922,7 @@ _0812D736: ldr r0, _0812D75C @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -2974,7 +2974,7 @@ sub_812D790: @ 812D790 cmp r0, 0 bne _0812D7D0 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -3045,7 +3045,7 @@ _0812D834: strh r0, [r1] ldr r0, _0812D854 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3136,7 +3136,7 @@ _0812D8F4: .4byte gAnimBankAttacker _0812D8F8: .4byte gAnimBankTarget _0812D8FC: ldrb r0, [r5] - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 lsrs r1, r0, 24 _0812D906: @@ -3330,7 +3330,7 @@ _0812DA84: strh r0, [r1] ldr r0, _0812DAA4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3355,7 +3355,7 @@ _0812DAAE: bne _0812DAF4 ldr r4, _0812DB0C @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -3573,7 +3573,7 @@ _0812DC98: .4byte gBattle_BG1_Y _0812DC9C: ldr r0, _0812DCB4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812DCC0 @@ -3858,14 +3858,14 @@ _0812DED6: ldr r4, _0812DFD0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, r5 strh r0, [r7, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -4293,7 +4293,7 @@ _0812E25C: .4byte gBattle_BG1_Y _0812E260: ldr r0, _0812E2A0 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 lsrs r4, r0, 24 bl IsDoubleBattle @@ -4378,7 +4378,7 @@ _0812E300: strh r0, [r5, 0xE] ldr r0, _0812E338 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4587,7 +4587,7 @@ sub_812E498: @ 812E498 cmp r0, 0 bne _0812E4D8 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -4644,7 +4644,7 @@ _0812E50E: strh r0, [r4, 0x32] ldr r0, _0812E53C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812E540 @@ -4739,7 +4739,7 @@ _0812E5AC: subs r0, 0x1 strh r0, [r4, 0x14] ldrb r0, [r5] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] @@ -4755,7 +4755,7 @@ _0812E5F8: ldr r0, _0812E630 @ =gAnimBankTarget _0812E5FA: ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -4972,7 +4972,7 @@ sub_812E7A0: @ 812E7A0 adds r4, r0, 0 ldr r0, _0812E7BC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0 @@ -5016,7 +5016,7 @@ sub_812E7F0: @ 812E7F0 strh r0, [r4, 0x2E] ldr r0, _0812E830 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _0812E834 @@ -5090,7 +5090,7 @@ sub_812E860: @ 812E860 strh r0, [r4, 0x24] ldr r0, _0812E8AC @ =gBattleAnimArgs ldrb r0, [r0] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] @@ -5332,13 +5332,13 @@ sub_812EA4C: @ 812EA4C ldr r4, _0812EAA8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -5453,7 +5453,7 @@ _0812EB4E: strh r0, [r2, 0x1E] mov r1, r8 ldrb r0, [r1] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r5, r0, 24 ldr r1, _0812EB8C @ =gTasks @@ -5517,7 +5517,7 @@ _0812EBC2: cmp r0, 0 bne _0812EBE8 ldrb r0, [r6, 0x1E] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsls r2, r5, 4 cmp r0, 0 @@ -5895,13 +5895,13 @@ sub_812EEA4: @ 812EEA4 ldr r5, _0812EEE0 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -6045,7 +6045,7 @@ sub_812EFC8: @ 812EFC8 lsrs r0, 24 str r0, [sp, 0x10] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId bl IsContest lsls r0, 24 cmp r0, 0 @@ -6065,13 +6065,13 @@ _0812F000: .4byte gSharedMem + 0x19348 _0812F004: ldr r0, _0812F070 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812F0AC movs r0, 0 str r0, [sp, 0x14] - ldr r6, _0812F074 @ =gBattlePartyID + ldr r6, _0812F074 @ =gBattlerPartyIndexes ldr r4, _0812F078 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 @@ -6101,7 +6101,7 @@ _0812F004: cmp r0, 0 bne _0812F0A4 adds r0, r2, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _0812F084 @@ -6114,7 +6114,7 @@ _0812F004: b _0812F092 .align 2, 0 _0812F070: .4byte gAnimBankAttacker -_0812F074: .4byte gBattlePartyID +_0812F074: .4byte gBattlerPartyIndexes _0812F078: .4byte gAnimBankTarget _0812F07C: .4byte gPlayerParty _0812F080: .4byte gSharedMem + 0x17800 @@ -6143,7 +6143,7 @@ _0812F0A6: _0812F0AC: movs r2, 0x1 str r2, [sp, 0x14] - ldr r6, _0812F10C @ =gBattlePartyID + ldr r6, _0812F10C @ =gBattlerPartyIndexes ldr r4, _0812F110 @ =gAnimBankTarget ldrb r0, [r4] lsls r0, 1 @@ -6173,7 +6173,7 @@ _0812F0AC: cmp r0, 0 bne _0812F138 adds r0, r2, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _0812F120 @@ -6186,7 +6186,7 @@ _0812F0AC: adds r0, r1 b _0812F12C .align 2, 0 -_0812F10C: .4byte gBattlePartyID +_0812F10C: .4byte gBattlerPartyIndexes _0812F110: .4byte gAnimBankTarget _0812F114: .4byte gEnemyParty _0812F118: .4byte gSharedMem + 0x17800 @@ -6219,13 +6219,13 @@ _0812F13E: ldr r5, _0812F21C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 mov r2, r10 lsls r1, r2, 16 @@ -6478,7 +6478,7 @@ _0812F342: movs r0, 0x18 strh r0, [r4, 0x18] adds r0, r5, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6503,12 +6503,12 @@ _0812F388: strh r0, [r4, 0x24] ldr r0, _0812F3C4 @ =gBattleAnimArgs ldrb r0, [r0] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] adds r0, r5, 0 - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6620,7 +6620,7 @@ sub_812F474: @ 812F474 ldr r1, _0812F4A8 @ =gTasks adds r6, r0, r1 ldrb r0, [r6, 0x12] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -6974,7 +6974,7 @@ sub_812F724: @ 812F724 strh r0, [r4, 0x8] ldr r0, _0812F760 @ =gBattleAnimArgs ldrb r0, [r0] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -7251,7 +7251,7 @@ sub_812F948: @ 812F948 bl StartSpriteAffineAnim ldr r0, _0812F9A4 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812F96E @@ -7262,7 +7262,7 @@ _0812F96E: ldr r4, _0812F9A8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x2] @@ -7270,7 +7270,7 @@ _0812F96E: strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x4] @@ -7696,7 +7696,7 @@ sub_812FC68: @ 812FC68 strh r0, [r4, 0x14] _0812FCAC: ldrb r0, [r2] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0812FCDC @@ -7833,13 +7833,13 @@ _0812FDC2: ldrb r4, [r0] adds r0, r4, 0 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] adds r0, r4, 0 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -7850,7 +7850,7 @@ _0812FDC2: strh r0, [r5, 0x14] ldr r0, _0812FE14 @ =gBattleAnimArgs ldrb r0, [r0] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -8123,7 +8123,7 @@ sub_812FFE4: @ 812FFE4 ldrh r0, [r1, 0x2] strh r0, [r4, 0xA] ldrb r0, [r1] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 ldr r2, _08130034 @ =gSprites @@ -8250,7 +8250,7 @@ sub_81300F4: @ 81300F4 adds r5, r0, 0 ldr r6, _0813014C @ =gAnimBankAttacker ldrb r0, [r6] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -8262,7 +8262,7 @@ sub_81300F4: @ 81300F4 _08130110: ldrb r0, [r6] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r4, _08130150 @ =gBattleAnimArgs lsrs r0, 24 @@ -8271,7 +8271,7 @@ _08130110: strh r0, [r5, 0x20] ldrb r0, [r6] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x2] @@ -8315,7 +8315,7 @@ _08130172: _08130180: ldr r0, _081301AC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _081301A0 @@ -8404,13 +8404,13 @@ _0813021C: _08130226: ldr r5, _0813025C @ =gAnimBankAttacker ldrb r0, [r5] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08130260 ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8431,7 +8431,7 @@ _0813025C: .4byte gAnimBankAttacker _08130260: ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8451,7 +8451,7 @@ _08130284: ldr r5, _081302D8 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 ldrb r0, [r5] movs r1, 0 @@ -8470,13 +8470,13 @@ _081302A8: ldr r4, _081302DC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x22] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x24] @@ -8840,14 +8840,14 @@ sub_8130554: @ 8130554 mov r10, r0 ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x1E] mov r1, r10 ldrb r0, [r1] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x20] @@ -8855,14 +8855,14 @@ sub_8130554: @ 8130554 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r7, 0x22] mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 mov r1, r8 ldrb r0, [r1] @@ -8942,7 +8942,7 @@ _081305C6: bl InitAnimSpriteTranslationOverDuration mov r1, r10 ldrb r0, [r1] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -9163,7 +9163,7 @@ _081307FC: strh r1, [r4, 0x3C] adds r0, r5, 0 movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -9336,7 +9336,7 @@ _08130934: ldrh r0, [r2, 0x2] strh r0, [r4, 0x8] ldrb r0, [r2] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -9470,7 +9470,7 @@ _08130A48: _08130A4A: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -9858,7 +9858,7 @@ sub_8130D20: @ 8130D20 ldr r0, _08130D7C @ =gTasks adds r6, r1, r0 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x26] @@ -9874,7 +9874,7 @@ sub_8130D20: @ 8130D20 ldr r5, _08130D80 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -9882,7 +9882,7 @@ sub_8130D20: @ 8130D20 movs r0, 0x2 eors r0, r1 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -9900,7 +9900,7 @@ _08130D88: .4byte 0x0000ffff _08130D8C: ldr r0, _08130DA0 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08130DA8 @@ -10165,7 +10165,7 @@ _08130F82: ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -10323,14 +10323,14 @@ _081310C4: lsls r0, 24 lsrs r0, 24 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r5, r0, 24 ldrh r0, [r4, 0x3C] lsls r0, 24 lsrs r0, 24 movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r1, r0, 24 _081310E4: @@ -10547,12 +10547,12 @@ sub_8131264: @ 8131264 ldr r4, _081312A0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _08131290 @@ -10614,7 +10614,7 @@ sub_81312E4: @ 81312E4 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r5, r0, 24 adds r2, r5, 0 @@ -10755,7 +10755,7 @@ sub_8131408: @ 8131408 lsls r0, 24 lsrs r6, r0, 24 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r3, r0, 24 ldr r1, _08131434 @ =gTasks @@ -10933,7 +10933,7 @@ sub_8131564: @ 8131564 adds r5, r0, 0 ldr r4, _08131588 @ =gAnimBankTarget ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08131590 @@ -10960,7 +10960,7 @@ _081315A0: ldr r0, _081315C0 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -11473,7 +11473,7 @@ _0813197C: .4byte _08131DC4 _08131990: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r7, r0, 24 ldr r1, _081319DC @ =gTasks @@ -11490,7 +11490,7 @@ _08131990: strh r0, [r6, 0xA] ldr r0, _081319E0 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11582,11 +11582,11 @@ _08131A70: .4byte gAnimBankAttacker _08131A74: ldr r4, _08131AD4 @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08131B10 - ldr r7, _08131AD8 @ =gBattlePartyID + ldr r7, _08131AD8 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -11626,14 +11626,14 @@ _08131A74: b _08131AE6 .align 2, 0 _08131AD4: .4byte gAnimBankAttacker -_08131AD8: .4byte gBattlePartyID +_08131AD8: .4byte gBattlerPartyIndexes _08131ADC: .4byte gPlayerParty _08131AE0: .4byte gSharedMem + 0x17800 _08131AE4: ldrh r5, [r1, 0x2] _08131AE6: movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _08131B0C @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -11653,7 +11653,7 @@ _08131AE6: .align 2, 0 _08131B0C: .4byte gSprites _08131B10: - ldr r7, _08131B64 @ =gBattlePartyID + ldr r7, _08131B64 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r7 @@ -11692,14 +11692,14 @@ _08131B10: lsrs r5, r0, 16 b _08131B72 .align 2, 0 -_08131B64: .4byte gBattlePartyID +_08131B64: .4byte gBattlerPartyIndexes _08131B68: .4byte gEnemyParty _08131B6C: .4byte gSharedMem + 0x17800 _08131B70: ldrh r5, [r1, 0x2] _08131B72: movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _08131C04 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -11719,7 +11719,7 @@ _08131B94: ldr r0, _08131C0C @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 lsls r3, r6, 16 @@ -11795,7 +11795,7 @@ _08131C20: strh r0, [r6, 0xA] ldr r0, _08131C70 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11852,7 +11852,7 @@ _08131C8E: bne _08131D0E ldr r0, _08131CE4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08131CEC @@ -11861,7 +11861,7 @@ _08131C8E: ldr r0, _08131CE8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11878,7 +11878,7 @@ _08131CEC: ldr r0, _08131D30 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 cmp r4, r0 @@ -11916,7 +11916,7 @@ _08131D38: .4byte 0x0000ffff _08131D3C: .4byte gTasks _08131D40: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r7, r0, 24 ldr r1, _08131D8C @ =gTasks @@ -11936,7 +11936,7 @@ _08131D40: bl sub_807A0F4 ldr r0, _08131D94 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 mov r9, r4 cmp r0, 0 @@ -11980,7 +11980,7 @@ _08131DB6: _08131DC0: .4byte gTasks _08131DC4: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r7, r0, 24 ldr r1, _08131E38 @ =gTasks @@ -11999,7 +11999,7 @@ _08131DC4: mov r10, r0 ldrb r0, [r0] str r2, [sp, 0x10] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 mov r9, r4 ldr r2, [sp, 0x10] @@ -12024,7 +12024,7 @@ _08131DC4: mov r1, r10 ldrb r0, [r1] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12057,7 +12057,7 @@ _08131E44: mov r2, r10 ldrb r0, [r2] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r3, r5, 0 @@ -12126,7 +12126,7 @@ _08131ECA: ldr r0, _08131F54 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, 0x10 @@ -12145,7 +12145,7 @@ _08131ECA: strb r0, [r2] ldr r0, _08131F5C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -12155,7 +12155,7 @@ _08131ECA: cmp r0, 0 bne _08131FF4 movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _08131F60 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -12219,7 +12219,7 @@ _08131FA6: strh r0, [r4, 0x32] ldr r0, _08131FD0 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _08131FD4 @@ -12292,14 +12292,14 @@ _08132040: ldr r0, _08132084 @ =gAnimBankAttacker ldrb r0, [r0] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r5, r0, 0 ldr r0, _08132088 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r2, r0, 0 @@ -12473,14 +12473,14 @@ sub_813219C: @ 813219C ldr r0, _08132204 @ =gTasks adds r4, r1, r0 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 movs r5, 0 strh r0, [r4, 0xE] ldr r0, _08132208 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -12663,7 +12663,7 @@ sub_8132318: @ 8132318 adds r4, r0, 0 ldr r0, _0813236C @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 ldrh r0, [r4, 0x2E] ldrh r1, [r4, 0x30] @@ -12707,7 +12707,7 @@ sub_8132370: @ 8132370 adds r4, r0, 0 ldr r0, _081323A8 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _081323B4 @@ -12764,7 +12764,7 @@ sub_81323E0: @ 81323E0 ldr r4, _08132424 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] @@ -12996,7 +12996,7 @@ sub_813257C: @ 813257C strh r0, [r4, 0x8] ldr r0, _081325B8 @ =gBattleAnimArgs ldrb r0, [r0] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 diff --git a/asm/battle_anim_813F0F4.s b/asm/battle_anim_813F0F4.s index a2e942ec9..df39aef31 100644 --- a/asm/battle_anim_813F0F4.s +++ b/asm/battle_anim_813F0F4.s @@ -915,11 +915,11 @@ sub_813F844: @ 813F844 adds r1, r0, r1 ldrb r1, [r1] mov r9, r1 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _0813F88C - ldr r1, _0813F884 @ =gBattlePartyID + ldr r1, _0813F884 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -931,10 +931,10 @@ sub_813F844: @ 813F844 .align 2, 0 _0813F87C: .4byte gBankSpriteIds _0813F880: .4byte gAnimBankAttacker -_0813F884: .4byte gBattlePartyID +_0813F884: .4byte gBattlerPartyIndexes _0813F888: .4byte gPlayerParty _0813F88C: - ldr r1, _0813F8CC @ =gBattlePartyID + ldr r1, _0813F8CC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -965,20 +965,20 @@ _0813F89C: beq _0813F958 b _0813F982 .align 2, 0 -_0813F8CC: .4byte gBattlePartyID +_0813F8CC: .4byte gBattlerPartyIndexes _0813F8D0: .4byte gEnemyParty _0813F8D4: .4byte gTasks _0813F8D8: ldr r5, _0813F950 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r1, r0, 0 lsls r1, 24 ldr r2, _0813F954 @ =gSprites @@ -1238,14 +1238,14 @@ sub_813FA94: @ 813FA94 mov r8, r2 ldrb r0, [r2] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1366,7 +1366,7 @@ _0813FBE0: lsls r4, 24 lsrs r4, 24 movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 bl sub_8079E90 @@ -1400,14 +1400,14 @@ _0813FBE0: mov r8, r1 ldrb r0, [r1] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r6, 0x30] mov r1, r8 ldrb r0, [r1] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 subs r0, 0x10 @@ -1418,7 +1418,7 @@ _0813FBE0: ldr r0, _0813FCAC @ =SpriteCallbackDummy str r0, [r4] movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _0813FCB0 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1462,7 +1462,7 @@ sub_813FCBC: @ 813FCBC lsrs r5, r0, 24 ldr r6, _0813FD1C @ =gSprites movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _0813FD20 @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1519,7 +1519,7 @@ sub_813FD34: @ 813FD34 lsrs r5, r0, 24 ldr r6, _0813FD88 @ =gSprites movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r4, _0813FD8C @ =gBankSpriteIds lsls r0, 24 lsrs r0, 24 @@ -1535,7 +1535,7 @@ sub_813FD34: @ 813FD34 cmp r0, 0 bge _0813FD80 movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 adds r0, r4 @@ -4619,7 +4619,7 @@ _08141562: adds r0, r4 strh r0, [r5, 0x8] ldrb r0, [r3] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _081415A4 @@ -4697,7 +4697,7 @@ _08141606: adds r0, r2 strh r0, [r5, 0x8] ldrb r0, [r3] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _0814163C @@ -4739,7 +4739,7 @@ _08141654: strh r1, [r0, 0x8] ldr r0, _08141690 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 @@ -4817,7 +4817,7 @@ _081416EC: _081416F2: ldr r0, _08141708 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -5124,12 +5124,12 @@ _08141966: ldrb r0, [r4, 0x8] mov r8, r0 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r5, r0, 24 mov r0, r8 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r2, r0, 24 movs r1, 0x1E @@ -5247,7 +5247,7 @@ _08141A44: cmp r0, 0 bne _08141A8C mov r0, r8 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 movs r1, 0x3F cmp r0, 0 @@ -5483,11 +5483,11 @@ sub_8141C30: @ 8141C30 movs r0, 0x1E strh r0, [r4, 0x2E] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r5, _08141CA4 @ =gBattleAnimArgs lsrs r0, 24 @@ -5495,11 +5495,11 @@ sub_8141C30: @ 8141C30 adds r0, r1 strh r0, [r4, 0x32] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r0, 24 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -5644,11 +5644,11 @@ sub_8141D7C: @ 8141D7C lsls r4, 24 lsrs r4, 24 movs r0, 0 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _08141DA4 @ =gAnimBankAttacker strb r0, [r1] movs r0, 0x1 - bl GetBankByIdentity + bl GetBattlerAtPosition ldr r1, _08141DA8 @ =gAnimBankTarget strb r0, [r1] adds r0, r4, 0 diff --git a/asm/current.s b/asm/current.s index fa3fec58a..2010b0336 100644 --- a/asm/current.s +++ b/asm/current.s @@ -21,7 +21,7 @@ sub_80D648C: @ 80D648C ldr r6, _080D6504 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80D648C: @ 80D648C strh r0, [r4, 0x34] ldrb r0, [r6] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -188,7 +188,7 @@ sub_80D65DC: @ 80D65DC beq _080D65FE ldr r0, _080D664C @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D6606 @@ -201,7 +201,7 @@ _080D6606: ldr r5, _080D664C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r4, _080D6650 @ =gBattleAnimArgs lsrs r0, 24 @@ -210,7 +210,7 @@ _080D6606: strh r0, [r6, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -266,7 +266,7 @@ _080D667E: cmp r0, 0 beq _080D669C adds r0, r6, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D66A4 @@ -278,7 +278,7 @@ _080D669C: _080D66A4: adds r0, r6, 0 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r4, _080D6718 @ =gBattleAnimArgs lsrs r0, 24 @@ -287,7 +287,7 @@ _080D66A4: strh r0, [r5, 0x20] adds r0, r6, 0 movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r2, [r4, 0x2] @@ -465,7 +465,7 @@ sub_80D681C: @ 80D681C ldr r6, _080D6864 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord ldr r1, _080D6868 @ =gTasks lsls r4, r5, 2 adds r4, r5 @@ -479,7 +479,7 @@ sub_80D681C: @ 80D681C strh r0, [r4, 0x8] ldrb r0, [r6] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r5, 0x2] @@ -887,13 +887,13 @@ _080D6B68: _080D6B6A: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x26] @@ -1120,13 +1120,13 @@ _080D6D34: _080D6D36: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1163,13 +1163,13 @@ _080D6D8C: _080D6D8E: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1202,25 +1202,25 @@ sub_80D6DD8: @ 80D6DD8 ldr r4, _080D6E30 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x3A] movs r0, 0x10 strh r0, [r5, 0x3C] ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -1326,7 +1326,7 @@ _080D6ECE: b _080D7000 _080D6ED0: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 movs r6, 0 @@ -1334,12 +1334,12 @@ _080D6ED0: ldr r4, _080D6F04 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x24] ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D6F0C @@ -1515,7 +1515,7 @@ _080D703A: _080D703C: ldr r4, _080D707C @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -1551,13 +1551,13 @@ _080D7084: .4byte 0x0000fff0 _080D7088: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] @@ -1577,13 +1577,13 @@ _080D70B0: ldr r4, _080D70E4 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x12] ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 movs r2, 0xA @@ -1829,13 +1829,13 @@ _080D728E: ldr r4, _080D72BC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1899,13 +1899,13 @@ _080D731C: ldr r4, _080D73A0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x14] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x16] @@ -1914,7 +1914,7 @@ _080D731C: ldr r0, _080D73A4 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x1C] @@ -2257,7 +2257,7 @@ _080D75CA: ldr r0, _080D7614 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2279,7 +2279,7 @@ _080D75F4: ldr r4, _080D7614 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] diff --git a/asm/flying.s b/asm/flying.s index 1862e3218..72d1e3bdc 100644 --- a/asm/flying.s +++ b/asm/flying.s @@ -177,7 +177,7 @@ sub_80DA16C: @ 80DA16C bl InitAnimSpritePos ldr r0, _080DA1D8 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080DA18C @@ -194,7 +194,7 @@ _080DA18C: ldr r5, _080DA1E0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -204,7 +204,7 @@ _080DA18C: strh r0, [r6, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -250,7 +250,7 @@ sub_80DA208: @ 80DA208 adds r5, r0, 0 ldr r4, _080DA2A4 @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080DA234 @@ -282,13 +282,13 @@ _080DA234: _080DA24C: ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r2, _080DA2A8 @ =gBattleAnimArgs ldrh r1, [r2] @@ -308,13 +308,13 @@ _080DA24C: ldr r4, _080DA2AC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -374,7 +374,7 @@ sub_80DA300: @ 80DA300 ldr r0, _080DA340 @ =sub_80DA348 str r0, [r4, 0x1C] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080DA344 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -441,7 +441,7 @@ sub_80DA38C: @ 80DA38C adds r5, r0, 0 ldr r0, _080DA3B4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080DA3BC @@ -470,7 +470,7 @@ _080DA3C2: ldr r4, _080DA408 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -478,7 +478,7 @@ _080DA3C2: strh r0, [r5, 0x34] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -537,7 +537,7 @@ _080DA438: ble _080DA480 _080DA45A: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080DA488 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -627,7 +627,7 @@ _080DA500: _080DA502: ldrb r6, [r0] adds r0, r6, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080DA518 @@ -638,7 +638,7 @@ _080DA502: _080DA518: adds r0, r6, 0 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r4, _080DA5B4 @ =gBattleAnimArgs lsrs r0, 24 @@ -647,7 +647,7 @@ _080DA518: strh r0, [r7, 0x20] adds r0, r6, 0 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldrh r1, [r4, 0x2] lsrs r0, 24 @@ -1733,13 +1733,13 @@ sub_80DAD30: @ 80DAD30 ldr r5, _080DAD7C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -1784,7 +1784,7 @@ sub_80DAD84: @ 80DAD84 beq _080DADE0 adds r0, r2, 0 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -1799,7 +1799,7 @@ _080DADDC: .4byte gAnimBankTarget _080DADE0: adds r0, r2, 0 movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, 0x28 @@ -1849,7 +1849,7 @@ _080DAE44: ldr r0, _080DAEFC @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r5, [r5, 0x6] @@ -2102,7 +2102,7 @@ _080DB024: bne _080DB03C ldr r0, _080DB090 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080DB052 @@ -2113,7 +2113,7 @@ _080DB03C: bne _080DB058 ldr r0, _080DB094 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080DB058 @@ -2239,13 +2239,13 @@ sub_80DB0E8: @ 80DB0E8 ldr r5, _080DB190 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r2, r0, 0 lsls r2, 24 lsrs r2, 24 @@ -2293,7 +2293,7 @@ _080DB1A6: movs r1, 0x1 bl InitAnimSpritePos movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080DB1D4 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -2349,7 +2349,7 @@ _080DB210: ldr r0, _080DB228 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -2385,7 +2385,7 @@ _080DB240: cmp r0, r1 bge _080DB27E movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080DB284 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -2423,7 +2423,7 @@ sub_80DB288: @ 80DB288 ldr r0, _080DB2C8 @ =sub_80DB2D0 str r0, [r4, 0x1C] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080DB2CC @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -2566,13 +2566,13 @@ _080DB3A0: _080DB3A2: ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2726,13 +2726,13 @@ _080DB4D4: _080DB4D6: ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, 0x20 @@ -2885,14 +2885,14 @@ sub_80DB5E4: @ 80DB5E4 ldr r6, _080DB698 @ =gAnimBankAttacker ldrb r0, [r6] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r1, r8 strh r0, [r1, 0x20] ldrb r0, [r6] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r6, r0, 0 lsls r6, 24 lsrs r6, 24 @@ -3012,7 +3012,7 @@ unref_sub_80DB6E4: @ 80DB6E4 cmp r0, 0 bne _080DB71C movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 ldr r2, _080DB718 @ =gSprites @@ -3030,7 +3030,7 @@ _080DB714: .4byte gBattleAnimArgs _080DB718: .4byte gSprites _080DB71C: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 ldr r2, _080DB748 @ =gSprites diff --git a/asm/ghost.s b/asm/ghost.s index b5620910b..59671ec7f 100644 --- a/asm/ghost.s +++ b/asm/ghost.s @@ -21,7 +21,7 @@ sub_80DDB6C: @ 80DDB6C ldr r5, _080DDBCC @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] @@ -29,7 +29,7 @@ sub_80DDB6C: @ 80DDB6C strh r0, [r4, 0x34] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -358,7 +358,7 @@ sub_80DDDF0: @ 80DDDF0 adds r0, r2, 0 strh r0, [r1] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 @@ -475,7 +475,7 @@ sub_80DDED0: @ 80DDED0 _080DDEF4: .4byte gTasks _080DDEF8: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r1, r0, 24 ldrh r0, [r4, 0x8] @@ -524,7 +524,7 @@ sub_80DDF40: @ 80DDF40 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 movs r1, 0 @@ -533,7 +533,7 @@ sub_80DDF40: @ 80DDF40 mov r1, r8 ldrb r0, [r1] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -643,13 +643,13 @@ _080DE032: ldr r4, _080DE098 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x30] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] @@ -706,13 +706,13 @@ _080DE09C: ldr r4, _080DE0EC @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -888,7 +888,7 @@ _080DE1E0: strh r1, [r0, 0x2E] ldr r0, _080DE250 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080DE258 @@ -1127,7 +1127,7 @@ sub_80DE3D4: @ 80DE3D4 adds r5, r0, r1 ldr r0, _080DE410 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -1219,7 +1219,7 @@ _080DE464: movs r0, 0x10 strh r0, [r5, 0xE] movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -1487,7 +1487,7 @@ sub_80DE6B0: @ 80DE6B0 adds r4, r0, r1 ldr r0, _080DE6E4 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r6, r0, 24 movs r1, 0x26 @@ -1511,7 +1511,7 @@ _080DE6EE: movs r0, 0x3 strb r0, [r1, 0x15] movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x24] @@ -1620,12 +1620,12 @@ sub_80DE7B8: @ 80DE7B8 ldr r4, _080DE7F8 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 @@ -1642,12 +1642,12 @@ _080DE800: ldr r4, _080DE8C8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r6, r0, 24 ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 8 movs r2, 0xE0 @@ -1658,13 +1658,13 @@ _080DE800: _080DE824: ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r10, r0 ldrb r0, [r4] movs r1, 0x1 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 8 movs r1, 0xE0 @@ -1816,7 +1816,7 @@ sub_80DE918: @ 80DE918 ldr r4, _080DEA74 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 str r0, [sp, 0x4] @@ -1868,7 +1868,7 @@ _080DE98A: beq _080DEA56 adds r0, r4, 0 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r10, r0 @@ -2261,7 +2261,7 @@ sub_80DECB0: @ 80DECB0 strh r0, [r1] ldr r0, _080DED08 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080DECF4 @@ -2542,7 +2542,7 @@ sub_80DEF3C: @ 80DEF3C bl InitAnimSpritePos ldr r0, _080DEF68 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080DEF70 @@ -2746,7 +2746,7 @@ sub_80DF0B8: @ 80DF0B8 strh r0, [r4, 0x24] ldr r0, _080DF120 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080DF0DC @@ -2880,7 +2880,7 @@ sub_80DF1A4: @ 80DF1A4 ldr r5, _080DF240 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1A] @@ -2993,7 +2993,7 @@ _080DF292: strh r7, [r5, 0x2E] ldr r0, _080DF2FC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide movs r1, 0 lsls r0, 24 cmp r0, 0 diff --git a/asm/ground.s b/asm/ground.s index ac3f909b5..82e56fcc0 100644 --- a/asm/ground.s +++ b/asm/ground.s @@ -14,13 +14,13 @@ sub_80E0F1C: @ 80E0F1C ldr r5, _080E0F74 @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -29,13 +29,13 @@ sub_80E0F1C: @ 80E0F1C ldr r5, _080E0F78 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x36] @@ -79,13 +79,13 @@ sub_80E0F84: @ 80E0F84 ldr r4, _080E0FE0 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -128,7 +128,7 @@ sub_80E1004: @ 80E1004 bl sub_8078764 ldr r0, _080E1064 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E1024 @@ -143,7 +143,7 @@ _080E1024: ldr r5, _080E106C @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r4, 0x4] @@ -151,7 +151,7 @@ _080E1024: strh r0, [r6, 0x32] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r4, [r4, 0x6] @@ -264,7 +264,7 @@ sub_80E1108: @ 80E1108 ldr r4, _080E1174 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r2, [r6, 0x2] @@ -272,7 +272,7 @@ sub_80E1108: @ 80E1108 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r3, [r6, 0x4] @@ -475,13 +475,13 @@ _080E12B0: .4byte _080E1414 _080E12C4: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] ldr r0, _080E12EC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -670,7 +670,7 @@ sub_80E143C: @ 80E143C lsls r0, 24 lsrs r5, r0, 24 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 ldr r2, _080E147C @ =gSprites @@ -689,7 +689,7 @@ sub_80E143C: @ 80E143C strh r4, [r1, 0x26] ldr r0, _080E1480 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -768,7 +768,7 @@ sub_80E14DC: @ 80E14DC _080E14FC: .4byte gTasks _080E1500: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] @@ -848,13 +848,13 @@ _080E158C: .4byte _080E165C _080E15A0: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1C] ldr r0, _080E15C4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankIdentity_permutated + bl GetBattlerPosition_permutated lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1E] @@ -1082,7 +1082,7 @@ _080E1746: _080E1762: adds r0, r4, 0 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 adds r0, r6 @@ -1152,7 +1152,7 @@ _080E17EA: ldrb r5, [r0] adds r0, r5, 0 movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldr r2, _080E184C @ =0x0000fff0 @@ -1288,7 +1288,7 @@ _080E18F8: _080E1904: .4byte gBankSpriteIds _080E1908: ldrb r0, [r6] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x1A] @@ -1700,7 +1700,7 @@ _080E1BE2: adds r4, r0 adds r0, r5, 0 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 movs r1, 0x20 @@ -1711,7 +1711,7 @@ _080E1BE2: strh r1, [r4, 0xA] adds r0, r5, 0 movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 movs r1, 0x40 @@ -65,26 +65,26 @@ sub_80D7704: @ 80D7704 ldr r4, _080D7814 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r9, r0 ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r8, r0 ldr r4, _080D7818 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r3, r0, 24 ldrb r0, [r4] movs r1, 0x3 str r3, [sp] - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r6, r0, 24 ldr r1, _080D781C @ =gBattleAnimArgs @@ -329,13 +329,13 @@ sub_80D792C: @ 80D792C ldr r0, _080D7960 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] ldr r0, _080D7964 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D796C @@ -359,7 +359,7 @@ _080D7976: ldr r0, _080D79A8 @ =gAnimBankTarget ldrb r0, [r0] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 ldr r1, _080D79A4 @ =gBattleAnimArgs lsrs r0, 24 @@ -409,7 +409,7 @@ _080D79D0: bl SetAverageBattlerPositions ldr r0, _080D7A1C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D79F6 @@ -495,13 +495,13 @@ sub_80D7A64: @ 80D7A64 ldr r4, _080D7AB0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x6] @@ -523,7 +523,7 @@ _080D7AB4: _080D7AC6: ldr r0, _080D7AE4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D7AEC @@ -649,7 +649,7 @@ sub_80D7BA0: @ 80D7BA0 strh r0, [r4, 0x2E] ldr r0, _080D7BFC @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 ldr r1, _080D7C00 @ =0x0000ffec cmp r0, 0 @@ -687,7 +687,7 @@ sub_80D7C08: @ 80D7C08 adds r4, r0, 0 ldr r0, _080D7C5C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 ldr r1, _080D7C60 @ =0x0000ffec cmp r0, 0 @@ -810,13 +810,13 @@ sub_80D7CD4: @ 80D7CD4 ldr r4, _080D7D1C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x36] @@ -836,7 +836,7 @@ _080D7D20: _080D7D32: ldr r0, _080D7D54 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D7D5C @@ -1039,7 +1039,7 @@ _080D7EAC: bl SetAverageBattlerPositions ldr r0, _080D7EF0 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D7ED2 @@ -1108,7 +1108,7 @@ _080D7F34: movs r1, 0 bl SetAverageBattlerPositions ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D7F60 @@ -1154,7 +1154,7 @@ _080D7F92: movs r1, 0 bl SetAverageBattlerPositions ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D7FBC @@ -1201,7 +1201,7 @@ _080D7FF6: strh r0, [r5, 0x3A] ldr r0, _080D803C @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D800C @@ -1686,13 +1686,13 @@ sub_80D83E0: @ 80D83E0 ldr r5, _080D840C @ =gAnimBankAttacker ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x22] @@ -2074,12 +2074,12 @@ sub_80D8700: @ 80D8700 mov r8, r0 ldrb r0, [r0] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord adds r4, r0, 0 ldr r7, _080D87F0 @ =gAnimBankTarget ldrb r0, [r7] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r4, 24 lsls r0, 24 cmp r4, r0 @@ -2119,7 +2119,7 @@ _080D8734: cmp r0, 0 bne _080D8790 movs r0, 0x1 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r2, _080D87F8 @ =gSprites lsls r0, 24 lsrs r0, 24 @@ -2140,13 +2140,13 @@ _080D8794: ldr r4, _080D87EC @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x20] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x22] @@ -2162,7 +2162,7 @@ _080D8794: ldr r4, _080D87F0 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2189,7 +2189,7 @@ _080D87FC: ldr r4, _080D886C @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] @@ -2202,7 +2202,7 @@ _080D87FC: ldrb r0, [r4] movs r1, 0x1 _080D8824: - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r6, [r6, 0x8] @@ -2301,7 +2301,7 @@ _080D88D6: ldr r6, _080D8928 @ =gAnimBankTarget ldrb r0, [r6] movs r1, 0 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x20] @@ -2701,7 +2701,7 @@ sub_80D8BA8: @ 80D8BA8 ldrh r0, [r4, 0x2] lsls r0, 20 lsrs r0, 24 - bl GetBankByIdentity + bl GetBattlerAtPosition lsls r0, 24 lsrs r5, r0, 24 adds r0, r5, 0 @@ -2713,12 +2713,12 @@ sub_80D8BA8: @ 80D8BA8 str r0, [sp, 0x4] adds r0, r5, 0 movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r7, r0, 24 adds r0, r5, 0 movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r6, r0, 24 mov r1, r8 @@ -3032,7 +3032,7 @@ _080D8E6A: strh r0, [r5, 0x2E] ldr r0, _080D8ED4 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080D8E92 @@ -3043,7 +3043,7 @@ _080D8E92: ldr r4, _080D8ED8 @ =gAnimBankTarget ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x4] @@ -3051,7 +3051,7 @@ _080D8E92: strh r0, [r5, 0x32] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 ldrh r1, [r6, 0x6] diff --git a/asm/normal.s b/asm/normal.s index 732c049ab..55aae48fd 100644 --- a/asm/normal.s +++ b/asm/normal.s @@ -24,7 +24,7 @@ sub_80E1CB4: @ 80E1CB4 strh r0, [r4, 0x2E] ldr r0, _080E1CF0 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 lsrs r1, r0, 24 cmp r1, 0 @@ -1208,7 +1208,7 @@ _080E25A0: cmp r0, 0x1 bhi _080E25F4 movs r4, 0 - ldr r5, _080E2600 @ =gNoOfAllBanks + ldr r5, _080E2600 @ =gBattlersCount ldrb r0, [r5] cmp r4, r0 bcs _080E25F4 @@ -1243,7 +1243,7 @@ _080E25FA: pop {r0} bx r0 .align 2, 0 -_080E2600: .4byte gNoOfAllBanks +_080E2600: .4byte gBattlersCount _080E2604: .4byte gSprites _080E2608: .4byte gBankSpriteIds thumb_func_end sub_80E255C @@ -1538,7 +1538,7 @@ sub_80E2838: @ 80E2838 adds r4, r0, 0 ldr r0, _080E2868 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E285C @@ -1636,7 +1636,7 @@ sub_80E2908: @ 80E2908 adds r4, r0, 0 ldr r5, _080E2968 @ =gBattleAnimArgs ldrb r0, [r5] - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x2E] @@ -2512,13 +2512,13 @@ _080E2FAC: bne _080E3028 ldr r5, _080E305C @ =gAnimBankAttacker ldrb r0, [r5] - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080E2FDC ldrb r0, [r5] - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 cmp r0, 0 bne _080E3028 @@ -2585,11 +2585,11 @@ _080E3068: .4byte gSharedMem + 0x19348 _080E306C: ldr r4, _080E308C @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E3098 - ldr r1, _080E3090 @ =gBattlePartyID + ldr r1, _080E3090 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -2600,10 +2600,10 @@ _080E306C: b _080E30A8 .align 2, 0 _080E308C: .4byte gAnimBankAttacker -_080E3090: .4byte gBattlePartyID +_080E3090: .4byte gBattlerPartyIndexes _080E3094: .4byte gEnemyParty _080E3098: - ldr r1, _080E3160 @ =gBattlePartyID + ldr r1, _080E3160 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -2619,7 +2619,7 @@ _080E30A8: lsrs r4, r0, 16 _080E30B4: movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r5, r0, 24 ldr r0, _080E3168 @ =gAnimBankAttacker @@ -2697,7 +2697,7 @@ _080E3106: pop {r0} bx r0 .align 2, 0 -_080E3160: .4byte gBattlePartyID +_080E3160: .4byte gBattlerPartyIndexes _080E3164: .4byte gPlayerParty _080E3168: .4byte gAnimBankAttacker _080E316C: .4byte 0x040000d4 @@ -2784,7 +2784,7 @@ _080E3208: adds r0, 0x2 strh r5, [r0] movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId ldr r0, _080E32CC @ =gSprites mov r8, r0 movs r2, 0x8 @@ -3051,13 +3051,13 @@ _080E3432: cmp r0, 0 bne _080E34A4 adds r0, r5, 0 - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 lsrs r0, 24 cmp r0, 0x3 beq _080E345E adds r0, r5, 0 - bl GetBankIdentity + bl GetBattlerPosition lsls r0, 24 cmp r0, 0 bne _080E34A4 @@ -3119,11 +3119,11 @@ _080E34DC: .4byte gBankSpriteIds _080E34E0: .4byte gSharedMem + 0x19348 _080E34E4: adds r0, r5, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E3508 - ldr r1, _080E3500 @ =gBattlePartyID + ldr r1, _080E3500 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -3132,10 +3132,10 @@ _080E34E4: ldr r1, _080E3504 @ =gEnemyParty b _080E3516 .align 2, 0 -_080E3500: .4byte gBattlePartyID +_080E3500: .4byte gBattlerPartyIndexes _080E3504: .4byte gEnemyParty _080E3508: - ldr r1, _080E3568 @ =gBattlePartyID + ldr r1, _080E3568 @ =gBattlerPartyIndexes lsls r0, r5, 1 adds r0, r1 ldrh r1, [r0] @@ -3182,7 +3182,7 @@ _080E3550: bl LZDecompressVram b _080E3580 .align 2, 0 -_080E3568: .4byte gBattlePartyID +_080E3568: .4byte gBattlerPartyIndexes _080E356C: .4byte gPlayerParty _080E3570: .4byte gBankSpriteIds _080E3574: .4byte gBattleStatMask1_Tilemap @@ -3847,7 +3847,7 @@ sub_80E3A58: @ 80E3A58 beq _080E3A94 ldr r0, _080E3AC8 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E3A94 @@ -3955,7 +3955,7 @@ sub_80E3B4C: @ 80E3B4C lsrs r4, 24 ldr r0, _080E3B70 @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide ldr r1, _080E3B74 @ =gBattleAnimArgs lsls r0, 24 lsrs r0, 24 @@ -3978,7 +3978,7 @@ sub_80E3B78: @ 80E3B78 lsrs r4, 24 ldr r0, _080E3B9C @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide ldr r1, _080E3BA0 @ =gBattleAnimArgs lsls r0, 24 lsrs r0, 24 @@ -4206,11 +4206,11 @@ _080E3D50: .4byte REG_BG1CNT _080E3D54: .4byte gSharedMem + 0x19348 _080E3D58: adds r0, r7, 0 - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 beq _080E3D7C - ldr r1, _080E3D74 @ =gBattlePartyID + ldr r1, _080E3D74 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -4219,10 +4219,10 @@ _080E3D58: ldr r1, _080E3D78 @ =gEnemyParty b _080E3D8A .align 2, 0 -_080E3D74: .4byte gBattlePartyID +_080E3D74: .4byte gBattlerPartyIndexes _080E3D78: .4byte gEnemyParty _080E3D7C: - ldr r1, _080E3E48 @ =gBattlePartyID + ldr r1, _080E3E48 @ =gBattlerPartyIndexes lsls r0, r7, 1 adds r0, r1 ldrh r1, [r0] @@ -4320,7 +4320,7 @@ _080E3DE6: pop {r0} bx r0 .align 2, 0 -_080E3E48: .4byte gBattlePartyID +_080E3E48: .4byte gBattlerPartyIndexes _080E3E4C: .4byte gPlayerParty _080E3E50: .4byte gBankSpriteIds _080E3E54: .4byte gBattle_BG1_X @@ -4861,11 +4861,11 @@ sub_80E4264: @ 80E4264 lsrs r5, r0, 24 ldr r0, _080E428C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide adds r4, r0, 0 ldr r0, _080E4290 @ =gAnimBankTarget ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r4, 24 lsls r0, 24 cmp r4, r0 diff --git a/asm/water.s b/asm/water.s index 2f0ebb8f8..6f9c5cb9d 100644 --- a/asm/water.s +++ b/asm/water.s @@ -757,7 +757,7 @@ sub_80D40F4: @ 80D40F4 ldr r0, _080D4144 @ =gTasks adds r4, r0 movs r0, 0 - bl GetAnimBankSpriteId + bl GetAnimBattlerSpriteId lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x26] @@ -1085,11 +1085,11 @@ sub_80D4394: @ 80D4394 push {r4,r5,lr} ldr r4, _080D43B8 @ =gAnimBankAttacker ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D43C8 - ldr r1, _080D43BC @ =gBattlePartyID + ldr r1, _080D43BC @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -1100,13 +1100,13 @@ sub_80D4394: @ 80D4394 b _080D43D8 .align 2, 0 _080D43B8: .4byte gAnimBankAttacker -_080D43BC: .4byte gBattlePartyID +_080D43BC: .4byte gBattlerPartyIndexes _080D43C0: .4byte gPlayerParty _080D43C4: adds r0, r2, 0 b _080D440A _080D43C8: - ldr r1, _080D4410 @ =gBattlePartyID + ldr r1, _080D4410 @ =gBattlerPartyIndexes ldrb r0, [r4] lsls r0, 1 adds r0, r1 @@ -1144,7 +1144,7 @@ _080D440A: pop {r1} bx r1 .align 2, 0 -_080D4410: .4byte gBattlePartyID +_080D4410: .4byte gBattlerPartyIndexes _080D4414: .4byte gEnemyParty thumb_func_end sub_80D4394 @@ -1163,13 +1163,13 @@ sub_80D4418: @ 80D4418 ldr r4, _080D4520 @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 mov r8, r0 ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r6, r0, 24 movs r5, 0xAC @@ -1392,7 +1392,7 @@ sub_80D45D8: @ 80D45D8 strh r0, [r4, 0xA] ldr r0, _080D460C @ =gAnimBankAttacker ldrb r0, [r0] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 cmp r0, 0 bne _080D4610 @@ -1791,19 +1791,19 @@ sub_80D48F4: @ 80D48F4 ldr r4, _080D497C @ =gAnimBankAttacker ldrb r0, [r4] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 movs r6, 0 strh r0, [r5, 0xE] ldrb r0, [r4] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0x10] ldrb r0, [r4] - bl GetBankSide + bl GetBattlerSide lsls r0, 24 movs r2, 0x1 negs r2, r2 @@ -2268,13 +2268,13 @@ sub_80D4CA4: @ 80D4CA4 ldr r5, _080D4CE0 @ =gAnimBankTarget ldrb r0, [r5] movs r1, 0x2 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x30] ldrb r0, [r5] movs r1, 0x3 - bl GetBankPosition + bl GetBattlerSpriteCoord lsls r0, 24 lsrs r0, 24 strh r0, [r4, 0x32] |