summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_9.s2840
-rw-r--r--asm/battle_anim_812C144.s272
-rw-r--r--asm/battle_anim_813F0F4.s58
-rw-r--r--asm/current.s70
-rw-r--r--asm/flying.s74
-rw-r--r--asm/ghost.s56
-rw-r--r--asm/ground.s46
-rw-r--r--asm/ice.s74
-rw-r--r--asm/nakamura_debug_menu.s4686
-rw-r--r--asm/normal.s62
-rw-r--r--asm/water.s28
11 files changed, 370 insertions, 7896 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
diff --git a/asm/ice.s b/asm/ice.s
index 51140d998..49381cb96 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -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/nakamura_debug_menu.s b/asm/nakamura_debug_menu.s
deleted file mode 100644
index 21092fe4b..000000000
--- a/asm/nakamura_debug_menu.s
+++ /dev/null
@@ -1,4686 +0,0 @@
-.if DEBUG
-
- .include "constants/gba_constants.inc"
- .include "include/macros.inc"
-
- .text
-
- thumb_func_start debug_sub_815F1B8
-debug_sub_815F1B8:
- push {lr}
- add sp, sp, #0xfffffff8
- bl Menu_EraseScreen
- mov r0, #0xe
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_DrawStdWindowFrame
- ldr r3, ._1 @ _843E3DC
- mov r0, #0x10
- mov r1, #0x1
- mov r2, #0x9
- bl Menu_PrintItems
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xe
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0xf
- mov r2, #0x1
- mov r3, #0x9
- bl InitMenu
- add sp, sp, #0x8
- pop {r0}
- bx r0
-._2:
- .align 2, 0
-._1:
- .word _843E3DC
-
- thumb_func_end debug_sub_815F1B8
-
- thumb_func_start InitNakamuraDebugMenu
-InitNakamuraDebugMenu:
- push {lr}
- bl debug_sub_815F1B8
- ldr r1, ._3 @ gMenuCallback
- ldr r0, ._3 + 4 @ debug_sub_815F214
- str r0, [r1]
- mov r0, #0x0
- pop {r1}
- bx r1
-._4:
- .align 2, 0
-._3:
- .word gMenuCallback
- .word debug_sub_815F214+1
-
- thumb_func_end InitNakamuraDebugMenu
-
- thumb_func_start debug_sub_815F214
-debug_sub_815F214:
- push {r4, lr}
- ldr r4, ._9 @ gMain
- ldrh r1, [r4, #0x2e]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._5 @cond_branch
- mov r0, #0x1
- neg r0, r0
- bl Menu_MoveCursor
-._5:
- ldrh r1, [r4, #0x2e]
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._6 @cond_branch
- mov r0, #0x1
- bl Menu_MoveCursor
-._6:
- ldrh r1, [r4, #0x2e]
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._7 @cond_branch
- ldr r4, ._9 + 4 @ _843E3DC
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- lsr r0, r0, #0x15
- add r4, r4, #0x4
- add r0, r0, r4
- ldr r4, [r0]
- bl Menu_DestroyCursor
- bl _call_via_r4
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- b ._12
-._10:
- .align 2, 0
-._9:
- .word gMain
- .word _843E3DC
-._7:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._11 @cond_branch
- mov r0, #0x0
- b ._12
-._11:
- bl CloseMenu
- mov r0, #0x1
-._12:
- pop {r4}
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815F214
-
- thumb_func_start debug_sub_815F284
-debug_sub_815F284:
- push {r4, lr}
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- ldr r0, ._14 @ gPaletteFade
- ldrb r1, [r0, #0x7]
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- bne ._13 @cond_branch
- bl debug_sub_81381B4
- mov r0, #0x5
- mov r1, #0x0
- bl OpenPartyMenu
- add r0, r4, #0
- bl DestroyTask
-._13:
- pop {r4}
- pop {r0}
- bx r0
-._15:
- .align 2, 0
-._14:
- .word gPaletteFade
-
- thumb_func_end debug_sub_815F284
-
- thumb_func_start debug_sub_815F2B4
-debug_sub_815F2B4:
- push {lr}
- add sp, sp, #0xfffffffc
- bl CloseMenu
- bl Menu_EraseScreen
- ldr r1, ._16 @ gMain
- ldr r0, ._16 + 4 @ sub_805469C
- str r0, [r1, #0x8]
- ldr r0, ._16 + 8 @ debug_sub_815F284
- mov r1, #0x0
- bl CreateTask
- mov r0, #0x1
- neg r0, r0
- mov r1, #0x0
- str r1, [sp]
- mov r2, #0x0
- mov r3, #0x10
- bl BeginNormalPaletteFade
- mov r0, #0x1
- add sp, sp, #0x4
- pop {r1}
- bx r1
-._17:
- .align 2, 0
-._16:
- .word gMain
- .word sub_805469C+1
- .word debug_sub_815F284+1
-
- thumb_func_end debug_sub_815F2B4
-
- thumb_func_start debug_sub_815F2F4
-debug_sub_815F2F4:
- push {r4, r5, r6, r7, lr}
- mov r7, sl
- mov r6, r9
- mov r5, r8
- push {r5, r6, r7}
- add sp, sp, #0xfffffffc
- bl CloseMenu
- mov r7, #0x1
-._34:
- lsl r1, r7, #0x2
- add r0, r1, r7
- lsl r2, r0, #0x5
- ldr r3, ._24 @ gSaveBlock1
- add r0, r2, r3
- ldr r5, ._24 + 4 @ 0x1a08
- add r0, r0, r5
- ldrb r0, [r0]
- mov r9, r1
- add r1, r7, #1
- str r1, [sp]
- cmp r0, #0
- beq ._18 @cond_branch
- b ._19
-._18:
- mov r5, #0x0
- ldr r6, ._24 + 8 @ gSaveBlock2
- add r4, r7, #0
- sub r4, r4, #0x46
- ldr r3, ._24 + 12 @ gSaveBlock1
-._21:
- add r1, r5, r2
- add r1, r1, r3
- add r0, r5, r6
- ldrb r0, [r0]
- strb r0, [r1]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0xff
- beq ._20 @cond_branch
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x6
- bls ._21 @cond_branch
-._20:
- cmp r5, #0x7
- bne ._22 @cond_branch
- add r0, r2, #6
- b ._23
-._25:
- .align 2, 0
-._24:
- .word gSaveBlock1
- .word 0x1a08
- .word gSaveBlock2
- .word gSaveBlock1+0x1a0a
-._22:
- add r0, r5, r2
-._23:
- add r0, r0, r3
- strb r4, [r0]
- ldr r1, ._35 @ gSaveBlock1
- ldr r2, ._35 + 4 @ 0x1a08
- add r2, r2, r1
- mov sl, r2
- mov r3, r9
- add r0, r3, r7
- lsl r6, r0, #0x5
- add r1, r6, r1
- ldr r5, ._35 + 4 @ 0x1a08
- add r5, r5, r1
- mov r8, r5
-._30:
- bl Random
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- mov r1, #0x4b
- bl __umodsi3
- lsl r0, r0, #0x10
- lsr r0, r0, #0xe
- ldr r1, ._35 + 8 @ _843E424
- add r0, r0, r1
- ldrb r0, [r0]
- mov r2, r8
- strb r0, [r2]
- mov r5, #0x0
- cmp r5, r7
- bcs ._28 @cond_branch
- mov r3, sl
- ldrb r3, [r3]
- cmp r0, r3
- beq ._28 @cond_branch
- ldr r4, ._35 @ gSaveBlock1
- add r0, r6, r4
- ldr r2, ._35 + 4 @ 0x1a08
- add r3, r0, r2
-._29:
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, r7
- bcs ._28 @cond_branch
- lsl r0, r5, #0x2
- add r0, r0, r5
- lsl r0, r0, #0x5
- add r0, r0, r4
- add r0, r0, r2
- ldrb r1, [r3]
- ldrb r0, [r0]
- cmp r1, r0
- bne ._29 @cond_branch
-._28:
- cmp r5, r7
- bne ._30 @cond_branch
- bl Random
- mov r5, r9
- add r4, r5, r7
- lsl r4, r4, #0x5
- ldr r1, ._35 @ gSaveBlock1
- add r3, r4, r1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- mov r1, #0x1
- ldr r2, ._35 + 12 @ 0x1a09
- add r3, r3, r2
- and r0, r0, r1
- lsl r0, r0, #0x4
- ldrb r1, [r3]
- mov r5, #0x11
- neg r5, r5
- add r2, r5, #0
- and r1, r1, r2
- orr r1, r1, r0
- strb r1, [r3]
- mov r5, #0x0
- ldr r6, ._35 + 16 @ gSaveBlock1
-._31:
- bl Random
- add r1, r5, r4
- add r1, r1, r6
- strb r0, [r1]
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x3
- bls ._31 @cond_branch
- mov r5, #0x0
- mov r1, r9
- add r0, r1, r7
- lsl r4, r0, #0x5
- ldr r3, ._35 + 20 @ gSaveBlock1
- mov r2, #0x0
- add r6, r3, #0
- add r6, r6, #0x10
-._32:
- add r1, r5, r4
- add r0, r1, r3
- strb r2, [r0]
- add r1, r1, r6
- strb r2, [r1]
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0xf
- bls ._32 @cond_branch
- add r0, r7, #0
- bl unref_sub_80BCD7C
-._19:
- ldr r2, [sp]
- lsl r0, r2, #0x18
- lsr r7, r0, #0x18
- cmp r7, #0x13
- bhi ._33 @cond_branch
- b ._34
-._33:
- mov r0, #0x1
- add sp, sp, #0x4
- pop {r3, r4, r5}
- mov r8, r3
- mov r9, r4
- mov sl, r5
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._36:
- .align 2, 0
-._35:
- .word gSaveBlock1
- .word 0x1a08
- .word _843E424
- .word 0x1a09
- .word gSaveBlock1+0x1a11
- .word gSaveBlock1+0x1a1a
-
- thumb_func_end debug_sub_815F2F4
-
- thumb_func_start debug_sub_815F470
-debug_sub_815F470:
- push {r4, r5, r6, r7, lr}
- add r6, r0, #0
- add r7, r1, #0
- mov ip, r2
- ldr r2, ._39 @ gSaveBlock1
- ldr r0, ._39 + 4 @ _nakamuraData0
- ldrb r1, [r0]
- lsl r0, r1, #0x2
- add r0, r0, r1
- lsl r0, r0, #0x5
- add r0, r0, r2
- ldr r1, ._39 + 8 @ 0x1a08
- add r0, r0, r1
- ldrb r4, [r0]
- mov r2, #0x0
- ldr r3, ._39 + 12 @ _843E424
- add r5, r3, #0
-._41:
- lsl r1, r2, #0x2
- add r0, r1, r5
- ldrb r0, [r0]
- cmp r0, r4
- bne ._37 @cond_branch
- add r0, r1, #1
- add r0, r0, r3
- ldrb r0, [r0]
- strb r0, [r6]
- add r0, r1, #2
- add r0, r0, r3
- ldrb r0, [r0]
- strb r0, [r7]
- add r0, r1, #3
- add r0, r0, r3
- ldrb r0, [r0]
- mov r1, ip
- strb r0, [r1]
- b ._38
-._40:
- .align 2, 0
-._39:
- .word gSaveBlock1
- .word _nakamuraData0
- .word 0x1a08
- .word _843E424
-._37:
- add r0, r2, #1
- lsl r0, r0, #0x18
- lsr r2, r0, #0x18
- cmp r2, #0x4a
- bls ._41 @cond_branch
-._38:
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-
- thumb_func_end debug_sub_815F470
-
- thumb_func_start debug_sub_815F4D8
-debug_sub_815F4D8:
- push {r4, r5, r6, r7, lr}
- add sp, sp, #0xfffffffc
- mov r0, #0x1
- mov r1, #0x1
- mov r2, #0xa
- mov r3, #0xa
- bl Menu_BlankWindowRect
- ldr r6, ._43 @ gStringVar1
- ldr r7, ._43 + 4 @ _nakamuraData0
- ldrb r1, [r7]
- add r0, r6, #0
- mov r2, #0x0
- mov r3, #0x2
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x1
- mov r2, #0x1
- bl Menu_PrintText
- ldr r2, ._43 + 8 @ gSaveBlock1
- ldrb r1, [r7]
- lsl r0, r1, #0x2
- add r0, r0, r1
- lsl r0, r0, #0x5
- add r0, r0, r2
- ldr r1, ._43 + 12 @ 0x1a08
- add r0, r0, r1
- ldrb r0, [r0]
- cmp r0, #0
- beq ._42 @cond_branch
- mov r4, sp
- add r4, r4, #0x1
- mov r5, sp
- add r5, r5, #0x2
- mov r0, sp
- add r1, r4, #0
- add r2, r5, #0
- bl debug_sub_815F470
- ldrb r1, [r7]
- add r0, r6, #0
- bl sub_80BC190
- add r0, r6, #0
- mov r1, #0x1
- mov r2, #0x3
- bl Menu_PrintText
- ldr r0, ._43 + 16 @ Str_843E550
- mov r1, #0x1
- mov r2, #0x5
- bl Menu_PrintText
- mov r0, sp
- ldrb r1, [r0]
- add r0, r6, #0
- mov r2, #0x0
- mov r3, #0x3
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x2
- mov r2, #0x5
- bl Menu_PrintText
- ldr r0, ._43 + 20 @ Str_843E552
- mov r1, #0x1
- mov r2, #0x7
- bl Menu_PrintText
- ldrb r1, [r4]
- add r0, r6, #0
- mov r2, #0x0
- mov r3, #0x3
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x3
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._43 + 24 @ Str_843E554
- mov r1, #0x1
- mov r2, #0x9
- bl Menu_PrintText
- ldrb r1, [r5]
- add r0, r6, #0
- mov r2, #0x0
- mov r3, #0x3
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x3
- mov r2, #0x9
- bl Menu_PrintText
-._42:
- add sp, sp, #0x4
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-._44:
- .align 2, 0
-._43:
- .word gStringVar1
- .word _nakamuraData0
- .word gSaveBlock1
- .word 0x1a08
- .word Str_843E550
- .word Str_843E552
- .word Str_843E554
-
- thumb_func_end debug_sub_815F4D8
-
- thumb_func_start debug_sub_815F5C4
-debug_sub_815F5C4:
- push {lr}
- ldr r0, ._48 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x20
- and r0, r0, r1
- lsl r0, r0, #0x10
- lsr r2, r0, #0x10
- cmp r2, #0
- beq ._45 @cond_branch
- ldr r1, ._48 + 4 @ _nakamuraData0
- ldrb r0, [r1]
- cmp r0, #0
- bne ._46 @cond_branch
- mov r0, #0x13
- b ._50
-._49:
- .align 2, 0
-._48:
- .word gMain
- .word _nakamuraData0
-._46:
- sub r0, r0, #0x1
- b ._50
-._45:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._51 @cond_branch
- ldr r1, ._54 @ _nakamuraData0
- ldrb r0, [r1]
- cmp r0, #0x13
- bne ._52 @cond_branch
- strb r2, [r1]
- b ._53
-._55:
- .align 2, 0
-._54:
- .word _nakamuraData0
-._52:
- add r0, r0, #0x1
-._50:
- strb r0, [r1]
-._53:
- bl debug_sub_815F4D8
- mov r0, #0x0
- b ._58
-._51:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._57 @cond_branch
- mov r0, #0x0
- b ._58
-._57:
- bl CloseMenu
- mov r0, #0x1
-._58:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815F5C4
-
- thumb_func_start debug_sub_815F62C
-debug_sub_815F62C:
- push {lr}
- ldr r1, ._59 @ _nakamuraData0
- mov r0, #0x0
- strb r0, [r1]
- ldr r1, ._59 + 4 @ gMenuCallback
- ldr r0, ._59 + 8 @ debug_sub_815F5C4
- str r0, [r1]
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xb
- mov r3, #0xb
- bl Menu_DrawStdWindowFrame
- bl debug_sub_815F4D8
- mov r0, #0x0
- pop {r1}
- bx r1
-._60:
- .align 2, 0
-._59:
- .word _nakamuraData0
- .word gMenuCallback
- .word debug_sub_815F5C4+1
-
- thumb_func_end debug_sub_815F62C
-
- thumb_func_start debug_sub_815F668
-debug_sub_815F668:
- push {r4, r5, r6, lr}
- ldr r0, ._61 @ _nakamuraData0
- ldrb r0, [r0]
- lsl r1, r0, #0x2
- add r1, r1, r0
- lsl r1, r1, #0x5
- ldr r0, ._61 + 4 @ gSaveBlock1
- add r1, r1, r0
- ldrb r4, [r1, #0x3]
- lsl r4, r4, #0x18
- ldrb r0, [r1, #0x2]
- lsl r0, r0, #0x10
- orr r4, r4, r0
- ldrb r0, [r1, #0x1]
- lsl r0, r0, #0x8
- orr r4, r4, r0
- ldrb r0, [r1]
- orr r4, r4, r0
- ldr r5, ._61 + 8 @ gStringVar1
- ldr r6, ._61 + 12 @ 0x186a0
- add r0, r4, #0
- add r1, r6, #0
- bl __udivsi3
- add r1, r0, #0
- add r0, r5, #0
- mov r2, #0x2
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r5, #0
- mov r1, #0x2
- mov r2, #0x7
- bl Menu_PrintText
- add r0, r4, #0
- add r1, r6, #0
- bl __umodsi3
- add r1, r0, #0
- add r0, r5, #0
- mov r2, #0x2
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r5, #0
- mov r1, #0x7
- mov r2, #0x7
- bl Menu_PrintText
- pop {r4, r5, r6}
- pop {r0}
- bx r0
-._62:
- .align 2, 0
-._61:
- .word _nakamuraData0
- .word gSaveBlock1+0x1a11
- .word gStringVar1
- .word 0x186a0
-
- thumb_func_end debug_sub_815F668
-
- thumb_func_start debug_sub_815F6E4
-debug_sub_815F6E4:
- push {r4, lr}
- mov r0, #0x2
- mov r1, #0x3
- mov r2, #0xb
- mov r3, #0x4
- bl Menu_BlankWindowRect
- ldr r4, ._63 @ gStringVar1
- ldr r0, ._63 + 4 @ _nakamuraData0
- ldrb r0, [r0]
- lsl r1, r0, #0x2
- add r1, r1, r0
- lsl r1, r1, #0x5
- ldr r0, ._63 + 8 @ gSaveBlock1
- add r1, r1, r0
- add r0, r4, #0
- mov r2, #0x7
- bl StringCopyN
- mov r1, #0xff
- strb r1, [r0]
- add r0, r4, #0
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- pop {r4}
- pop {r0}
- bx r0
-._64:
- .align 2, 0
-._63:
- .word gStringVar1
- .word _nakamuraData0
- .word gSaveBlock1+0x1a0a
-
- thumb_func_end debug_sub_815F6E4
-
- thumb_func_start debug_sub_815F72C
-debug_sub_815F72C:
- push {r4, r5, lr}
- mov r0, #0x2
- mov r1, #0x1
- mov r2, #0xb
- mov r3, #0xa
- bl Menu_BlankWindowRect
- ldr r4, ._66 @ gStringVar1
- ldr r5, ._66 + 4 @ _nakamuraData0
- ldrb r1, [r5]
- add r0, r4, #0
- mov r2, #0x0
- mov r3, #0x2
- bl ConvertIntToDecimalStringN
- add r0, r4, #0
- mov r1, #0x2
- mov r2, #0x1
- bl Menu_PrintText
- ldr r2, ._66 + 8 @ gSaveBlock1
- ldrb r1, [r5]
- lsl r0, r1, #0x2
- add r0, r0, r1
- lsl r0, r0, #0x5
- add r0, r0, r2
- ldr r1, ._66 + 12 @ 0x1a08
- add r0, r0, r1
- ldrb r0, [r0]
- cmp r0, #0
- beq ._65 @cond_branch
- bl debug_sub_815F6E4
- bl debug_sub_815F668
-._65:
- pop {r4, r5}
- pop {r0}
- bx r0
-._67:
- .align 2, 0
-._66:
- .word gStringVar1
- .word _nakamuraData0
- .word gSaveBlock1
- .word 0x1a08
-
- thumb_func_end debug_sub_815F72C
-
- thumb_func_start debug_sub_815F788
-debug_sub_815F788:
- push {lr}
- mov r0, #0x2
- mov r1, #0x5
- mov r2, #0xb
- mov r3, #0x6
- bl Menu_BlankWindowRect
- ldr r0, ._68 @ Str_843E574
- ldr r1, ._68 + 4 @ _nakamuraData2
- ldrb r1, [r1]
- add r1, r1, #0x2
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- mov r2, #0x5
- bl Menu_PrintText
- pop {r0}
- bx r0
-._69:
- .align 2, 0
-._68:
- .word Str_843E574
- .word _nakamuraData2
-
- thumb_func_end debug_sub_815F788
-
- thumb_func_start debug_sub_815F7B4
-debug_sub_815F7B4:
- push {lr}
- ldr r0, ._72 @ _nakamuraData1
- ldrb r0, [r0]
- cmp r0, #0
- beq ._70 @cond_branch
- mov r0, #0xb
- mov r1, #0x1
- mov r2, #0xb
- mov r3, #0x2
- bl Menu_BlankWindowRect
- b ._71
-._73:
- .align 2, 0
-._72:
- .word _nakamuraData1
-._70:
- ldr r0, ._74 @ _nakamuraData3
- ldrb r0, [r0]
- lsl r0, r0, #0x1
- ldr r1, ._74 + 4 @ Str_843E576
- add r0, r0, r1
- mov r1, #0xb
- mov r2, #0x1
- bl Menu_PrintText
-._71:
- pop {r0}
- bx r0
-._75:
- .align 2, 0
-._74:
- .word _nakamuraData3
- .word Str_843E576
-
- thumb_func_end debug_sub_815F7B4
-
- thumb_func_start debug_sub_815F7F0
-debug_sub_815F7F0:
- push {r4, r5, lr}
- ldr r1, ._78 @ _nakamuraData0
- ldrb r2, [r1]
- lsl r1, r2, #0x2
- add r1, r1, r2
- lsl r1, r1, #0x5
- ldr r2, ._78 + 4 @ gSaveBlock1
- add r3, r1, r2
- ldrb r1, [r3, #0x3]
- lsl r2, r1, #0x18
- ldrb r1, [r3, #0x2]
- lsl r1, r1, #0x10
- orr r2, r2, r1
- ldrb r1, [r3, #0x1]
- lsl r1, r1, #0x8
- orr r2, r2, r1
- ldrb r1, [r3]
- orr r2, r2, r1
- lsl r0, r0, #0x18
- asr r1, r0, #0x18
- mov r4, #0x9
- ldr r0, ._78 + 8 @ _nakamuraData2
- ldrb r0, [r0]
- cmp r4, r0
- ble ._76 @cond_branch
- add r5, r0, #0
-._77:
- lsl r0, r1, #0x2
- add r0, r0, r1
- lsl r1, r0, #0x1
- lsl r0, r4, #0x18
- mov r4, #0xff
- lsl r4, r4, #0x18
- add r0, r0, r4
- lsr r4, r0, #0x18
- asr r0, r0, #0x18
- cmp r0, r5
- bgt ._77 @cond_branch
-._76:
- add r2, r2, r1
- lsr r0, r2, #0x18
- strb r0, [r3, #0x3]
- mov r0, #0xff
- lsl r0, r0, #0x10
- and r0, r0, r2
- lsr r0, r0, #0x10
- strb r0, [r3, #0x2]
- mov r0, #0xff
- lsl r0, r0, #0x8
- and r0, r0, r2
- lsr r0, r0, #0x8
- strb r0, [r3, #0x1]
- strb r2, [r3]
- bl debug_sub_815F668
- pop {r4, r5}
- pop {r0}
- bx r0
-._79:
- .align 2, 0
-._78:
- .word _nakamuraData0
- .word gSaveBlock1+0x1a11
- .word _nakamuraData2
-
- thumb_func_end debug_sub_815F7F0
-
- thumb_func_start debug_sub_815F86C
-debug_sub_815F86C:
- push {r4, r5, r6, lr}
- lsl r0, r0, #0x18
- ldr r1, ._84 @ _nakamuraData0
- ldrb r2, [r1]
- lsl r1, r2, #0x2
- add r1, r1, r2
- lsl r1, r1, #0x5
- ldr r2, ._84 + 4 @ gSaveBlock1
- add r5, r1, r2
- mov r2, #0x0
- mov r3, #0x0
- lsr r6, r0, #0x18
- asr r0, r0, #0x18
- cmp r0, #0x64
- bne ._80 @cond_branch
- ldr r0, ._84 + 8 @ _nakamuraData2
- ldrb r1, [r0]
- cmp r1, #0x6
- bhi ._100 @cond_branch
- mov r2, #0xff
-._82:
- add r0, r5, r1
- strb r2, [r0]
- add r0, r1, #1
- lsl r0, r0, #0x18
- lsr r1, r0, #0x18
- cmp r1, #0x6
- bls ._82 @cond_branch
- b ._100
-._85:
- .align 2, 0
-._84:
- .word _nakamuraData0
- .word gSaveBlock1+0x1a0a
- .word _nakamuraData2
-._80:
- ldr r0, ._87 @ _nakamuraData3
- ldrb r0, [r0]
- cmp r0, #0x4
- bhi ._98 @cond_branch
- lsl r0, r0, #0x2
- ldr r1, ._87 + 4 @
- add r0, r0, r1
- ldr r0, [r0]
- mov pc, r0
-._88:
- .align 2, 0
-._87:
- .word _nakamuraData3
- .word ._89
-._89:
- .word ._90
- .word ._91
- .word ._92
- .word ._93
- .word ._94
-._90:
- mov r3, #0x1
- mov r2, #0x50
- b ._98
-._91:
- mov r3, #0x51
- mov r2, #0xa0
- b ._98
-._92:
- mov r3, #0xbb
- mov r2, #0xd4
- b ._98
-._93:
- mov r3, #0xd5
- mov r2, #0xee
- b ._98
-._94:
- mov r3, #0xa1
- mov r2, #0xaa
-._98:
- ldr r4, ._101 @ _nakamuraData2
- ldrb r1, [r4]
- add r1, r5, r1
- ldrb r0, [r1]
- add r0, r0, r6
- strb r0, [r1]
- ldrb r0, [r4]
- add r1, r5, r0
- ldrb r0, [r1]
- cmp r0, r3
- bcs ._99 @cond_branch
- strb r2, [r1]
-._99:
- ldrb r0, [r4]
- add r1, r5, r0
- ldrb r0, [r1]
- cmp r0, r2
- bls ._100 @cond_branch
- strb r3, [r1]
-._100:
- bl debug_sub_815F6E4
- pop {r4, r5, r6}
- pop {r0}
- bx r0
-._102:
- .align 2, 0
-._101:
- .word _nakamuraData2
-
- thumb_func_end debug_sub_815F86C
-
- thumb_func_start debug_sub_815F930
-debug_sub_815F930:
- push {r4, r5, lr}
- ldr r0, ._107 @ _nakamuraData1
- ldrb r2, [r0]
- mov r4, #0xa
- cmp r2, #0
- bne ._103 @cond_branch
- mov r4, #0x7
-._103:
- ldr r5, ._107 + 4 @ gMain
- ldrh r1, [r5, #0x30]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._104 @cond_branch
- cmp r2, #0
- beq ._105 @cond_branch
- mov r0, #0x1
- bl debug_sub_815F7F0
- b ._136
-._108:
- .align 2, 0
-._107:
- .word _nakamuraData1
- .word gMain
-._105:
- mov r0, #0x1
- b ._113
-._104:
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._110 @cond_branch
- cmp r2, #0
- beq ._111 @cond_branch
- mov r0, #0x1
- neg r0, r0
- bl debug_sub_815F7F0
- b ._136
-._111:
- mov r0, #0x1
- neg r0, r0
- b ._113
-._110:
- mov r0, #0x20
- and r0, r0, r1
- lsl r0, r0, #0x10
- lsr r3, r0, #0x10
- cmp r3, #0
- beq ._114 @cond_branch
- ldr r1, ._117 @ _nakamuraData2
- ldrb r0, [r1]
- cmp r0, #0
- bne ._115 @cond_branch
- sub r0, r4, #1
- b ._116
-._118:
- .align 2, 0
-._117:
- .word _nakamuraData2
-._115:
- sub r0, r0, #0x1
-._116:
- strb r0, [r1]
-._125:
- bl debug_sub_815F788
- b ._136
-._114:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._120 @cond_branch
- ldr r2, ._123 @ _nakamuraData2
- ldrb r1, [r2]
- sub r0, r4, #1
- cmp r1, r0
- bne ._121 @cond_branch
- strb r3, [r2]
- b ._125
-._124:
- .align 2, 0
-._123:
- .word _nakamuraData2
-._121:
- add r0, r1, #1
- strb r0, [r2]
- b ._125
-._120:
- ldrh r1, [r5, #0x2e]
- mov r0, #0x4
- and r0, r0, r1
- cmp r0, #0
- beq ._126 @cond_branch
- cmp r2, #0
- bne ._127 @cond_branch
- ldr r4, ._129 @ _nakamuraData3
- ldrb r0, [r4]
- add r0, r0, #0x1
- mov r1, #0x5
- bl __modsi3
- strb r0, [r4]
-._127:
- bl debug_sub_815F7B4
- b ._136
-._130:
- .align 2, 0
-._129:
- .word _nakamuraData3
-._126:
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._131 @cond_branch
- mov r0, #0x2
- mov r1, #0x5
- mov r2, #0xb
- mov r3, #0x6
- bl Menu_BlankWindowRect
- mov r0, #0xb
- mov r1, #0x1
- mov r2, #0xb
- mov r3, #0x2
- bl Menu_BlankWindowRect
- ldr r1, ._133 @ gMenuCallback
- ldr r0, ._133 + 4 @ debug_sub_815FA38
- str r0, [r1]
- b ._136
-._134:
- .align 2, 0
-._133:
- .word gMenuCallback
- .word debug_sub_815FA38+1
-._131:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._136 @cond_branch
- cmp r2, #0
- bne ._136 @cond_branch
- mov r0, #0x64
-._113:
- bl debug_sub_815F86C
-._136:
- mov r0, #0x0
- pop {r4, r5}
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815F930
-
- thumb_func_start debug_sub_815FA38
-debug_sub_815FA38:
- push {r4, lr}
- ldr r0, ._139 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._137 @cond_branch
- mov r0, #0x2
- neg r0, r0
- b ._138
-._140:
- .align 2, 0
-._139:
- .word gMain
-._137:
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._141 @cond_branch
- mov r0, #0x2
-._138:
- bl Menu_MoveCursor
-._161:
- mov r0, #0x0
- b ._142
-._141:
- mov r0, #0x20
- and r0, r0, r1
- lsl r0, r0, #0x10
- lsr r2, r0, #0x10
- cmp r2, #0
- beq ._143 @cond_branch
- ldr r1, ._146 @ _nakamuraData0
- ldrb r0, [r1]
- cmp r0, #0
- bne ._144 @cond_branch
- mov r0, #0x13
- b ._148
-._147:
- .align 2, 0
-._146:
- .word _nakamuraData0
-._144:
- sub r0, r0, #0x1
- b ._148
-._143:
- mov r0, #0x10
- and r0, r0, r1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- cmp r4, #0
- beq ._149 @cond_branch
- ldr r1, ._152 @ _nakamuraData0
- ldrb r0, [r1]
- cmp r0, #0x13
- bne ._150 @cond_branch
- strb r2, [r1]
- b ._151
-._153:
- .align 2, 0
-._152:
- .word _nakamuraData0
-._150:
- add r0, r0, #0x1
-._148:
- strb r0, [r1]
-._151:
- bl debug_sub_815F72C
- b ._161
-._149:
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._155 @cond_branch
- ldr r1, ._159 @ _nakamuraData0
- ldrb r0, [r1]
- cmp r0, #0
- beq ._161 @cond_branch
- ldr r2, ._159 + 4 @ gSaveBlock1
- add r1, r0, #0
- lsl r0, r1, #0x2
- add r0, r0, r1
- lsl r0, r0, #0x5
- add r0, r0, r2
- ldr r1, ._159 + 8 @ 0x1a08
- add r0, r0, r1
- ldrb r0, [r0]
- cmp r0, #0
- beq ._161 @cond_branch
- bl Menu_GetCursorPos
- ldr r1, ._159 + 12 @ _nakamuraData1
- strb r0, [r1]
- ldr r0, ._159 + 16 @ _nakamuraData2
- strb r4, [r0]
- bl debug_sub_815F788
- bl debug_sub_815F7B4
- ldr r1, ._159 + 20 @ gMenuCallback
- ldr r0, ._159 + 24 @ debug_sub_815F930
- str r0, [r1]
- b ._161
-._160:
- .align 2, 0
-._159:
- .word _nakamuraData0
- .word gSaveBlock1
- .word 0x1a08
- .word _nakamuraData1
- .word _nakamuraData2
- .word gMenuCallback
- .word debug_sub_815F930+1
-._155:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._161 @cond_branch
- bl CloseMenu
- mov r0, #0x1
-._142:
- pop {r4}
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815FA38
-
- thumb_func_start debug_sub_815FB1C
-debug_sub_815FB1C:
- push {lr}
- add sp, sp, #0xfffffff8
- ldr r0, ._162 @ _nakamuraData0
- mov r1, #0x0
- strb r1, [r0]
- ldr r0, ._162 + 4 @ _nakamuraData3
- strb r1, [r0]
- ldr r1, ._162 + 8 @ gMenuCallback
- ldr r0, ._162 + 12 @ debug_sub_815FA38
- str r0, [r1]
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xc
- mov r3, #0xb
- bl Menu_DrawStdWindowFrame
- bl debug_sub_815F72C
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xb
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0x1
- mov r2, #0x3
- mov r3, #0x3
- bl InitMenu
- mov r0, #0x0
- add sp, sp, #0x8
- pop {r1}
- bx r1
-._163:
- .align 2, 0
-._162:
- .word _nakamuraData0
- .word _nakamuraData3
- .word gMenuCallback
- .word debug_sub_815FA38+1
-
- thumb_func_end debug_sub_815FB1C
-
- thumb_func_start debug_sub_815FB78
-debug_sub_815FB78:
- push {lr}
- ldr r0, ._166 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._164 @cond_branch
- mov r0, #0x1
- neg r0, r0
- b ._165
-._167:
- .align 2, 0
-._166:
- .word gMain
-._164:
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._168 @cond_branch
- mov r0, #0x1
-._165:
- bl Menu_MoveCursor
- mov r0, #0x0
- b ._177
-._168:
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._170 @cond_branch
- bl CloseMenu
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0
- beq ._171 @cond_branch
- cmp r0, #0x1
- beq ._172 @cond_branch
- b ._175
-._171:
- bl debug_sub_814A714
- b ._175
-._172:
- bl ClearRoamerData
- bl ClearRoamerLocationData
- b ._175
-._170:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._176 @cond_branch
- mov r0, #0x0
- b ._177
-._176:
- bl CloseMenu
-._175:
- mov r0, #0x1
-._177:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815FB78
-
- thumb_func_start debug_sub_815FBE8
-debug_sub_815FBE8:
- push {r4, lr}
- add sp, sp, #0xfffffff8
- ldr r1, ._178 @ gMenuCallback
- ldr r0, ._178 + 4 @ debug_sub_815FB78
- str r0, [r1]
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- ldr r4, ._178 + 8 @ gStringVar1
- add r0, r4, #0
- bl debug_sub_814A73C
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xb
- mov r3, #0x9
- bl Menu_DrawStdWindowFrame
- add r0, r4, #0
- mov r1, #0x1
- mov r2, #0x1
- bl Menu_PrintText
- ldr r0, ._178 + 12 @ Str_843E580
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xa
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0x1
- mov r2, #0x3
- mov r3, #0x3
- bl InitMenu
- mov r0, #0x0
- add sp, sp, #0x8
- pop {r4}
- pop {r1}
- bx r1
-._179:
- .align 2, 0
-._178:
- .word gMenuCallback
- .word debug_sub_815FB78+1
- .word gStringVar1
- .word Str_843E580
-
- thumb_func_end debug_sub_815FBE8
-
- thumb_func_start debug_sub_815FC54
-debug_sub_815FC54:
- push {r4, r5, r6, r7, lr}
- mov r3, #0x0
- ldr r7, ._181 @ gSaveBlock1
- mov r6, #0xe8
- lsl r6, r6, #0x3
- ldr r5, ._181 + 4 @ 0x3e7
- ldr r4, ._181 + 8 @ 0x742
-._180:
- lsl r1, r3, #0x2
- add r1, r1, r7
- add r2, r3, #0
- add r2, r2, #0x85
- add r0, r1, r6
- strh r2, [r0]
- add r1, r1, r4
- strh r5, [r1]
- add r0, r3, #1
- lsl r0, r0, #0x10
- lsr r3, r0, #0x10
- cmp r3, #0x2a
- bls ._180 @cond_branch
- bl CloseMenu
- mov r0, #0x1
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._182:
- .align 2, 0
-._181:
- .word gSaveBlock1
- .word 0x3e7
- .word 0x742
-
- thumb_func_end debug_sub_815FC54
-
- thumb_func_start debug_sub_815FC94
-debug_sub_815FC94:
- push {lr}
- bl ClearDecorationInventories
- bl debug_sub_814A3A8
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815FC94
-
- thumb_func_start debug_sub_815FCB4
-debug_sub_815FCB4:
- push {r4, r5, r6, r7, lr}
- mov r7, r9
- mov r6, r8
- push {r6, r7}
- add r4, r0, #0
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- mov r7, #0x0
- ldr r5, ._188 @ gMapHeader
- ldr r0, [r5]
- ldr r0, [r0, #0x4]
- mov r1, #0x3
- bl __divsi3
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- add r1, r0, #0
- mul r1, r1, r4
- lsl r1, r1, #0x10
- lsr r6, r1, #0x10
- add r0, r6, r0
- mov r9, r5
- cmp r6, r0
- bge ._183 @cond_branch
- mov r8, r0
-._187:
- mov r4, #0x0
- mov r1, r9
- ldr r0, [r1]
- ldr r0, [r0]
- add r5, r6, #1
- cmp r4, r0
- bge ._184 @cond_branch
- ldr r0, ._188 @ gMapHeader
- mov r9, r0
-._186:
- add r0, r4, #7
- add r1, r6, #7
- bl MapGridGetMetatileBehaviorAt
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl sub_805759C
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x1
- bne ._185 @cond_branch
- add r0, r7, #1
- lsl r0, r0, #0x10
- lsr r7, r0, #0x10
-._185:
- add r0, r4, #1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- ldr r0, ._188 @ gMapHeader
- ldr r0, [r0]
- ldr r0, [r0]
- cmp r4, r0
- blt ._186 @cond_branch
-._184:
- lsl r0, r5, #0x10
- lsr r6, r0, #0x10
- cmp r6, r8
- blt ._187 @cond_branch
-._183:
- add r0, r7, #0
- pop {r3, r4}
- mov r8, r3
- mov r9, r4
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._189:
- .align 2, 0
-._188:
- .word gMapHeader
-
- thumb_func_end debug_sub_815FCB4
-
- thumb_func_start debug_sub_815FD40
-debug_sub_815FD40:
- push {r4, r5, r6, r7, lr}
- add sp, sp, #0xfffffffc
- mov r6, #0x0
- mov r4, sp
- add r4, r4, #0x2
- mov r0, sp
- add r1, r4, #0
- bl GetXYCoordsOneStepInFrontOfPlayer
- mov r1, sp
- mov r0, sp
- ldrh r0, [r0]
- sub r0, r0, #0x7
- strh r0, [r1]
- ldrh r0, [r4]
- sub r0, r0, #0x7
- strh r0, [r4]
- mov r5, #0x0
- ldr r1, ._192 @ gMapHeader
- ldr r0, [r1]
- ldr r0, [r0, #0x4]
- add r7, r4, #0
- cmp r6, r0
- bge ._190 @cond_branch
-._199:
- mov r4, #0x0
- ldr r0, [r1]
- b ._191
-._193:
- .align 2, 0
-._192:
- .word gMapHeader
-._198:
- add r0, r4, #7
- add r1, r5, #7
- bl MapGridGetMetatileBehaviorAt
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl sub_805759C
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x1
- bne ._196 @cond_branch
- add r0, r6, #1
- lsl r0, r0, #0x10
- lsr r6, r0, #0x10
- mov r0, sp
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, r4
- bne ._196 @cond_branch
- mov r1, #0x0
- ldsh r0, [r7, r1]
- cmp r0, r5
- bne ._196 @cond_branch
- add r0, r6, #0
- b ._197
-._196:
- add r0, r4, #1
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- ldr r0, ._200 @ gMapHeader
- ldr r0, [r0]
-._191:
- ldr r0, [r0]
- cmp r4, r0
- blt ._198 @cond_branch
- add r0, r5, #1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- ldr r1, ._200 @ gMapHeader
- ldr r0, [r1]
- ldr r0, [r0, #0x4]
- cmp r5, r0
- blt ._199 @cond_branch
-._190:
- add r0, r6, #1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
-._197:
- add sp, sp, #0x4
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._201:
- .align 2, 0
-._200:
- .word gMapHeader
-
- thumb_func_end debug_sub_815FD40
-
- thumb_func_start debug_sub_815FDE4
-debug_sub_815FDE4:
- push {lr}
- ldr r0, ._205 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- bne ._202 @cond_branch
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._203 @cond_branch
-._202:
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
- b ._204
-._206:
- .align 2, 0
-._205:
- .word gMain
-._203:
- mov r0, #0x0
-._204:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_815FDE4
-
- thumb_func_start debug_sub_815FE1C
-debug_sub_815FE1C:
- push {r4, r5, r6, r7, lr}
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x10
- mov r3, #0x13
- bl Menu_DrawStdWindowFrame
- ldr r0, ._210 @ Str_843E58D
- mov r1, #0x1
- mov r2, #0x1
- bl Menu_PrintText
- ldr r6, ._210 + 4 @ gStringVar1
- mov r0, #0x0
- bl debug_sub_815FCB4
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x5
- mov r2, #0x3
- bl Menu_PrintText
- mov r0, #0x1
- bl debug_sub_815FCB4
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x5
- mov r2, #0x5
- bl Menu_PrintText
- mov r0, #0x2
- bl debug_sub_815FCB4
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0x5
- mov r2, #0x7
- bl Menu_PrintText
- mov r0, #0x0
- bl debug_sub_8092344
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0xb
- mov r2, #0x3
- bl Menu_PrintText
- mov r0, #0x1
- bl debug_sub_8092344
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0xb
- mov r2, #0x5
- bl Menu_PrintText
- mov r0, #0x2
- bl debug_sub_8092344
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r6, #0
- mov r1, #0xb
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._210 + 8 @ gSaveBlock1
- ldr r1, ._210 + 12 @ 0x2dd6
- add r0, r0, r1
- ldrh r0, [r0]
- bl FeebasSeedRng
- mov r0, #0x0
- bl debug_sub_815FCB4
- add r4, r0, #0
- mov r0, #0x1
- bl debug_sub_815FCB4
- add r5, r0, #0
- mov r0, #0x2
- bl debug_sub_815FCB4
- add r4, r4, r5
- add r0, r0, r4
- lsl r0, r0, #0x10
- lsr r7, r0, #0x10
- mov r5, #0x0
-._209:
- bl FeebasRandom
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- add r1, r7, #0
- bl __umodsi3
- lsl r0, r0, #0x10
- lsr r1, r0, #0x10
- cmp r1, #0
- bne ._207 @cond_branch
- add r1, r7, #0
-._207:
- sub r0, r1, #1
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r0, #0x2
- bls ._208 @cond_branch
- add r0, r6, #0
- mov r2, #0x1
- mov r3, #0x4
- bl ConvertIntToDecimalStringN
- add r0, r5, #0
- mov r1, #0x3
- bl __umodsi3
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- lsl r4, r0, #0x2
- add r4, r4, r0
- add r4, r4, #0x2
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- add r0, r5, #0
- mov r1, #0x3
- bl __udivsi3
- add r2, r0, #0
- lsl r2, r2, #0x19
- mov r0, #0xb0
- lsl r0, r0, #0x14
- add r2, r2, r0
- lsr r2, r2, #0x18
- add r0, r6, #0
- add r1, r4, #0
- bl Menu_PrintText
- add r0, r5, #1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
-._208:
- cmp r5, #0x6
- bne ._209 @cond_branch
- ldr r4, ._210 + 4 @ gStringVar1
- bl debug_sub_815FD40
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r0, r4, #0
- mov r2, #0x1
- mov r3, #0x4
- bl ConvertIntToDecimalStringN
- add r0, r4, #0
- mov r1, #0x2
- mov r2, #0x11
- bl Menu_PrintText
- ldr r1, ._210 + 16 @ gMenuCallback
- ldr r0, ._210 + 20 @ debug_sub_815FDE4
- str r0, [r1]
- mov r0, #0x0
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._211:
- .align 2, 0
-._210:
- .word Str_843E58D
- .word gStringVar1
- .word gSaveBlock1
- .word 0x2dd6
- .word gMenuCallback
- .word debug_sub_815FDE4+1
-
- thumb_func_end debug_sub_815FE1C
-
- thumb_func_start debug_sub_815FFDC
-debug_sub_815FFDC:
- push {r4, r5, r6, r7, lr}
- mov r7, r8
- push {r7}
- mov r0, #0xe
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0xd
- bl Menu_DrawStdWindowFrame
- mov r0, #0x0
- mov r1, #0xe
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_DrawStdWindowFrame
- ldr r0, ._214 @ Str_843E5D4
- mov r1, #0x1
- mov r2, #0xf
- bl Menu_PrintText
- mov r5, #0x0
- ldr r0, ._214 + 4 @ _nakamuraStatic0
- mov r8, r0
-._216:
- mov r0, #0x64
- add r1, r5, #0
- mul r1, r1, r0
- ldr r0, ._214 + 8 @ gPlayerParty
- add r6, r1, r0
- add r0, r6, #0
- mov r1, #0xb
- bl GetMonData
- lsl r1, r5, #0x2
- mov r2, r8
- add r4, r1, r2
- strh r0, [r4]
- lsl r0, r0, #0x10
- add r7, r1, #0
- cmp r0, #0
- beq ._212 @cond_branch
- add r0, r6, #0
- mov r1, #0x38
- bl GetMonData
- strb r0, [r4, #0x2]
- add r0, r5, #0
- bl debug_sub_816009C
- add r0, r5, #0
- bl debug_sub_81600D0
- add r0, r5, #0
- bl debug_sub_816013C
- b ._213
-._215:
- .align 2, 0
-._214:
- .word Str_843E5D4
- .word _nakamuraStatic0
- .word gPlayerParty
-._212:
- mov r0, #0x1
- strb r0, [r4, #0x2]
-._213:
- mov r0, r8
- add r1, r7, r0
- mov r0, #0x0
- strb r0, [r1, #0x3]
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x5
- bls ._216 @cond_branch
- ldr r1, ._217 @ _nakamuraData4
- mov r0, #0x0
- strb r0, [r1]
- mov r0, #0xf
- mov r1, #0x1
- mov r2, #0xff
- bl PrintTriangleCursorWithPalette
- ldr r1, ._217 + 4 @ gMenuCallback
- ldr r0, ._217 + 8 @ debug_sub_8160498
- str r0, [r1]
- pop {r3}
- mov r8, r3
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-._218:
- .align 2, 0
-._217:
- .word _nakamuraData4
- .word gMenuCallback
- .word debug_sub_8160498+1
-
- thumb_func_end debug_sub_815FFDC
-
- thumb_func_start debug_sub_816009C
-debug_sub_816009C:
- push {lr}
- add r2, r0, #0
- lsl r2, r2, #0x18
- lsr r2, r2, #0x18
- ldr r1, ._219 @ _nakamuraStatic0
- lsl r0, r2, #0x2
- add r0, r0, r1
- mov r3, #0x0
- ldsh r1, [r0, r3]
- mov r0, #0xb
- mul r0, r0, r1
- ldr r1, ._219 + 4 @ gSpeciesNames
- add r0, r0, r1
- lsl r2, r2, #0x1
- add r2, r2, #0x1
- lsl r2, r2, #0x18
- lsr r2, r2, #0x18
- mov r1, #0x10
- bl Menu_PrintText
- pop {r0}
- bx r0
-._220:
- .align 2, 0
-._219:
- .word _nakamuraStatic0
- .word gSpeciesNames
-
- thumb_func_end debug_sub_816009C
-
- thumb_func_start debug_sub_81600D0
-debug_sub_81600D0:
- push {r4, r5, lr}
- add sp, sp, #0xfffffffc
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- add r5, r4, #0
- ldr r1, ._223 @ Str_843E5F0
- mov r0, sp
- mov r2, #0x2
- bl memcpy
- mov r0, #0x64
- mul r0, r0, r4
- ldr r1, ._223 + 4 @ gPlayerParty
- add r0, r0, r1
- bl GetMonGender
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0
- bne ._221 @cond_branch
- ldr r0, ._223 + 8 @ gOtherText_MaleSymbol2
- b ._222
-._224:
- .align 2, 0
-._223:
- .word Str_843E5F0
- .word gPlayerParty
- .word gOtherText_MaleSymbol2
-._221:
- cmp r0, #0xfe
- bne ._225 @cond_branch
- ldr r0, ._227 @ gOtherText_FemaleSymbolAndLv
-._222:
- lsl r2, r4, #0x1
- add r2, r2, #0x1
- lsl r2, r2, #0x18
- lsr r2, r2, #0x18
- mov r1, #0x17
- bl Menu_PrintText
- b ._226
-._228:
- .align 2, 0
-._227:
- .word gOtherText_FemaleSymbolAndLv
-._225:
- lsl r2, r5, #0x1
- add r2, r2, #0x1
- lsl r2, r2, #0x18
- lsr r2, r2, #0x18
- mov r0, sp
- mov r1, #0x17
- bl Menu_PrintText
-._226:
- add sp, sp, #0x4
- pop {r4, r5}
- pop {r0}
- bx r0
-
- thumb_func_end debug_sub_81600D0
-
- thumb_func_start debug_sub_816013C
-debug_sub_816013C:
- push {r4, r5, lr}
- add r4, r0, #0
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- ldr r5, ._229 @ gStringVar1
- ldr r1, ._229 + 4 @ _nakamuraStatic0
- lsl r0, r4, #0x2
- add r0, r0, r1
- mov r1, #0x2
- ldrsb r1, [r0, r1]
- add r0, r5, #0
- mov r2, #0x1
- mov r3, #0x3
- bl ConvertIntToDecimalStringN
- lsl r4, r4, #0x1
- add r4, r4, #0x1
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- add r0, r5, #0
- mov r1, #0x1a
- add r2, r4, #0
- bl Menu_PrintText
- pop {r4, r5}
- pop {r0}
- bx r0
-._230:
- .align 2, 0
-._229:
- .word gStringVar1
- .word _nakamuraStatic0
-
- thumb_func_end debug_sub_816013C
-
- thumb_func_start debug_sub_816017C
-debug_sub_816017C:
- push {r4, lr}
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- lsl r3, r4, #0x1
- add r1, r3, #1
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- add r3, r3, #0x2
- lsl r3, r3, #0x18
- lsr r3, r3, #0x18
- mov r0, #0x10
- mov r2, #0x1c
- bl Menu_BlankWindowRect
- ldr r1, ._232 @ _nakamuraStatic0
- lsl r0, r4, #0x2
- add r0, r0, r1
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0
- beq ._231 @cond_branch
- add r0, r4, #0
- bl debug_sub_816009C
- add r0, r4, #0
- bl debug_sub_81600D0
- add r0, r4, #0
- bl debug_sub_816013C
-._231:
- mov r0, #0x5
- bl debug_sub_81603B8
- pop {r4}
- pop {r0}
- bx r0
-._233:
- .align 2, 0
-._232:
- .word _nakamuraStatic0
-
- thumb_func_end debug_sub_816017C
-
- thumb_func_start debug_sub_81601C8
-debug_sub_81601C8:
- push {r4, r5, lr}
- add sp, sp, #0xfffffff0
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- lsl r1, r1, #0x18
- lsr r3, r1, #0x18
- ldr r1, ._239 @ _nakamuraStatic0
- lsl r0, r5, #0x2
- add r2, r0, r1
- mov r4, #0x0
- ldsh r0, [r2, r4]
- cmp r0, #0
- bne ._236 @cond_branch
- ldrb r0, [r2, #0x3]
- cmp r0, #0
- bne ._236 @cond_branch
- cmp r3, #0x1
- bne ._236 @cond_branch
- mov r0, #0x8a
- lsl r0, r0, #0x1
- strh r0, [r2]
-._236:
- lsl r0, r5, #0x2
- add r4, r0, r1
- lsl r0, r3, #0x18
- asr r0, r0, #0x18
- ldrh r1, [r4]
- add r2, r0, r1
- mov r3, #0x0
- strh r2, [r4]
- lsl r1, r2, #0x10
- mov r0, #0xcd
- lsl r0, r0, #0x11
- cmp r1, r0
- ble ._237 @cond_branch
- ldr r1, ._239 + 4 @ 0xfffffe65
- add r0, r2, r1
- strh r0, [r4]
-._237:
- ldrh r1, [r4]
- mov r2, #0x0
- ldsh r0, [r4, r2]
- cmp r0, #0
- bge ._238 @cond_branch
- ldr r2, ._239 + 8 @ 0x19b
- add r0, r1, r2
- strh r0, [r4]
-._238:
- mov r0, #0x64
- mul r0, r0, r5
- ldr r1, ._239 + 12 @ gPlayerParty
- add r0, r0, r1
- ldrh r1, [r4]
- ldrb r2, [r4, #0x2]
- str r3, [sp]
- str r3, [sp, #0x4]
- str r3, [sp, #0x8]
- str r3, [sp, #0xc]
- mov r3, #0x20
- bl CreateMon
- mov r0, #0x1
- strb r0, [r4, #0x3]
- add sp, sp, #0x10
- pop {r4, r5}
- pop {r0}
- bx r0
-._240:
- .align 2, 0
-._239:
- .word _nakamuraStatic0
- .word 0xfffffe65
- .word 0x19b
- .word gPlayerParty
-
- thumb_func_end debug_sub_81601C8
-
- thumb_func_start debug_sub_8160258
-debug_sub_8160258:
- push {lr}
- lsl r0, r0, #0x18
- lsr r2, r0, #0x18
- ldr r1, ._242 @ _nakamuraStatic0
- lsl r0, r2, #0x2
- add r0, r0, r1
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0
- beq ._241 @cond_branch
- add r0, r2, #0
- bl debug_sub_816062C
-._241:
- pop {r0}
- bx r0
-._243:
- .align 2, 0
-._242:
- .word _nakamuraStatic0
-
- thumb_func_end debug_sub_8160258
-
- thumb_func_start debug_sub_816027C
-debug_sub_816027C:
- push {r4, lr}
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- add r4, r0, #0
- lsl r1, r1, #0x18
- lsr r2, r1, #0x18
- ldr r1, ._247 @ _nakamuraStatic0
- lsl r0, r4, #0x2
- add r3, r0, r1
- mov r1, #0x0
- ldsh r0, [r3, r1]
- cmp r0, #0
- beq ._244 @cond_branch
- lsl r0, r2, #0x18
- asr r0, r0, #0x18
- ldrb r1, [r3, #0x2]
- add r0, r0, r1
- strb r0, [r3, #0x2]
- lsl r0, r0, #0x18
- asr r0, r0, #0x18
- cmp r0, #0x64
- ble ._245 @cond_branch
- mov r0, #0x1
- strb r0, [r3, #0x2]
-._245:
- mov r0, #0x2
- ldrsb r0, [r3, r0]
- cmp r0, #0
- bgt ._246 @cond_branch
- mov r0, #0x64
- strb r0, [r3, #0x2]
-._246:
- mov r0, #0x64
- mul r4, r4, r0
- ldr r0, ._247 + 4 @ gPlayerParty
- add r4, r4, r0
- ldr r2, ._247 + 8 @ gBaseStats
- mov r0, #0x0
- ldsh r1, [r3, r0]
- lsl r0, r1, #0x3
- sub r0, r0, r1
- lsl r0, r0, #0x2
- add r0, r0, r2
- ldrb r1, [r0, #0x13]
- mov r0, #0xca
- lsl r0, r0, #0x1
- add r2, r1, #0
- mul r2, r2, r0
- mov r0, #0x2
- ldrsb r0, [r3, r0]
- lsl r0, r0, #0x2
- ldr r1, ._247 + 12 @ gExperienceTables
- add r0, r0, r1
- add r2, r2, r0
- add r0, r4, #0
- mov r1, #0x19
- bl SetMonData
- add r0, r4, #0
- bl debug_sub_803F55C
-._244:
- pop {r4}
- pop {r0}
- bx r0
-._248:
- .align 2, 0
-._247:
- .word _nakamuraStatic0
- .word gPlayerParty
- .word gBaseStats
- .word gExperienceTables
-
- thumb_func_end debug_sub_816027C
-
- thumb_func_start debug_sub_8160308
-debug_sub_8160308:
- push {r4, r5, r6, r7, lr}
- mov r7, r9
- mov r6, r8
- push {r6, r7}
- add sp, sp, #0xffffff8c
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- mov r2, #0x0
-._252:
- add r1, r2, #1
- lsl r0, r1, #0x18
- lsr r5, r0, #0x18
- mov r8, r1
- cmp r5, #0x5
- bhi ._249 @cond_branch
- mov r0, #0x64
- mov r9, r0
- mov r0, r9
- mul r0, r0, r2
- ldr r7, ._254 @ gPlayerParty
- add r6, r0, r7
-._251:
- add r0, r6, #0
- mov r1, #0xb
- mov r2, #0x0
- bl GetMonData
- cmp r0, #0
- bne ._250 @cond_branch
- add r0, sp, #0x10
- add r1, r6, #0
- mov r2, #0x64
- bl memcpy
- mov r4, r9
- mul r4, r4, r5
- add r4, r4, r7
- add r0, r6, #0
- add r1, r4, #0
- mov r2, #0x64
- bl memcpy
- add r0, r4, #0
- add r1, sp, #0x10
- mov r2, #0x64
- bl memcpy
-._250:
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x5
- bls ._251 @cond_branch
-._249:
- mov r1, r8
- lsl r0, r1, #0x18
- lsr r2, r0, #0x18
- cmp r2, #0x4
- bls ._252 @cond_branch
- bl CalculatePlayerPartyCount
- ldr r4, ._254 + 4 @ gPlayerPartyCount
- ldrb r1, [r4]
- cmp r1, #0
- bne ._253 @cond_branch
- ldr r0, ._254 @ gPlayerParty
- str r1, [sp]
- str r1, [sp, #0x4]
- str r1, [sp, #0x8]
- str r1, [sp, #0xc]
- mov r1, #0x1
- mov r2, #0xa
- mov r3, #0x20
- bl CreateMon
- mov r0, #0x1
- strb r0, [r4]
-._253:
- add sp, sp, #0x74
- pop {r3, r4}
- mov r8, r3
- mov r9, r4
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-._255:
- .align 2, 0
-._254:
- .word gPlayerParty
- .word gPlayerPartyCount
-
- thumb_func_end debug_sub_8160308
-
- thumb_func_start debug_sub_81603B8
-debug_sub_81603B8:
- push {r4, r5, r6, r7, lr}
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- mov r0, #0x5
- bl PlaySE
- ldr r7, ._259 @ _nakamuraData4
- ldrb r4, [r7]
- add r0, r4, #0
- mov r1, #0x6
- bl __udivsi3
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- add r0, r4, #0
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- ldr r0, ._259 + 4 @ _843E5D1
- add r0, r5, r0
- ldrb r2, [r0]
- lsl r3, r4, #0x1
- add r1, r3, #1
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- add r3, r3, #0x2
- lsl r3, r3, #0x18
- lsr r3, r3, #0x18
- add r0, r2, #0
- bl Menu_BlankWindowRect
- cmp r6, #0
- bne ._256 @cond_branch
- cmp r4, #0
- beq ._257 @cond_branch
- ldrb r0, [r7]
- sub r0, r0, #0x1
- b ._258
-._260:
- .align 2, 0
-._259:
- .word _nakamuraData4
- .word _843E5D1
-._257:
- lsl r0, r5, #0x1
- add r0, r0, r5
- lsl r0, r0, #0x1
- add r0, r0, #0x5
-._258:
- strb r0, [r7]
-._256:
- ldr r1, ._264 @ _nakamuraData4
- cmp r6, #0x1
- bne ._261 @cond_branch
- cmp r4, #0x5
- beq ._262 @cond_branch
- ldrb r0, [r1]
- add r0, r0, #0x1
- b ._263
-._265:
- .align 2, 0
-._264:
- .word _nakamuraData4
-._262:
- lsl r0, r5, #0x1
- add r0, r0, r5
- lsl r0, r0, #0x1
-._263:
- strb r0, [r1]
-._261:
- cmp r6, #0x2
- bne ._266 @cond_branch
- cmp r5, #0
- beq ._267 @cond_branch
- ldrb r0, [r1]
- sub r0, r0, #0x6
- b ._268
-._267:
- add r0, r4, #0
- add r0, r0, #0xc
-._268:
- strb r0, [r1]
-._266:
- cmp r6, #0x3
- bne ._271 @cond_branch
- cmp r5, #0x2
- beq ._270 @cond_branch
- ldrb r0, [r1]
- add r0, r0, #0x6
- strb r0, [r1]
- b ._271
-._270:
- strb r4, [r1]
-._271:
- ldrb r4, [r1]
- add r0, r4, #0
- mov r1, #0x6
- bl __udivsi3
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- add r0, r4, #0
- mov r1, #0x6
- bl __umodsi3
- add r1, r0, #0
- lsl r1, r1, #0x18
- ldr r0, ._272 @ _843E5D1
- add r0, r5, r0
- ldrb r0, [r0]
- lsr r1, r1, #0x17
- add r1, r1, #0x1
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- mov r2, #0xff
- bl PrintTriangleCursorWithPalette
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-._273:
- .align 2, 0
-._272:
- .word _843E5D1
-
- thumb_func_end debug_sub_81603B8
-
- thumb_func_start debug_sub_8160498
-debug_sub_8160498:
- push {r4, lr}
- ldr r1, ._276 @ gMain
- ldrh r2, [r1, #0x2e]
- mov r0, #0x40
- and r0, r0, r2
- cmp r0, #0
- beq ._274 @cond_branch
- mov r0, #0x0
- b ._281
-._277:
- .align 2, 0
-._276:
- .word gMain
-._274:
- mov r0, #0x80
- and r0, r0, r2
- cmp r0, #0
- beq ._278 @cond_branch
- mov r0, #0x1
- b ._281
-._278:
- mov r0, #0x20
- and r0, r0, r2
- cmp r0, #0
- beq ._280 @cond_branch
- mov r0, #0x2
- b ._281
-._280:
- mov r0, #0x10
- and r0, r0, r2
- cmp r0, #0
- beq ._282 @cond_branch
- mov r0, #0x3
-._281:
- bl debug_sub_81603B8
- mov r0, #0x0
- b ._311
-._282:
- ldrh r1, [r1, #0x30]
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._284 @cond_branch
- ldr r4, ._289 @ _nakamuraData4
- ldrb r0, [r4]
- cmp r0, #0x5
- bhi ._285 @cond_branch
- mov r1, #0x1
- bl debug_sub_81601C8
-._285:
- ldrb r0, [r4]
- sub r0, r0, #0x6
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._286 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl debug_sub_8160258
-._286:
- ldrb r0, [r4]
- sub r0, r0, #0xc
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._306 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
- b ._300
-._290:
- .align 2, 0
-._289:
- .word _nakamuraData4
-._284:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._291 @cond_branch
- ldr r4, ._294 @ _nakamuraData4
- ldrb r0, [r4]
- cmp r0, #0x5
- bhi ._304 @cond_branch
- mov r1, #0x1
- neg r1, r1
- b ._293
-._295:
- .align 2, 0
-._294:
- .word _nakamuraData4
-._291:
- mov r0, #0x80
- lsl r0, r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._296 @cond_branch
- ldr r4, ._301 @ _nakamuraData4
- ldrb r0, [r4]
- cmp r0, #0x5
- bhi ._297 @cond_branch
- mov r1, #0xa
- bl debug_sub_81601C8
-._297:
- ldrb r0, [r4]
- sub r0, r0, #0x6
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._298 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl debug_sub_8160258
-._298:
- ldrb r0, [r4]
- sub r0, r0, #0xc
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._306 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
- b ._300
-._302:
- .align 2, 0
-._301:
- .word _nakamuraData4
-._296:
- mov r0, #0x80
- lsl r0, r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._303 @cond_branch
- ldr r4, ._308 @ _nakamuraData4
- ldrb r0, [r4]
- cmp r0, #0x5
- bhi ._304 @cond_branch
- mov r1, #0xa
- neg r1, r1
-._293:
- bl debug_sub_81601C8
-._304:
- ldrb r0, [r4]
- sub r0, r0, #0x6
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._305 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl debug_sub_8160258
-._305:
- ldrb r0, [r4]
- sub r0, r0, #0xc
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x5
- bhi ._306 @cond_branch
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
- neg r1, r1
-._300:
- bl debug_sub_816027C
-._306:
- ldrb r0, [r4]
- mov r1, #0x6
- bl __umodsi3
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl debug_sub_816017C
- mov r0, #0x0
- b ._311
-._309:
- .align 2, 0
-._308:
- .word _nakamuraData4
-._303:
- mov r0, #0x8
- and r0, r0, r2
- cmp r0, #0
- bne ._310 @cond_branch
- mov r0, #0x0
- b ._311
-._310:
- bl debug_sub_8160308
- bl CloseMenu
- mov r0, #0x1
-._311:
- pop {r4}
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_8160498
-
- thumb_func_start debug_sub_816062C
-debug_sub_816062C:
- push {r4, r5, r6, r7, lr}
- mov r7, r9
- mov r6, r8
- push {r6, r7}
- add sp, sp, #0xfffffff0
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r8, r0
- mov r0, #0x64
- mov r4, r8
- mul r4, r4, r0
- ldr r0, ._316 @ gPlayerParty
- add r4, r4, r0
- add r0, r4, #0
- mov r1, #0xb
- bl GetMonData
- lsl r0, r0, #0x10
- lsr r7, r0, #0x10
- add r0, r4, #0
- bl GetMonGender
- lsl r0, r0, #0x18
- lsr r2, r0, #0x18
- ldr r1, ._316 + 4 @ gBaseStats
- lsl r0, r7, #0x3
- sub r0, r0, r7
- lsl r0, r0, #0x2
- add r0, r0, r1
- ldrb r6, [r0, #0x10]
- cmp r6, #0
- beq ._313 @cond_branch
- cmp r6, #0xfe
- beq ._313 @cond_branch
- cmp r6, #0xff
- bne ._314 @cond_branch
-._313:
- mov r0, #0x64
- mov r1, r8
- mul r1, r1, r0
- add r0, r1, #0
- ldr r1, ._316 @ gPlayerParty
- add r0, r0, r1
- bl GetMonGender
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- b ._320
-._317:
- .align 2, 0
-._316:
- .word gPlayerParty
- .word gBaseStats
-._314:
- cmp r2, #0
- beq ._318 @cond_branch
- cmp r2, #0xfe
- beq ._319 @cond_branch
- mov r0, #0x0
- b ._320
-._318:
- mov r6, #0xfe
- b ._321
-._319:
- mov r6, #0x0
-._321:
- mov r0, r8
- lsl r0, r0, #0x2
- mov r9, r0
-._322:
- bl Random
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- bl Random
- lsl r0, r0, #0x10
- orr r5, r5, r0
- add r0, r7, #0
- add r1, r5, #0
- bl GetGenderFromSpeciesAndPersonality
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, r6
- bne ._322 @cond_branch
- mov r0, #0x64
- mov r4, r8
- mul r4, r4, r0
- ldr r0, ._323 @ gPlayerParty
- add r4, r4, r0
- add r0, r4, #0
- mov r1, #0x42
- bl GetMonData
- ldr r0, ._323 + 4 @ _nakamuraStatic0
- add r0, r0, r9
- ldrh r1, [r0]
- ldrb r2, [r0, #0x2]
- mov r0, #0x1
- str r0, [sp]
- str r5, [sp, #0x4]
- mov r0, #0x0
- str r0, [sp, #0x8]
- str r0, [sp, #0xc]
- add r0, r4, #0
- mov r3, #0x20
- bl CreateMon
- add r0, r6, #0
-._320:
- add sp, sp, #0x10
- pop {r3, r4}
- mov r8, r3
- mov r9, r4
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._324:
- .align 2, 0
-._323:
- .word gPlayerParty
- .word _nakamuraStatic0
-
- thumb_func_end debug_sub_816062C
-
- thumb_func_start debug_sub_8160714
-debug_sub_8160714:
- push {r4, r5, r6, r7, lr}
- mov r7, r9
- mov r6, r8
- push {r6, r7}
- add sp, sp, #0xfffffff0
- add r6, r0, #0
- mov r9, r1
- mov r7, #0x0
- mov r0, #0x0
- mov r8, r0
- mov r2, #0x0
- mov r5, #0x0
-._329:
- add r4, r5, #1
- lsl r1, r4, #0x18
- lsr r1, r1, #0x18
- mov r0, r9
- str r2, [sp, #0xc]
- bl GetPokeblockData
- add r1, r0, #0
- lsl r0, r5, #0x1
- add r0, r0, sp
- strh r1, [r0]
- ldr r2, [sp, #0xc]
- cmp r5, #0x5
- beq ._328 @cond_branch
- lsl r0, r1, #0x10
- asr r1, r0, #0x10
- cmp r1, #0
- ble ._326 @cond_branch
- add r0, r7, #1
- lsl r0, r0, #0x18
- lsr r7, r0, #0x18
-._326:
- cmp r1, #0
- bge ._327 @cond_branch
- mov r0, r8
- add r0, r0, #0x1
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r8, r0
-._327:
- cmp r1, #0
- bne ._328 @cond_branch
- add r0, r2, #1
- lsl r0, r0, #0x18
- lsr r2, r0, #0x18
-._328:
- lsl r0, r4, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x5
- bls ._329 @cond_branch
- mov r0, sp
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0x31
- bgt ._333 @cond_branch
- mov r0, sp
- ldrh r0, [r0, #0x2]
- lsl r0, r0, #0x10
- asr r0, r0, #0x10
- cmp r0, #0x31
- bgt ._333 @cond_branch
- mov r0, sp
- mov r4, #0x4
- ldsh r0, [r0, r4]
- cmp r0, #0x31
- bgt ._333 @cond_branch
- mov r0, sp
- mov r1, #0x6
- ldsh r0, [r0, r1]
- cmp r0, #0x31
- bgt ._333 @cond_branch
- mov r0, sp
- mov r4, #0x8
- ldsh r0, [r0, r4]
- cmp r0, #0x31
- ble ._334 @cond_branch
-._333:
- ldr r1, ._336 @ ContestStatsText_GoldPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0xe
- b ._400
-._337:
- .align 2, 0
-._336:
- .word ContestStatsText_GoldPokeBlock
-._334:
- cmp r7, #0x4
- bne ._338 @cond_branch
- ldr r1, ._340 @ ContestStatsText_WhitePokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0xd
- b ._400
-._341:
- .align 2, 0
-._340:
- .word ContestStatsText_WhitePokeBlock
-._338:
- mov r3, #0x0
- mov r5, #0x0
-._343:
- lsl r0, r5, #0x1
- add r0, r0, sp
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0x2
- bne ._342 @cond_branch
- add r0, r3, #1
- lsl r0, r0, #0x18
- lsr r3, r0, #0x18
-._342:
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x4
- bls ._343 @cond_branch
- cmp r3, #0x3
- beq ._345 @cond_branch
- cmp r2, #0x5
- beq ._345 @cond_branch
- mov r4, r8
- cmp r4, #0x4
- bne ._346 @cond_branch
-._345:
- ldr r1, ._348 @ ContestStatsText_BlackPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0xc
- b ._400
-._349:
- .align 2, 0
-._348:
- .word ContestStatsText_BlackPokeBlock
-._346:
- cmp r7, #0x3
- bne ._350 @cond_branch
- ldr r1, ._352 @ ContestStatsText_GrayPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0xb
- b ._400
-._353:
- .align 2, 0
-._352:
- .word ContestStatsText_GrayPokeBlock
-._350:
- cmp r7, #0x2
- beq ._354 @cond_branch
- mov r0, r8
- cmp r0, #0x2
- bne ._377 @cond_branch
-._354:
- mov r3, #0x6
- mov r2, #0x0
- mov r5, #0x0
-._359:
- lsl r0, r5, #0x1
- add r0, r0, sp
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0
- beq ._358 @cond_branch
- cmp r3, #0x6
- bne ._357 @cond_branch
- add r3, r5, #0
- b ._358
-._357:
- add r2, r5, #0
-._358:
- add r0, r5, #1
- lsl r0, r0, #0x18
- lsr r5, r0, #0x18
- cmp r5, #0x4
- bls ._359 @cond_branch
- lsl r0, r3, #0x1
- mov r4, sp
- add r1, r4, r0
- lsl r0, r2, #0x1
- add r0, r0, sp
- mov r4, #0x0
- ldsh r1, [r1, r4]
- mov r4, #0x0
- ldsh r0, [r0, r4]
- cmp r1, r0
- blt ._360 @cond_branch
- add r2, r3, #0
-._360:
- cmp r2, #0
- bne ._361 @cond_branch
- ldr r1, ._363 @ ContestStatsText_PurplePokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x6
- b ._400
-._364:
- .align 2, 0
-._363:
- .word ContestStatsText_PurplePokeBlock
-._361:
- cmp r2, #0x1
- bne ._365 @cond_branch
- ldr r1, ._367 @ ContestStatsText_IndigoPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x7
- b ._400
-._368:
- .align 2, 0
-._367:
- .word ContestStatsText_IndigoPokeBlock
-._365:
- cmp r2, #0x2
- bne ._369 @cond_branch
- ldr r1, ._371 @ ContestStatsText_BrownPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x8
- b ._400
-._372:
- .align 2, 0
-._371:
- .word ContestStatsText_BrownPokeBlock
-._369:
- cmp r2, #0x3
- bne ._373 @cond_branch
- ldr r1, ._375 @ ContestStatsText_LiteBluePokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x9
- b ._400
-._376:
- .align 2, 0
-._375:
- .word ContestStatsText_LiteBluePokeBlock
-._373:
- cmp r2, #0x4
- bne ._377 @cond_branch
- ldr r1, ._379 @ ContestStatsText_OlivePokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0xa
- b ._400
-._380:
- .align 2, 0
-._379:
- .word ContestStatsText_OlivePokeBlock
-._377:
- cmp r7, #0x1
- beq ._381 @cond_branch
- mov r0, r8
- cmp r0, #0x1
- bne ._399 @cond_branch
-._381:
- mov r0, sp
- mov r1, #0x0
- ldsh r0, [r0, r1]
- cmp r0, #0
- beq ._383 @cond_branch
- ldr r1, ._385 @ ContestStatsText_RedPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x1
- b ._400
-._386:
- .align 2, 0
-._385:
- .word ContestStatsText_RedPokeBlock
-._383:
- mov r0, sp
- ldrh r0, [r0, #0x2]
- cmp r0, #0
- beq ._387 @cond_branch
- ldr r1, ._389 @ ContestStatsText_BluePokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x2
- b ._400
-._390:
- .align 2, 0
-._389:
- .word ContestStatsText_BluePokeBlock
-._387:
- mov r0, sp
- mov r4, #0x4
- ldsh r0, [r0, r4]
- cmp r0, #0
- beq ._391 @cond_branch
- ldr r1, ._393 @ ContestStatsText_PinkPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x3
- b ._400
-._394:
- .align 2, 0
-._393:
- .word ContestStatsText_PinkPokeBlock
-._391:
- mov r0, sp
- mov r1, #0x6
- ldsh r0, [r0, r1]
- cmp r0, #0
- beq ._395 @cond_branch
- ldr r1, ._397 @ ContestStatsText_GreenPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x4
- b ._400
-._398:
- .align 2, 0
-._397:
- .word ContestStatsText_GreenPokeBlock
-._395:
- mov r0, sp
- mov r4, #0x8
- ldsh r0, [r0, r4]
- cmp r0, #0
- beq ._399 @cond_branch
- ldr r1, ._401 @ ContestStatsText_YellowPokeBlock
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x5
- b ._400
-._402:
- .align 2, 0
-._401:
- .word ContestStatsText_YellowPokeBlock
-._399:
- ldr r1, ._403 @ gOtherText_FiveQuestions
- add r0, r6, #0
- bl StringCopy
- mov r0, #0x0
-._400:
- add sp, sp, #0x10
- pop {r3, r4}
- mov r8, r3
- mov r9, r4
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._404:
- .align 2, 0
-._403:
- .word gOtherText_FiveQuestions
-
- thumb_func_end debug_sub_8160714
-
- thumb_func_start debug_sub_816097C
-debug_sub_816097C:
- push {r4, r5, r6, r7, lr}
- mov r7, r8
- push {r7}
- add r7, r0, #0
- lsl r1, r1, #0x10
- lsr r5, r1, #0x10
- mov r6, #0x0
- mov r1, #0x0
-._405:
- add r0, r7, r6
- strb r1, [r0]
- add r0, r6, #1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- cmp r6, #0x3
- bls ._405 @cond_branch
- mov r0, #0xff
- strb r0, [r7, #0x4]
- lsl r0, r5, #0x10
- asr r0, r0, #0x10
- cmp r0, #0
- bne ._406 @cond_branch
- mov r0, #0xa1
- strb r0, [r7, #0x3]
- b ._414
-._406:
- cmp r0, #0
- ble ._408 @cond_branch
- mov r4, #0x64
- mov r0, #0x0
- mov r8, r0
- mov r6, #0x0
-._412:
- lsl r5, r5, #0x10
- asr r0, r5, #0x10
- lsl r4, r4, #0x10
- asr r1, r4, #0x10
- bl __divsi3
- lsl r0, r0, #0x10
- lsr r2, r0, #0x10
- mov r1, r8
- cmp r1, #0
- bne ._410 @cond_branch
- cmp r6, #0x2
- beq ._410 @cond_branch
- cmp r2, #0
- beq ._411 @cond_branch
-._410:
- add r1, r6, r7
- add r0, r2, #0
- sub r0, r0, #0x5f
- strb r0, [r1, #0x1]
- mov r0, #0x1
- mov r8, r0
-._411:
- asr r0, r5, #0x10
- asr r4, r4, #0x10
- add r1, r4, #0
- bl __modsi3
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- add r0, r4, #0
- mov r1, #0xa
- bl __divsi3
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- add r0, r6, #1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- cmp r6, #0x2
- bls ._412 @cond_branch
- b ._414
-._408:
- cmp r0, #0
- bge ._414 @cond_branch
- neg r0, r0
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- mov r4, #0x64
- mov r1, #0x0
- mov r8, r1
- mov r6, #0x0
-._419:
- lsl r5, r5, #0x10
- asr r0, r5, #0x10
- lsl r4, r4, #0x10
- asr r1, r4, #0x10
- bl __divsi3
- lsl r0, r0, #0x10
- lsr r2, r0, #0x10
- mov r1, r8
- lsl r0, r1, #0x10
- add r3, r0, #0
- cmp r3, #0
- bne ._416 @cond_branch
- cmp r6, #0x2
- beq ._416 @cond_branch
- cmp r2, #0
- beq ._417 @cond_branch
-._416:
- add r1, r6, r7
- add r0, r2, #0
- sub r0, r0, #0x5f
- strb r0, [r1, #0x1]
- cmp r3, #0
- bne ._418 @cond_branch
- mov r0, #0xae
- strb r0, [r1]
-._418:
- mov r0, #0x1
- mov r8, r0
-._417:
- asr r0, r5, #0x10
- asr r4, r4, #0x10
- add r1, r4, #0
- bl __modsi3
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- add r0, r4, #0
- mov r1, #0xa
- bl __divsi3
- lsl r0, r0, #0x10
- lsr r4, r0, #0x10
- add r0, r6, #1
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- cmp r6, #0x2
- bls ._419 @cond_branch
-._414:
- pop {r3}
- mov r8, r3
- pop {r4, r5, r6, r7}
- pop {r0}
- bx r0
-
- thumb_func_end debug_sub_816097C
-
- thumb_func_start debug_sub_8160A80
-debug_sub_8160A80:
- push {r4, lr}
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- add r2, r0, #0
- ldr r1, ._422 @ _nakamuraStatic18
- cmp r0, #0
- bne ._420 @cond_branch
- ldr r4, ._422 + 4 @ gStringVar1
- ldrb r1, [r1, #0x1]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x3
- bl Menu_PrintText
- b ._440
-._423:
- .align 2, 0
-._422:
- .word _nakamuraStatic18
- .word gStringVar1
-._420:
- cmp r0, #0x1
- bne ._424 @cond_branch
- ldr r4, ._426 @ gStringVar1
- ldrb r1, [r1, #0x2]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x5
- bl Menu_PrintText
- b ._440
-._427:
- .align 2, 0
-._426:
- .word gStringVar1
-._424:
- cmp r0, #0x2
- bne ._428 @cond_branch
- ldr r4, ._430 @ gStringVar1
- ldrb r1, [r1, #0x3]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x7
- bl Menu_PrintText
- b ._440
-._431:
- .align 2, 0
-._430:
- .word gStringVar1
-._428:
- cmp r0, #0x3
- bne ._432 @cond_branch
- ldr r4, ._434 @ gStringVar1
- ldrb r1, [r1, #0x4]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x9
- bl Menu_PrintText
- b ._440
-._435:
- .align 2, 0
-._434:
- .word gStringVar1
-._432:
- cmp r0, #0x4
- bne ._436 @cond_branch
- ldr r4, ._438 @ gStringVar1
- ldrb r1, [r1, #0x5]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0xb
- bl Menu_PrintText
- b ._440
-._439:
- .align 2, 0
-._438:
- .word gStringVar1
-._436:
- cmp r2, #0x5
- bne ._440 @cond_branch
- ldr r4, ._441 @ gStringVar1
- ldrb r1, [r1, #0x6]
- add r0, r4, #0
- bl debug_sub_816097C
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0xd
- bl Menu_PrintText
-._440:
- pop {r4}
- pop {r0}
- bx r0
-._442:
- .align 2, 0
-._441:
- .word gStringVar1
-
- thumb_func_end debug_sub_8160A80
-
- thumb_func_start debug_sub_8160B50
-debug_sub_8160B50:
- push {r4, lr}
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- add r3, r0, #0
- lsl r1, r1, #0x18
- lsr r1, r1, #0x18
- add r4, r1, #0
- ldr r2, ._445 @ _nakamuraStatic18
- cmp r0, #0
- bne ._443 @cond_branch
- ldrb r0, [r2, #0x1]
- add r0, r0, r1
- strb r0, [r2, #0x1]
- b ._455
-._446:
- .align 2, 0
-._445:
- .word _nakamuraStatic18
-._443:
- cmp r0, #0x1
- bne ._447 @cond_branch
- ldrb r0, [r2, #0x2]
- add r0, r0, r1
- strb r0, [r2, #0x2]
- b ._455
-._447:
- cmp r0, #0x2
- bne ._449 @cond_branch
- ldrb r0, [r2, #0x3]
- add r0, r0, r1
- strb r0, [r2, #0x3]
- b ._455
-._449:
- cmp r0, #0x3
- bne ._451 @cond_branch
- ldrb r0, [r2, #0x4]
- add r0, r0, r1
- strb r0, [r2, #0x4]
- b ._455
-._451:
- cmp r0, #0x4
- bne ._453 @cond_branch
- ldrb r0, [r2, #0x5]
- add r0, r0, r1
- strb r0, [r2, #0x5]
- b ._455
-._453:
- cmp r3, #0x5
- bne ._455 @cond_branch
- ldrb r0, [r2, #0x6]
- add r0, r0, r4
- strb r0, [r2, #0x6]
-._455:
- pop {r4}
- pop {r0}
- bx r0
-
- thumb_func_end debug_sub_8160B50
-
- thumb_func_start debug_sub_8160BB0
-debug_sub_8160BB0:
- push {r4, r5, lr}
- ldr r5, ._456 @ gStringVar1
- ldr r4, ._456 + 4 @ _nakamuraStatic18
- add r0, r5, #0
- add r1, r4, #0
- bl debug_sub_8160714
- strb r0, [r4]
- mov r0, #0x1
- mov r1, #0x1
- mov r2, #0x8
- mov r3, #0x2
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0x1
- mov r2, #0x1
- bl Menu_PrintText
- pop {r4, r5}
- pop {r0}
- bx r0
-._457:
- .align 2, 0
-._456:
- .word gStringVar1
- .word _nakamuraStatic18
-
- thumb_func_end debug_sub_8160BB0
-
- thumb_func_start debug_sub_8160BE4
-debug_sub_8160BE4:
- push {r4, lr}
- add sp, sp, #0xfffffff8
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xc
- mov r3, #0xf
- bl Menu_DrawStdWindowFrame
- bl debug_sub_8160BB0
- ldr r0, ._459 @ gContestStatsText_Spicy
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- ldr r0, ._459 + 4 @ gContestStatsText_Dry
- mov r1, #0x2
- mov r2, #0x5
- bl Menu_PrintText
- ldr r0, ._459 + 8 @ gContestStatsText_Sweet
- mov r1, #0x2
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._459 + 12 @ gContestStatsText_Bitter
- mov r1, #0x2
- mov r2, #0x9
- bl Menu_PrintText
- ldr r0, ._459 + 16 @ gContestStatsText_Sour
- mov r1, #0x2
- mov r2, #0xb
- bl Menu_PrintText
- ldr r0, ._459 + 20 @ gContestStatsText_Tasty
- mov r1, #0x2
- mov r2, #0xd
- bl Menu_PrintText
- mov r4, #0x0
-._458:
- add r0, r4, #0
- bl debug_sub_8160A80
- add r0, r4, #1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- cmp r4, #0x5
- bls ._458 @cond_branch
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xb
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0x1
- mov r2, #0x3
- mov r3, #0x6
- bl InitMenu
- add sp, sp, #0x8
- pop {r4}
- pop {r0}
- bx r0
-._460:
- .align 2, 0
-._459:
- .word gContestStatsText_Spicy
- .word gContestStatsText_Dry
- .word gContestStatsText_Sweet
- .word gContestStatsText_Bitter
- .word gContestStatsText_Sour
- .word gContestStatsText_Tasty
-
- thumb_func_end debug_sub_8160BE4
-
- thumb_func_start debug_sub_8160C7C
-debug_sub_8160C7C:
- push {r4, lr}
- ldr r2, ._469 @ _nakamuraStatic18
- mov r1, #0x0
- ldrb r0, [r2]
- cmp r0, #0xc
- bne ._467 @cond_branch
- ldrb r0, [r2, #0x1]
- cmp r0, #0x2
- bne ._462 @cond_branch
- mov r1, #0x1
-._462:
- ldrb r0, [r2, #0x3]
- cmp r0, #0x2
- bne ._463 @cond_branch
- add r0, r1, #1
- lsl r0, r0, #0x18
- lsr r1, r0, #0x18
-._463:
- ldrb r0, [r2, #0x4]
- cmp r0, #0x2
- bne ._464 @cond_branch
- add r0, r1, #1
- lsl r0, r0, #0x18
- lsr r1, r0, #0x18
-._464:
- ldrb r0, [r2, #0x2]
- cmp r0, #0x2
- bne ._465 @cond_branch
- add r0, r1, #1
- lsl r0, r0, #0x18
- lsr r1, r0, #0x18
-._465:
- ldrb r0, [r2, #0x5]
- cmp r0, #0x2
- bne ._466 @cond_branch
- add r0, r1, #1
- lsl r0, r0, #0x18
- lsr r1, r0, #0x18
-._466:
- cmp r1, #0x3
- beq ._467 @cond_branch
- mov r0, #0x2
- strb r0, [r2, #0x1]
- strb r0, [r2, #0x3]
- strb r0, [r2, #0x4]
-._467:
- add r0, r2, #0
- bl sub_810CA34
- bl debug_sub_8160BB0
- mov r4, #0x0
-._468:
- add r0, r4, #0
- bl debug_sub_8160A80
- add r0, r4, #1
- lsl r0, r0, #0x18
- lsr r4, r0, #0x18
- cmp r4, #0x5
- bls ._468 @cond_branch
- pop {r4}
- pop {r0}
- bx r0
-._470:
- .align 2, 0
-._469:
- .word _nakamuraStatic18
-
- thumb_func_end debug_sub_8160C7C
-
- thumb_func_start debug_sub_8160CF4
-debug_sub_8160CF4:
- push {lr}
- ldr r2, ._473 @ gMain
- ldrh r1, [r2, #0x30]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._471 @cond_branch
- mov r0, #0x1
- neg r0, r0
- b ._472
-._474:
- .align 2, 0
-._473:
- .word gMain
-._471:
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._475 @cond_branch
- mov r0, #0x1
-._472:
- bl Menu_MoveCursor
- mov r0, #0x0
- b ._484
-._475:
- mov r0, #0x20
- and r0, r0, r1
- cmp r0, #0
- beq ._477 @cond_branch
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
- neg r1, r1
- b ._478
-._477:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._479 @cond_branch
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- mov r1, #0x1
-._478:
- bl debug_sub_8160B50
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- bl debug_sub_8160A80
- bl debug_sub_8160BB0
- mov r0, #0x0
- b ._484
-._479:
- ldrh r1, [r2, #0x2e]
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._481 @cond_branch
- bl debug_sub_8160C7C
- mov r0, #0x5
- bl PlaySE
- mov r0, #0x0
- b ._484
-._481:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._483 @cond_branch
- mov r0, #0x0
- b ._484
-._483:
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
-._484:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_8160CF4
-
- thumb_func_start debug_sub_8160D98
-debug_sub_8160D98:
- push {lr}
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl debug_sub_8160BE4
- ldr r1, ._485 @ gMenuCallback
- ldr r0, ._485 + 4 @ debug_sub_8160CF4
- str r0, [r1]
- mov r0, #0x0
- pop {r1}
- bx r1
-._486:
- .align 2, 0
-._485:
- .word gMenuCallback
- .word debug_sub_8160CF4+1
-
- thumb_func_end debug_sub_8160D98
-
- thumb_func_start debug_sub_8160DC0
-debug_sub_8160DC0:
- push {lr}
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x16
- mov r3, #0x13
- bl Menu_DrawStdWindowFrame
- ldr r0, ._487 @ gOtherText_Slash
- mov r1, #0xb
- mov r2, #0x1
- bl Menu_PrintText
- ldr r0, ._487 + 4 @ Str_843E5F2
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- ldr r0, ._487 + 8 @ Str_843E5FB
- mov r1, #0x2
- mov r2, #0x5
- bl Menu_PrintText
- ldr r0, ._487 + 12 @ Str_843E606
- mov r1, #0x2
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._487 + 16 @ Str_843E611
- mov r1, #0x2
- mov r2, #0x9
- bl Menu_PrintText
- ldr r0, ._487 + 20 @ Str_843E61C
- mov r1, #0x2
- mov r2, #0xb
- bl Menu_PrintText
- ldr r0, ._487 + 24 @ Str_843E627
- mov r1, #0x2
- mov r2, #0xd
- bl Menu_PrintText
- ldr r0, ._487 + 28 @ Str_843E637
- mov r1, #0x2
- mov r2, #0xf
- bl Menu_PrintText
- ldr r0, ._487 + 32 @ Str_843E632
- mov r1, #0x2
- mov r2, #0x11
- bl Menu_PrintText
- pop {r0}
- bx r0
-._488:
- .align 2, 0
-._487:
- .word gOtherText_Slash
- .word Str_843E5F2
- .word Str_843E5FB
- .word Str_843E606
- .word Str_843E611
- .word Str_843E61C
- .word Str_843E627
- .word Str_843E637
- .word Str_843E632
-
- thumb_func_end debug_sub_8160DC0
-
- thumb_func_start debug_sub_8160E50
-debug_sub_8160E50:
- push {r4, r5, r6, lr}
- add r6, r0, #0
- mov r0, #0x1
- mov r1, #0x1
- mov r2, #0xa
- mov r3, #0x2
- bl Menu_BlankWindowRect
- ldr r5, ._489 @ gStringVar1
- add r0, r6, #0
- mov r1, #0x2
- add r2, r5, #0
- bl GetMonData
- add r0, r5, #0
- mov r1, #0x1
- mov r2, #0x1
- bl Menu_PrintText
- mov r0, #0xc
- mov r1, #0x1
- mov r2, #0x15
- mov r3, #0x2
- bl Menu_BlankWindowRect
- add r0, r6, #0
- mov r1, #0xb
- bl GetMonData
- mov r1, #0xb
- mul r0, r0, r1
- ldr r1, ._489 + 4 @ gSpeciesNames
- add r0, r0, r1
- mov r1, #0xc
- mov r2, #0x1
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1a
- bl GetMonData
- add r4, r0, #0
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- add r1, r4, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0x3
- mov r2, #0x11
- mov r3, #0x4
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0x3
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1b
- bl GetMonData
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r4, r4, r1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0x5
- mov r2, #0x11
- mov r3, #0x6
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0x5
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1c
- bl GetMonData
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r4, r4, r1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0x7
- mov r2, #0x11
- mov r3, #0x8
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0x7
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1d
- bl GetMonData
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r4, r4, r1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0x9
- mov r2, #0x11
- mov r3, #0xa
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0x9
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1e
- bl GetMonData
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r4, r4, r1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0xb
- mov r2, #0x11
- mov r3, #0xc
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0xb
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x1f
- bl GetMonData
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- add r4, r4, r1
- lsl r4, r4, #0x10
- lsr r4, r4, #0x10
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0xd
- mov r2, #0x11
- mov r3, #0xe
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0xd
- bl Menu_PrintText
- add r0, r5, #0
- add r1, r4, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0xf
- mov r2, #0x11
- mov r3, #0x10
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0xf
- bl Menu_PrintText
- add r0, r6, #0
- mov r1, #0x20
- bl GetMonData
- add r1, r0, #0
- add r0, r5, #0
- mov r2, #0x0
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- mov r0, #0xd
- mov r1, #0x11
- mov r2, #0x11
- mov r3, #0x12
- bl Menu_BlankWindowRect
- add r0, r5, #0
- mov r1, #0xd
- mov r2, #0x11
- bl Menu_PrintText
- pop {r4, r5, r6}
- pop {r0}
- bx r0
-._490:
- .align 2, 0
-._489:
- .word gStringVar1
- .word gSpeciesNames
-
- thumb_func_end debug_sub_8160E50
-
- thumb_func_start debug_sub_8161028
-debug_sub_8161028:
- push {r4, r5, r6, lr}
- lsl r0, r0, #0x18
- lsr r6, r0, #0x18
- asr r1, r0, #0x18
- mov r0, #0x1
- neg r0, r0
- cmp r1, r0
- bne ._491 @cond_branch
- ldr r0, ._496 @ _nakamuraData5
- ldrb r0, [r0]
- cmp r0, #0
- bne ._492 @cond_branch
- mov r5, #0x5
-._494:
- lsl r0, r5, #0x10
- asr r4, r0, #0x10
- mov r0, #0x64
- mul r0, r0, r4
- ldr r1, ._496 + 4 @ gPlayerParty
- add r0, r0, r1
- mov r1, #0xb
- bl GetMonData
- cmp r0, #0
- bne ._493 @cond_branch
- sub r0, r4, #1
- lsl r0, r0, #0x10
- lsr r5, r0, #0x10
- cmp r0, #0
- bge ._494 @cond_branch
-._492:
- ldr r1, ._496 @ _nakamuraData5
- ldrb r0, [r1]
- add r0, r0, r6
- strb r0, [r1]
- b ._506
-._497:
- .align 2, 0
-._496:
- .word _nakamuraData5
- .word gPlayerParty
-._491:
- cmp r1, #0x1
- bne ._506 @cond_branch
- ldr r4, ._501 @ _nakamuraData5
- ldrb r0, [r4]
- add r0, r0, r6
- strb r0, [r4]
- lsl r0, r0, #0x18
- lsr r0, r0, #0x18
- cmp r0, #0x6
- bne ._499 @cond_branch
- mov r0, #0x0
- b ._500
-._502:
- .align 2, 0
-._501:
- .word _nakamuraData5
-._493:
- ldr r0, ._504 @ _nakamuraData5
- strb r5, [r0]
- b ._506
-._505:
- .align 2, 0
-._504:
- .word _nakamuraData5
-._499:
- ldrb r1, [r4]
- mov r0, #0x64
- mul r0, r0, r1
- ldr r1, ._507 @ gPlayerParty
- add r0, r0, r1
- mov r1, #0xb
- bl GetMonData
- cmp r0, #0
- bne ._506 @cond_branch
-._500:
- strb r0, [r4]
-._506:
- pop {r4, r5, r6}
- pop {r0}
- bx r0
-._508:
- .align 2, 0
-._507:
- .word gPlayerParty
-
- thumb_func_end debug_sub_8161028
-
- thumb_func_start debug_sub_81610BC
-debug_sub_81610BC:
- push {lr}
- ldr r0, ._511 @ gMain
- ldrh r1, [r0, #0x2e]
- mov r0, #0x20
- and r0, r0, r1
- cmp r0, #0
- beq ._509 @cond_branch
- mov r0, #0x1
- neg r0, r0
- b ._510
-._512:
- .align 2, 0
-._511:
- .word gMain
-._509:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._513 @cond_branch
- mov r0, #0x1
-._510:
- bl debug_sub_8161028
- ldr r0, ._515 @ _nakamuraData5
- ldrb r1, [r0]
- mov r0, #0x64
- mul r0, r0, r1
- ldr r1, ._515 + 4 @ gPlayerParty
- add r0, r0, r1
- bl debug_sub_8160E50
- mov r0, #0x0
- b ._518
-._516:
- .align 2, 0
-._515:
- .word _nakamuraData5
- .word gPlayerParty
-._513:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- bne ._517 @cond_branch
- mov r0, #0x0
- b ._518
-._517:
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
-._518:
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_81610BC
-
- thumb_func_start DebugMenu_EffortValues
-DebugMenu_EffortValues:
- push {lr}
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- ldr r1, ._519 @ _nakamuraData5
- mov r0, #0x0
- strb r0, [r1]
- bl debug_sub_8160DC0
- ldr r0, ._519 + 4 @ gPlayerParty
- bl debug_sub_8160E50
- ldr r1, ._519 + 8 @ gMenuCallback
- ldr r0, ._519 + 12 @ debug_sub_81610BC
- str r0, [r1]
- mov r0, #0x0
- pop {r1}
- bx r1
-._520:
- .align 2, 0
-._519:
- .word _nakamuraData5
- .word gPlayerParty
- .word gMenuCallback
- .word debug_sub_81610BC+1
-
- thumb_func_end DebugMenu_EffortValues
-
- thumb_func_start debug_sub_8161160
-debug_sub_8161160:
- push {r4, r5, r6, r7, lr}
- mov r7, r8
- push {r7}
- mov r7, #0x0
- ldr r2, ._523 @ _nakamuraData6
- ldr r1, ._523 + 4 @ _nakamuraData8
- ldrh r0, [r2]
- ldrh r3, [r1]
- cmp r0, r3
- bhi ._521 @cond_branch
- add r6, r0, #0
- ldrh r5, [r1]
- b ._522
-._524:
- .align 2, 0
-._523:
- .word _nakamuraData6
- .word _nakamuraData8
-._521:
- ldrh r6, [r1]
- ldrh r5, [r2]
-._522:
- mov r4, #0x0
- ldr r0, ._529 @ _nakamuraDataA
- ldrh r0, [r0]
- cmp r4, r0
- bcs ._525 @cond_branch
- ldr r0, ._529 + 4 @ _nakamuraDataC
- mov r8, r0
-._528:
- bl Random
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- mov r2, r8
- ldrh r1, [r2]
- bl __umodsi3
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- cmp r0, r6
- bcc ._527 @cond_branch
- cmp r0, r5
- bhi ._527 @cond_branch
- add r0, r7, #1
- lsl r0, r0, #0x10
- lsr r7, r0, #0x10
-._527:
- add r4, r4, #0x1
- ldr r0, ._529 @ _nakamuraDataA
- ldrh r0, [r0]
- cmp r4, r0
- bcc ._528 @cond_branch
-._525:
- add r0, r7, #0
- pop {r3}
- mov r8, r3
- pop {r4, r5, r6, r7}
- pop {r1}
- bx r1
-._530:
- .align 2, 0
-._529:
- .word _nakamuraDataA
- .word _nakamuraDataC
-
- thumb_func_end debug_sub_8161160
-
- thumb_func_start debug_sub_81611D8
-debug_sub_81611D8:
- push {r4, lr}
- add sp, sp, #0xfffffff8
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0xf
- mov r3, #0xb
- bl Menu_DrawStdWindowFrame
- ldr r0, ._531 @ Str_843E642
- mov r1, #0x2
- mov r2, #0x1
- bl Menu_PrintText
- ldr r0, ._531 + 4 @ Str_843E647
- mov r1, #0x2
- mov r2, #0x3
- bl Menu_PrintText
- ldr r0, ._531 + 8 @ Str_843E65A
- mov r1, #0x2
- mov r2, #0x5
- bl Menu_PrintText
- ldr r0, ._531 + 12 @ Str_843E64C
- mov r1, #0x2
- mov r2, #0x7
- bl Menu_PrintText
- ldr r0, ._531 + 16 @ Str_843E651
- mov r1, #0x2
- mov r2, #0x9
- bl Menu_PrintText
- ldr r0, ._531 + 20 @ Str_843E655
- mov r1, #0xd
- mov r2, #0x9
- bl Menu_PrintText
- ldr r4, ._531 + 24 @ Str_843E658
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x1
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x3
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x5
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x7
- bl Menu_PrintText
- add r0, r4, #0
- mov r1, #0xc
- mov r2, #0x9
- bl Menu_PrintText
- mov r0, #0x0
- str r0, [sp]
- mov r0, #0xe
- str r0, [sp, #0x4]
- mov r0, #0x0
- mov r1, #0x1
- mov r2, #0x1
- mov r3, #0x4
- bl InitMenu
- add sp, sp, #0x8
- pop {r4}
- pop {r0}
- bx r0
-._532:
- .align 2, 0
-._531:
- .word Str_843E642
- .word Str_843E647
- .word Str_843E65A
- .word Str_843E64C
- .word Str_843E651
- .word Str_843E655
- .word Str_843E658
-
- thumb_func_end debug_sub_81611D8
-
- thumb_func_start debug_sub_8161290
-debug_sub_8161290:
- push {r4, lr}
- add r1, r0, #0
- lsl r1, r1, #0x10
- lsr r1, r1, #0x10
- ldr r4, ._533 @ gStringVar1
- add r0, r4, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r4, #0
- mov r1, #0x8
- mov r2, #0x9
- bl Menu_PrintText
- pop {r4}
- pop {r0}
- bx r0
-._534:
- .align 2, 0
-._533:
- .word gStringVar1
-
- thumb_func_end debug_sub_8161290
-
- thumb_func_start debug_sub_81612B8
-debug_sub_81612B8:
- push {r4, r5, lr}
- add r4, r2, #0
- lsl r4, r4, #0x18
- lsr r4, r4, #0x18
- lsl r1, r1, #0x18
- asr r1, r1, #0x18
- ldrh r2, [r0]
- add r1, r1, r2
- strh r1, [r0]
- ldr r5, ._535 @ gStringVar1
- ldrh r1, [r0]
- add r0, r5, #0
- mov r2, #0x1
- mov r3, #0x5
- bl ConvertIntToDecimalStringN
- add r0, r5, #0
- mov r1, #0x8
- add r2, r4, #0
- bl Menu_PrintText
- pop {r4, r5}
- pop {r0}
- bx r0
-._536:
- .align 2, 0
-._535:
- .word gStringVar1
-
- thumb_func_end debug_sub_81612B8
-
- thumb_func_start debug_sub_81612EC
-debug_sub_81612EC:
- push {r4, r5, lr}
- ldr r2, ._540 @ gMain
- ldrh r1, [r2, #0x2c]
- mov r0, #0x80
- lsl r0, r0, #0x1
- and r0, r0, r1
- mov r5, #0x1
- cmp r0, #0
- beq ._537 @cond_branch
- mov r5, #0x64
-._537:
- ldrh r1, [r2, #0x30]
- mov r0, #0x40
- and r0, r0, r1
- cmp r0, #0
- beq ._538 @cond_branch
- mov r0, #0x1
- neg r0, r0
- b ._539
-._541:
- .align 2, 0
-._540:
- .word gMain
-._538:
- mov r0, #0x80
- and r0, r0, r1
- cmp r0, #0
- beq ._542 @cond_branch
- mov r0, #0x1
-._539:
- bl Menu_MoveCursor
-._565:
- mov r0, #0x0
- b ._543
-._542:
- mov r0, #0x20
- and r0, r0, r1
- cmp r0, #0
- beq ._544 @cond_branch
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- asr r4, r0, #0x18
- cmp r4, #0
- bne ._545 @cond_branch
- ldr r0, ._550 @ _nakamuraData6
- neg r1, r5
- mov r2, #0x1
- bl debug_sub_81612B8
-._545:
- cmp r4, #0x1
- bne ._546 @cond_branch
- ldr r0, ._550 + 4 @ _nakamuraData8
- neg r1, r5
- mov r2, #0x3
- bl debug_sub_81612B8
-._546:
- cmp r4, #0x2
- bne ._547 @cond_branch
- ldr r0, ._550 + 8 @ _nakamuraDataC
- neg r1, r5
- mov r2, #0x5
- bl debug_sub_81612B8
-._547:
- cmp r4, #0x3
- bne ._565 @cond_branch
- ldr r0, ._550 + 12 @ _nakamuraDataA
- neg r1, r5
- mov r2, #0x7
- bl debug_sub_81612B8
- b ._565
-._551:
- .align 2, 0
-._550:
- .word _nakamuraData6
- .word _nakamuraData8
- .word _nakamuraDataC
- .word _nakamuraDataA
-._544:
- mov r0, #0x10
- and r0, r0, r1
- cmp r0, #0
- beq ._552 @cond_branch
- bl Menu_GetCursorPos
- lsl r0, r0, #0x18
- asr r4, r0, #0x18
- cmp r4, #0
- bne ._553 @cond_branch
- ldr r0, ._558 @ _nakamuraData6
- add r1, r5, #0
- mov r2, #0x1
- bl debug_sub_81612B8
-._553:
- cmp r4, #0x1
- bne ._554 @cond_branch
- ldr r0, ._558 + 4 @ _nakamuraData8
- add r1, r5, #0
- mov r2, #0x3
- bl debug_sub_81612B8
-._554:
- cmp r4, #0x2
- bne ._555 @cond_branch
- ldr r0, ._558 + 8 @ _nakamuraDataC
- add r1, r5, #0
- mov r2, #0x5
- bl debug_sub_81612B8
-._555:
- cmp r4, #0x3
- bne ._565 @cond_branch
- ldr r0, ._558 + 12 @ _nakamuraDataA
- add r1, r5, #0
- mov r2, #0x7
- bl debug_sub_81612B8
- b ._565
-._559:
- .align 2, 0
-._558:
- .word _nakamuraData6
- .word _nakamuraData8
- .word _nakamuraDataC
- .word _nakamuraDataA
-._552:
- ldrh r1, [r2, #0x2e]
- mov r0, #0x1
- and r0, r0, r1
- cmp r0, #0
- beq ._560 @cond_branch
- ldr r0, ._563 @ _nakamuraDataC
- ldrh r0, [r0]
- cmp r0, #0
- beq ._565 @cond_branch
- mov r0, #0x5
- bl PlaySE
- bl debug_sub_8161160
- lsl r0, r0, #0x10
- lsr r0, r0, #0x10
- bl debug_sub_8161290
- b ._565
-._564:
- .align 2, 0
-._563:
- .word _nakamuraDataC
-._560:
- mov r0, #0x2
- and r0, r0, r1
- cmp r0, #0
- beq ._565 @cond_branch
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl CloseMenu
- mov r0, #0x1
-._543:
- pop {r4, r5}
- pop {r1}
- bx r1
-
- thumb_func_end debug_sub_81612EC
-
- thumb_func_start DebugMenu_RandomNumberTest
-DebugMenu_RandomNumberTest:
- push {lr}
- ldr r0, ._566 @ _nakamuraData6
- mov r1, #0x0
- strh r1, [r0]
- ldr r0, ._566 + 4 @ _nakamuraData8
- strh r1, [r0]
- ldr r0, ._566 + 8 @ _nakamuraDataC
- strh r1, [r0]
- ldr r0, ._566 + 12 @ _nakamuraDataA
- strh r1, [r0]
- mov r0, #0x0
- mov r1, #0x0
- mov r2, #0x1d
- mov r3, #0x13
- bl Menu_EraseWindowRect
- bl debug_sub_81611D8
- ldr r1, ._566 + 16 @ gMenuCallback
- ldr r0, ._566 + 20 @ debug_sub_81612EC
- str r0, [r1]
- mov r0, #0x0
- pop {r1}
- bx r1
-._567:
- .align 2, 0
-._566:
- .word _nakamuraData6
- .word _nakamuraData8
- .word _nakamuraDataC
- .word _nakamuraDataA
- .word gMenuCallback
- .word debug_sub_81612EC+1
-
- thumb_func_end DebugMenu_RandomNumberTest
-
- .align 2, 0
-
-.endif
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]