summaryrefslogtreecommitdiff
path: root/asm/ice.s
diff options
context:
space:
mode:
Diffstat (limited to 'asm/ice.s')
-rw-r--r--asm/ice.s109
1 files changed, 37 insertions, 72 deletions
diff --git a/asm/ice.s b/asm/ice.s
index 51140d998..a824a53ea 100644
--- a/asm/ice.s
+++ b/asm/ice.s
@@ -7,41 +7,6 @@
@ ice
- thumb_func_start sub_80D76C4
-sub_80D76C4: @ 80D76C4
- push {r4,lr}
- adds r4, r0, 0
- adds r0, 0x3F
- ldrb r1, [r0]
- movs r0, 0x10
- ands r0, r1
- cmp r0, 0
- beq _080D76F8
- ldr r3, _080D7700 @ =gTasks
- movs r0, 0x3C
- ldrsh r1, [r4, r0]
- lsls r1, 1
- movs r0, 0x3A
- ldrsh r2, [r4, r0]
- lsls r0, r2, 2
- adds r0, r2
- lsls r0, 3
- adds r1, r0
- adds r3, 0x8
- adds r1, r3
- ldrh r0, [r1]
- subs r0, 0x1
- strh r0, [r1]
- adds r0, r4, 0
- bl DestroySprite
-_080D76F8:
- pop {r4}
- pop {r0}
- bx r0
- .align 2, 0
-_080D7700: .4byte gTasks
- thumb_func_end sub_80D76C4
-
thumb_func_start sub_80D7704
sub_80D7704: @ 80D7704
push {r4-r7,lr}
@@ -65,26 +30,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 +294,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 +324,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 +374,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 +460,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 +488,7 @@ _080D7AB4:
_080D7AC6:
ldr r0, _080D7AE4 @ =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7AEC
@@ -649,7 +614,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 +652,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 +775,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 +801,7 @@ _080D7D20:
_080D7D32:
ldr r0, _080D7D54 @ =gAnimBankAttacker
ldrb r0, [r0]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7D5C
@@ -1039,7 +1004,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 +1073,7 @@ _080D7F34:
movs r1, 0
bl SetAverageBattlerPositions
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7F60
@@ -1154,7 +1119,7 @@ _080D7F92:
movs r1, 0
bl SetAverageBattlerPositions
ldrb r0, [r4]
- bl GetBankSide
+ bl GetBattlerSide
lsls r0, 24
cmp r0, 0
beq _080D7FBC
@@ -1201,7 +1166,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 +1651,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 +2039,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 +2084,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 +2105,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 +2127,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 +2154,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 +2167,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 +2266,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 +2666,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 +2678,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 +2997,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 +3008,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 +3016,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]
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-06 05:33:54 +0000