dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

name some more battle anim globals

Browse Source
This commit is contained in:
garak
2019-05-23 18:33:21 -04:00
parent 3f26e88ecd
commit d81aaaad67
30 changed files with 465 additions and 465 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+2 -2
View File
@@ -4511,7 +4511,7 @@ _080121D4: .4byte SpriteCB_HealthBoxBounce
_080121D8: .4byte gUnknown_3004FF0 _080121D8: .4byte gUnknown_3004FF0
_080121DC: .4byte gSprites _080121DC: .4byte gSprites
_080121E0: _080121E0:
ldr r0, _0801224C @ =gUnknown_2023D44 ldr r0, _0801224C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r7, [r0] ldrb r7, [r0]
ldr r2, _08012250 @ =gUnknown_2024018 ldr r2, _08012250 @ =gUnknown_2024018
@@ -4567,7 +4567,7 @@ _0801223C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0801224C: .4byte gUnknown_2023D44 _0801224C: .4byte gBattlerSpriteIds
_08012250: .4byte gUnknown_2024018 _08012250: .4byte gUnknown_2024018
_08012254: .4byte gSprites _08012254: .4byte gSprites
thumb_func_end dp11b_obj_instanciate thumb_func_end dp11b_obj_instanciate
asm/battle_anim.s
+27 -27
View File
@@ -20,7 +20,7 @@ ClearBattleAnimationVars: @ 80724C0
strb r1, [r0] strb r1, [r0]
ldr r0, _08072560 @ =gUnknown_2037EE3 ldr r0, _08072560 @ =gUnknown_2037EE3
strb r1, [r0] strb r1, [r0]
ldr r0, _08072564 @ =gUnknown_2037EE4 ldr r0, _08072564 @ =gAnimDisableStructPtr
movs r1, 0 movs r1, 0
str r1, [r0] str r1, [r0]
ldr r0, _08072568 @ =gUnknown_2037EE8 ldr r0, _08072568 @ =gUnknown_2037EE8
@@ -31,7 +31,7 @@ ClearBattleAnimationVars: @ 80724C0
ldr r0, _08072570 @ =gUnknown_2037EFE ldr r0, _08072570 @ =gUnknown_2037EFE
strb r2, [r0] strb r2, [r0]
ldr r4, _08072574 @ =gUnknown_2037F14 ldr r4, _08072574 @ =gUnknown_2037F14
ldr r5, _08072578 @ =gUnknown_2037F16 ldr r5, _08072578 @ =gAnimMoveTurn
ldr r6, _0807257C @ =gUnknown_2037F17 ldr r6, _0807257C @ =gUnknown_2037F17
ldr r7, _08072580 @ =gUnknown_2037F18 ldr r7, _08072580 @ =gUnknown_2037F18
ldr r0, _08072584 @ =gBattleAnimAttacker ldr r0, _08072584 @ =gBattleAnimAttacker
@@ -88,12 +88,12 @@ _08072554: .4byte gUnknown_2037EE0
_08072558: .4byte gUnknown_2037EE1 _08072558: .4byte gUnknown_2037EE1
_0807255C: .4byte gUnknown_2037EE2 _0807255C: .4byte gUnknown_2037EE2
_08072560: .4byte gUnknown_2037EE3 _08072560: .4byte gUnknown_2037EE3
_08072564: .4byte gUnknown_2037EE4 _08072564: .4byte gAnimDisableStructPtr
_08072568: .4byte gUnknown_2037EE8 _08072568: .4byte gUnknown_2037EE8
_0807256C: .4byte gUnknown_2037EEC _0807256C: .4byte gUnknown_2037EEC
_08072570: .4byte gUnknown_2037EFE _08072570: .4byte gUnknown_2037EFE
_08072574: .4byte gUnknown_2037F14 _08072574: .4byte gUnknown_2037F14
_08072578: .4byte gUnknown_2037F16 _08072578: .4byte gAnimMoveTurn
_0807257C: .4byte gUnknown_2037F17 _0807257C: .4byte gUnknown_2037F17
_08072580: .4byte gUnknown_2037F18 _08072580: .4byte gUnknown_2037F18
_08072584: .4byte gBattleAnimAttacker _08072584: .4byte gBattleAnimAttacker
@@ -1008,7 +1008,7 @@ _08072C88:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_8072E48 bl sub_8072E48
ldr r0, _08072CDC @ =gUnknown_2023D44 ldr r0, _08072CDC @ =gBattlerSpriteIds
adds r0, r5, r0 adds r0, r5, r0
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal ldr r0, _08072CE0 @ =task_pA_ma0A_obj_to_bg_pal
@@ -1044,7 +1044,7 @@ _08072C88:
b _08072CFC b _08072CFC
.align 2, 0 .align 2, 0
_08072CD8: .4byte gBattleAnimTarget _08072CD8: .4byte gBattleAnimTarget
_08072CDC: .4byte gUnknown_2023D44 _08072CDC: .4byte gBattlerSpriteIds
_08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal _08072CE0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072CE4: .4byte gTasks _08072CE4: .4byte gTasks
_08072CE8: .4byte gSprites _08072CE8: .4byte gSprites
@@ -1092,7 +1092,7 @@ _08072D3E:
adds r0, r5, 0 adds r0, r5, 0
adds r1, r7, 0 adds r1, r7, 0
bl sub_8072E48 bl sub_8072E48
ldr r0, _08072D9C @ =gUnknown_2023D44 ldr r0, _08072D9C @ =gBattlerSpriteIds
adds r0, r5, r0 adds r0, r5, r0
ldrb r4, [r0] ldrb r4, [r0]
ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal ldr r0, _08072DA0 @ =task_pA_ma0A_obj_to_bg_pal
@@ -1131,7 +1131,7 @@ _08072D8C: .4byte gBattle_BG2_X
_08072D90: .4byte gBattle_BG2_Y _08072D90: .4byte gBattle_BG2_Y
_08072D94: .4byte gTasks _08072D94: .4byte gTasks
_08072D98: .4byte gUnknown_2037F14 _08072D98: .4byte gUnknown_2037F14
_08072D9C: .4byte gUnknown_2023D44 _08072D9C: .4byte gBattlerSpriteIds
_08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal _08072DA0: .4byte task_pA_ma0A_obj_to_bg_pal
_08072DA4: .4byte gSprites _08072DA4: .4byte gSprites
_08072DA8: .4byte gBattle_BG1_X _08072DA8: .4byte gBattle_BG1_X
@@ -1190,7 +1190,7 @@ sub_8072DF0: @ 8072DF0
cmp r0, 0 cmp r0, 0
beq _08072E30 beq _08072E30
ldr r2, _08072E38 @ =gSprites ldr r2, _08072E38 @ =gSprites
ldr r0, _08072E3C @ =gUnknown_2023D44 ldr r0, _08072E3C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1208,7 +1208,7 @@ _08072E30:
.align 2, 0 .align 2, 0
_08072E34: .4byte gUnknown_2024018 _08072E34: .4byte gUnknown_2024018
_08072E38: .4byte gSprites _08072E38: .4byte gSprites
_08072E3C: .4byte gUnknown_2023D44 _08072E3C: .4byte gBattlerSpriteIds
_08072E40: _08072E40:
movs r0, 0 movs r0, 0
_08072E42: _08072E42:
@@ -1268,7 +1268,7 @@ _08072E5E:
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl SetAnimBgAttribute bl SetAnimBgAttribute
ldr r2, _08072F6C @ =gUnknown_2023D44 ldr r2, _08072F6C @ =gBattlerSpriteIds
adds r2, r7, r2 adds r2, r7, r2
ldrb r0, [r2] ldrb r0, [r2]
ldr r5, _08072F70 @ =gBattle_BG1_X ldr r5, _08072F70 @ =gBattle_BG1_X
@@ -1349,7 +1349,7 @@ _08072F5C: .4byte 0x06004000
_08072F60: .4byte 0x0600e000 _08072F60: .4byte 0x0600e000
_08072F64: .4byte 0x01000800 _08072F64: .4byte 0x01000800
_08072F68: .4byte 0x01000400 _08072F68: .4byte 0x01000400
_08072F6C: .4byte gUnknown_2023D44 _08072F6C: .4byte gBattlerSpriteIds
_08072F70: .4byte gBattle_BG1_X _08072F70: .4byte gBattle_BG1_X
_08072F74: .4byte gSprites _08072F74: .4byte gSprites
_08072F78: .4byte gBattle_BG1_Y _08072F78: .4byte gBattle_BG1_Y
@@ -1401,7 +1401,7 @@ _08072F84:
movs r1, 0x1 movs r1, 0x1
movs r2, 0 movs r2, 0
bl SetAnimBgAttribute bl SetAnimBgAttribute
ldr r2, _080730A4 @ =gUnknown_2023D44 ldr r2, _080730A4 @ =gBattlerSpriteIds
adds r2, r7, r2 adds r2, r7, r2
ldrb r0, [r2] ldrb r0, [r2]
ldr r5, _080730A8 @ =gBattle_BG2_X ldr r5, _080730A8 @ =gBattle_BG2_X
@@ -1483,7 +1483,7 @@ _08073094: .4byte 0x06006000
_08073098: .4byte 0x0600f000 _08073098: .4byte 0x0600f000
_0807309C: .4byte 0x01000800 _0807309C: .4byte 0x01000800
_080730A0: .4byte 0x01000400 _080730A0: .4byte 0x01000400
_080730A4: .4byte gUnknown_2023D44 _080730A4: .4byte gBattlerSpriteIds
_080730A8: .4byte gBattle_BG2_X _080730A8: .4byte gBattle_BG2_X
_080730AC: .4byte gSprites _080730AC: .4byte gSprites
_080730B0: .4byte gBattle_BG2_Y _080730B0: .4byte gBattle_BG2_Y
@@ -1728,7 +1728,7 @@ _0807327E:
cmp r0, 0xFF cmp r0, 0xFF
beq _080732A4 beq _080732A4
ldr r2, _080732DC @ =gSprites ldr r2, _080732DC @ =gSprites
ldr r0, _080732E0 @ =gUnknown_2023D44 ldr r0, _080732E0 @ =gBattlerSpriteIds
adds r0, r5, r0 adds r0, r5, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1748,7 +1748,7 @@ _080732A4:
cmp r0, 0xFF cmp r0, 0xFF
beq _080732E4 beq _080732E4
ldr r3, _080732DC @ =gSprites ldr r3, _080732DC @ =gSprites
ldr r2, _080732E0 @ =gUnknown_2023D44 ldr r2, _080732E0 @ =gBattlerSpriteIds
movs r1, 0x2 movs r1, 0x2
adds r0, r5, 0 adds r0, r5, 0
eors r0, r1 eors r0, r1
@@ -1769,7 +1769,7 @@ _080732A4:
_080732D4: .4byte gBattleAnimTarget _080732D4: .4byte gBattleAnimTarget
_080732D8: .4byte gUnknown_2037F14 _080732D8: .4byte gUnknown_2037F14
_080732DC: .4byte gSprites _080732DC: .4byte gSprites
_080732E0: .4byte gUnknown_2023D44 _080732E0: .4byte gBattlerSpriteIds
_080732E4: _080732E4:
movs r4, 0 movs r4, 0
_080732E6: _080732E6:
@@ -1916,7 +1916,7 @@ _080733F4:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8072E48 bl sub_8072E48
ldr r2, _08073478 @ =gSprites ldr r2, _08073478 @ =gSprites
ldr r0, _0807347C @ =gUnknown_2023D44 ldr r0, _0807347C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1954,7 +1954,7 @@ _08073442:
adds r0, r4, 0 adds r0, r4, 0
bl sub_8072E48 bl sub_8072E48
ldr r2, _08073478 @ =gSprites ldr r2, _08073478 @ =gSprites
ldr r0, _0807347C @ =gUnknown_2023D44 ldr r0, _0807347C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1978,7 +1978,7 @@ _08073464:
.align 2, 0 .align 2, 0
_08073474: .4byte gBattleAnimTarget _08073474: .4byte gBattleAnimTarget
_08073478: .4byte gSprites _08073478: .4byte gSprites
_0807347C: .4byte gUnknown_2023D44 _0807347C: .4byte gBattlerSpriteIds
_08073480: .4byte gUnknown_2037ED4 _08073480: .4byte gUnknown_2037ED4
thumb_func_end sub_807339C thumb_func_end sub_807339C
@@ -2021,7 +2021,7 @@ _080734B6:
cmp r0, 0 cmp r0, 0
beq _080734E0 beq _080734E0
ldr r2, _08073518 @ =gSprites ldr r2, _08073518 @ =gSprites
ldr r0, _0807351C @ =gUnknown_2023D44 ldr r0, _0807351C @ =gBattlerSpriteIds
adds r0, r6, r0 adds r0, r6, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2046,7 +2046,7 @@ _080734E0:
cmp r0, 0 cmp r0, 0
beq _08073520 beq _08073520
ldr r2, _08073518 @ =gSprites ldr r2, _08073518 @ =gSprites
ldr r0, _0807351C @ =gUnknown_2023D44 ldr r0, _0807351C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2063,7 +2063,7 @@ _080734E0:
.align 2, 0 .align 2, 0
_08073514: .4byte gBattleAnimTarget _08073514: .4byte gBattleAnimTarget
_08073518: .4byte gSprites _08073518: .4byte gSprites
_0807351C: .4byte gUnknown_2023D44 _0807351C: .4byte gBattlerSpriteIds
_08073520: _08073520:
movs r5, 0 movs r5, 0
_08073522: _08073522:
@@ -2309,7 +2309,7 @@ ScriptCmd_choosetwoturnanim: @ 80736E0
ldr r2, [r3] ldr r2, [r3]
adds r0, r2, 0x1 adds r0, r2, 0x1
str r0, [r3] str r0, [r3]
ldr r0, _0807371C @ =gUnknown_2037F16 ldr r0, _0807371C @ =gAnimMoveTurn
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x1 movs r0, 0x1
ands r0, r1 ands r0, r1
@@ -2334,7 +2334,7 @@ _080736FA:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08073718: .4byte gUnknown_2037ED4 _08073718: .4byte gUnknown_2037ED4
_0807371C: .4byte gUnknown_2037F16 _0807371C: .4byte gAnimMoveTurn
thumb_func_end ScriptCmd_choosetwoturnanim thumb_func_end ScriptCmd_choosetwoturnanim
thumb_func_start ScriptCmd_jumpifmoveturn thumb_func_start ScriptCmd_jumpifmoveturn
@@ -2347,7 +2347,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
ldrb r1, [r4, 0x1] ldrb r1, [r4, 0x1]
adds r3, r2, 0x1 adds r3, r2, 0x1
str r3, [r5] str r3, [r5]
ldr r0, _08073754 @ =gUnknown_2037F16 ldr r0, _08073754 @ =gAnimMoveTurn
ldrb r0, [r0] ldrb r0, [r0]
cmp r1, r0 cmp r1, r0
bne _08073758 bne _08073758
@@ -2365,7 +2365,7 @@ ScriptCmd_jumpifmoveturn: @ 8073720
b _0807375C b _0807375C
.align 2, 0 .align 2, 0
_08073750: .4byte gUnknown_2037ED4 _08073750: .4byte gUnknown_2037ED4
_08073754: .4byte gUnknown_2037F16 _08073754: .4byte gAnimMoveTurn
_08073758: _08073758:
adds r0, r4, 0x6 adds r0, r4, 0x6
str r0, [r5] str r0, [r5]
asm/battle_anim_8074480.s
+15 -15
View File
@@ -717,12 +717,12 @@ GetAnimBankSpriteId: @ 80749D4
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08074A4A beq _08074A4A
ldr r1, _080749F8 @ =gUnknown_2023D44 ldr r1, _080749F8 @ =gBattlerSpriteIds
ldrb r0, [r4] ldrb r0, [r4]
b _08074A5A b _08074A5A
.align 2, 0 .align 2, 0
_080749F4: .4byte gBattleAnimAttacker _080749F4: .4byte gBattleAnimAttacker
_080749F8: .4byte gUnknown_2023D44 _080749F8: .4byte gBattlerSpriteIds
_080749FC: _080749FC:
cmp r0, 0x1 cmp r0, 0x1
bne _08074A1C bne _08074A1C
@@ -732,12 +732,12 @@ _080749FC:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _08074A4A beq _08074A4A
ldr r1, _08074A18 @ =gUnknown_2023D44 ldr r1, _08074A18 @ =gBattlerSpriteIds
ldrb r0, [r4] ldrb r0, [r4]
b _08074A5A b _08074A5A
.align 2, 0 .align 2, 0
_08074A14: .4byte gBattleAnimTarget _08074A14: .4byte gBattleAnimTarget
_08074A18: .4byte gUnknown_2023D44 _08074A18: .4byte gBattlerSpriteIds
_08074A1C: _08074A1C:
cmp r1, 0x2 cmp r1, 0x2
bne _08074A38 bne _08074A38
@@ -767,7 +767,7 @@ _08074A4A:
.align 2, 0 .align 2, 0
_08074A50: .4byte gBattleAnimTarget _08074A50: .4byte gBattleAnimTarget
_08074A54: _08074A54:
ldr r1, _08074A64 @ =gUnknown_2023D44 ldr r1, _08074A64 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
eors r0, r4 eors r0, r4
_08074A5A: _08074A5A:
@@ -778,7 +778,7 @@ _08074A5E:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_08074A64: .4byte gUnknown_2023D44 _08074A64: .4byte gBattlerSpriteIds
thumb_func_end GetAnimBankSpriteId thumb_func_end GetAnimBankSpriteId
thumb_func_start StoreSpriteCallbackInData6 thumb_func_start StoreSpriteCallbackInData6
@@ -4428,7 +4428,7 @@ sub_80764EC: @ 80764EC
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r4, 0 movs r4, 0
ldr r1, _0807654C @ =gUnknown_2023D44 ldr r1, _0807654C @ =gBattlerSpriteIds
ldr r6, _08076550 @ =gBattlerPartyIndexes ldr r6, _08076550 @ =gBattlerPartyIndexes
_08076508: _08076508:
adds r0, r4, r1 adds r0, r4, r1
@@ -4463,7 +4463,7 @@ _08076508:
b _0807655E b _0807655E
.align 2, 0 .align 2, 0
_08076548: .4byte gSprites _08076548: .4byte gSprites
_0807654C: .4byte gUnknown_2023D44 _0807654C: .4byte gBattlerSpriteIds
_08076550: .4byte gBattlerPartyIndexes _08076550: .4byte gBattlerPartyIndexes
_08076554: .4byte gUnknown_2024018 _08076554: .4byte gUnknown_2024018
_08076558: .4byte gPlayerParty _08076558: .4byte gPlayerParty
@@ -4706,7 +4706,7 @@ sub_80766EC: @ 80766EC
cmp r0, 0 cmp r0, 0
beq _0807672C beq _0807672C
ldr r2, _080767E4 @ =gSprites ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44 ldr r1, _080767E8 @ =gBattlerSpriteIds
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -4733,7 +4733,7 @@ _0807672C:
cmp r0, 0 cmp r0, 0
beq _08076764 beq _08076764
ldr r2, _080767E4 @ =gSprites ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44 ldr r1, _080767E8 @ =gBattlerSpriteIds
mov r3, r8 mov r3, r8
ldrb r0, [r3] ldrb r0, [r3]
adds r0, r1 adds r0, r1
@@ -4761,7 +4761,7 @@ _08076764:
cmp r0, 0 cmp r0, 0
beq _0807679C beq _0807679C
ldr r2, _080767E4 @ =gSprites ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44 ldr r1, _080767E8 @ =gBattlerSpriteIds
ldrb r0, [r6] ldrb r0, [r6]
eors r0, r5 eors r0, r5
adds r0, r1 adds r0, r1
@@ -4789,7 +4789,7 @@ _0807679C:
cmp r0, 0 cmp r0, 0
beq _080767D4 beq _080767D4
ldr r2, _080767E4 @ =gSprites ldr r2, _080767E4 @ =gSprites
ldr r1, _080767E8 @ =gUnknown_2023D44 ldr r1, _080767E8 @ =gBattlerSpriteIds
mov r3, r8 mov r3, r8
ldrb r0, [r3] ldrb r0, [r3]
eors r0, r5 eors r0, r5
@@ -4817,7 +4817,7 @@ _080767D4:
.align 2, 0 .align 2, 0
_080767E0: .4byte gBattleAnimTarget _080767E0: .4byte gBattleAnimTarget
_080767E4: .4byte gSprites _080767E4: .4byte gSprites
_080767E8: .4byte gUnknown_2023D44 _080767E8: .4byte gBattlerSpriteIds
_080767EC: .4byte gBattleAnimAttacker _080767EC: .4byte gBattleAnimAttacker
thumb_func_end sub_80766EC thumb_func_end sub_80766EC
@@ -4840,7 +4840,7 @@ _080767FE:
beq _08076840 beq _08076840
adds r0, r4, 0 adds r0, r4, 0
bl sub_807685C bl sub_807685C
ldr r3, _08076858 @ =gUnknown_2023D44 ldr r3, _08076858 @ =gBattlerSpriteIds
adds r3, r5, r3 adds r3, r5, r3
ldrb r2, [r3] ldrb r2, [r3]
lsls r1, r2, 4 lsls r1, r2, 4
@@ -4875,7 +4875,7 @@ _0807684A:
.align 2, 0 .align 2, 0
_08076850: .4byte gBattlersCount _08076850: .4byte gBattlersCount
_08076854: .4byte gSprites _08076854: .4byte gSprites
_08076858: .4byte gUnknown_2023D44 _08076858: .4byte gBattlerSpriteIds
thumb_func_end sub_80767F0 thumb_func_end sub_80767F0
thumb_func_start sub_807685C thumb_func_start sub_807685C
asm/battle_anim_8078178.s
+2 -2
View File
@@ -16,7 +16,7 @@ sub_8078178: @ 8078178
lsrs r4, 24 lsrs r4, 24
lsls r5, 24 lsls r5, 24
lsrs r5, 24 lsrs r5, 24
ldr r0, _0807821C @ =gUnknown_2023D44 ldr r0, _0807821C @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r6, [r0] ldrb r6, [r0]
ldr r0, _08078220 @ =sub_80782BC ldr r0, _08078220 @ =sub_80782BC
@@ -88,7 +88,7 @@ _08078210:
bls _080781CC bls _080781CC
b _08078298 b _08078298
.align 2, 0 .align 2, 0
_0807821C: .4byte gUnknown_2023D44 _0807821C: .4byte gBattlerSpriteIds
_08078220: .4byte sub_80782BC _08078220: .4byte sub_80782BC
_08078224: .4byte gUnknown_83AD048 _08078224: .4byte gUnknown_83AD048
_08078228: .4byte gUnknown_83AD950 _08078228: .4byte gUnknown_83AD950
asm/battle_anim_80989F8.s
+16 -16
View File
@@ -217,13 +217,13 @@ _08098B72:
bne _08098B88 bne _08098B88
movs r6, 0x1 movs r6, 0x1
_08098B88: _08098B88:
ldr r0, _08098B90 @ =gUnknown_2023D44 ldr r0, _08098B90 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
b _08098B9C b _08098B9C
.align 2, 0 .align 2, 0
_08098B90: .4byte gUnknown_2023D44 _08098B90: .4byte gBattlerSpriteIds
_08098B94: _08098B94:
ldr r1, _08098BAC @ =gUnknown_2023D44 ldr r1, _08098BAC @ =gBattlerSpriteIds
ldr r0, _08098BB0 @ =gBattleAnimAttacker ldr r0, _08098BB0 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -237,7 +237,7 @@ _08098BA2:
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
b _08098BF2 b _08098BF2
.align 2, 0 .align 2, 0
_08098BAC: .4byte gUnknown_2023D44 _08098BAC: .4byte gBattlerSpriteIds
_08098BB0: .4byte gBattleAnimAttacker _08098BB0: .4byte gBattleAnimAttacker
_08098BB4: _08098BB4:
ldr r1, _08098BF8 @ =gSprites ldr r1, _08098BF8 @ =gSprites
@@ -929,7 +929,7 @@ _080990E0:
movs r0, 0 movs r0, 0
strh r2, [r4, 0x2E] strh r2, [r4, 0x2E]
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldr r1, _08099110 @ =gUnknown_2023D44 ldr r1, _08099110 @ =gBattlerSpriteIds
ldr r0, _08099114 @ =gBattleAnimAttacker ldr r0, _08099114 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -946,7 +946,7 @@ _080990E0:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809910C: .4byte gBattleAnimArgs _0809910C: .4byte gBattleAnimArgs
_08099110: .4byte gUnknown_2023D44 _08099110: .4byte gBattlerSpriteIds
_08099114: .4byte gBattleAnimAttacker _08099114: .4byte gBattleAnimAttacker
_08099118: .4byte sub_8099120 _08099118: .4byte sub_8099120
_0809911C: .4byte sub_8074DC4 _0809911C: .4byte sub_8074DC4
@@ -1037,15 +1037,15 @@ sub_80991B4: @ 80991B4
ldrsh r0, [r0, r1] ldrsh r0, [r0, r1]
cmp r0, 0 cmp r0, 0
bne _080991D8 bne _080991D8
ldr r1, _080991D0 @ =gUnknown_2023D44 ldr r1, _080991D0 @ =gBattlerSpriteIds
ldr r0, _080991D4 @ =gBattleAnimAttacker ldr r0, _080991D4 @ =gBattleAnimAttacker
b _080991DC b _080991DC
.align 2, 0 .align 2, 0
_080991CC: .4byte gBattleAnimArgs _080991CC: .4byte gBattleAnimArgs
_080991D0: .4byte gUnknown_2023D44 _080991D0: .4byte gBattlerSpriteIds
_080991D4: .4byte gBattleAnimAttacker _080991D4: .4byte gBattleAnimAttacker
_080991D8: _080991D8:
ldr r1, _0809923C @ =gUnknown_2023D44 ldr r1, _0809923C @ =gBattlerSpriteIds
ldr r0, _08099240 @ =gBattleAnimTarget ldr r0, _08099240 @ =gBattleAnimTarget
_080991DC: _080991DC:
ldrb r0, [r0] ldrb r0, [r0]
@@ -1095,7 +1095,7 @@ _080991DC:
strh r3, [r6, 0x32] strh r3, [r6, 0x32]
b _08099252 b _08099252
.align 2, 0 .align 2, 0
_0809923C: .4byte gUnknown_2023D44 _0809923C: .4byte gBattlerSpriteIds
_08099240: .4byte gBattleAnimTarget _08099240: .4byte gBattleAnimTarget
_08099244: .4byte gBattleAnimArgs _08099244: .4byte gBattleAnimArgs
_08099248: .4byte gSprites _08099248: .4byte gSprites
@@ -1202,7 +1202,7 @@ _080992FC:
ldr r0, _0809937C @ =gBattleAnimTarget ldr r0, _0809937C @ =gBattleAnimTarget
_080992FE: _080992FE:
ldrb r2, [r0] ldrb r2, [r0]
ldr r0, _08099380 @ =gUnknown_2023D44 ldr r0, _08099380 @ =gBattlerSpriteIds
adds r0, r2, r0 adds r0, r2, r0
ldrb r6, [r0] ldrb r6, [r0]
adds r0, r2, 0 adds r0, r2, 0
@@ -1264,7 +1264,7 @@ _08099328:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0809937C: .4byte gBattleAnimTarget _0809937C: .4byte gBattleAnimTarget
_08099380: .4byte gUnknown_2023D44 _08099380: .4byte gBattlerSpriteIds
_08099384: .4byte gBattleAnimArgs _08099384: .4byte gBattleAnimArgs
_08099388: .4byte gSprites _08099388: .4byte gSprites
_0809938C: .4byte DestroyAnimSprite _0809938C: .4byte DestroyAnimSprite
@@ -1295,7 +1295,7 @@ _080993BC:
ldr r0, _0809943C @ =gBattleAnimTarget ldr r0, _0809943C @ =gBattleAnimTarget
_080993BE: _080993BE:
ldrb r1, [r0] ldrb r1, [r0]
ldr r0, _08099440 @ =gUnknown_2023D44 ldr r0, _08099440 @ =gBattlerSpriteIds
adds r0, r1, r0 adds r0, r1, r0
ldrb r7, [r0] ldrb r7, [r0]
adds r0, r1, 0 adds r0, r1, 0
@@ -1357,7 +1357,7 @@ _080993E8:
b _08099458 b _08099458
.align 2, 0 .align 2, 0
_0809943C: .4byte gBattleAnimTarget _0809943C: .4byte gBattleAnimTarget
_08099440: .4byte gUnknown_2023D44 _08099440: .4byte gBattlerSpriteIds
_08099444: .4byte gBattleAnimArgs _08099444: .4byte gBattleAnimArgs
_08099448: .4byte gSprites _08099448: .4byte gSprites
_0809944C: .4byte DestroyAnimSprite _0809944C: .4byte DestroyAnimSprite
@@ -1620,7 +1620,7 @@ _08099636:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _0809965C beq _0809965C
ldr r1, _08099658 @ =gUnknown_2023D44 ldr r1, _08099658 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
eors r0, r4 eors r0, r4
adds r0, r1 adds r0, r1
@@ -1628,7 +1628,7 @@ _08099636:
b _08099664 b _08099664
.align 2, 0 .align 2, 0
_08099654: .4byte gBattleAnimTarget _08099654: .4byte gBattleAnimTarget
_08099658: .4byte gUnknown_2023D44 _08099658: .4byte gBattlerSpriteIds
_0809965C: _0809965C:
adds r0, r6, 0 adds r0, r6, 0
bl DestroyAnimVisualTask bl DestroyAnimVisualTask
asm/battle_anim_80DE2C0.s
+10 -10
View File
@@ -3301,7 +3301,7 @@ c3_80DFBE4: @ 80DFBE4
lsrs r0, 24 lsrs r0, 24
ldr r4, _080DFC14 @ =gBattleAnimArgs ldr r4, _080DFC14 @ =gBattleAnimArgs
ldr r3, _080DFC18 @ =gSprites ldr r3, _080DFC18 @ =gSprites
ldr r2, _080DFC1C @ =gUnknown_2023D44 ldr r2, _080DFC1C @ =gBattlerSpriteIds
ldr r1, _080DFC20 @ =gBattleAnimAttacker ldr r1, _080DFC20 @ =gBattleAnimAttacker
ldrb r1, [r1] ldrb r1, [r1]
adds r1, r2 adds r1, r2
@@ -3322,7 +3322,7 @@ c3_80DFBE4: @ 80DFBE4
.align 2, 0 .align 2, 0
_080DFC14: .4byte gBattleAnimArgs _080DFC14: .4byte gBattleAnimArgs
_080DFC18: .4byte gSprites _080DFC18: .4byte gSprites
_080DFC1C: .4byte gUnknown_2023D44 _080DFC1C: .4byte gBattlerSpriteIds
_080DFC20: .4byte gBattleAnimAttacker _080DFC20: .4byte gBattleAnimAttacker
thumb_func_end c3_80DFBE4 thumb_func_end c3_80DFBE4
@@ -7441,7 +7441,7 @@ sub_80E1C48: @ 80E1C48
lsls r0, 3 lsls r0, 3
mov r1, r8 mov r1, r8
adds r4, r0, r1 adds r4, r0, r1
ldr r1, _080E1CAC @ =gUnknown_2023D44 ldr r1, _080E1CAC @ =gBattlerSpriteIds
ldr r2, _080E1CB0 @ =gBattleAnimAttacker ldr r2, _080E1CB0 @ =gBattleAnimAttacker
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r1 adds r0, r1
@@ -7478,7 +7478,7 @@ _080E1C8C:
b _080E1D2C b _080E1D2C
.align 2, 0 .align 2, 0
_080E1CA8: .4byte gTasks _080E1CA8: .4byte gTasks
_080E1CAC: .4byte gUnknown_2023D44 _080E1CAC: .4byte gBattlerSpriteIds
_080E1CB0: .4byte gBattleAnimAttacker _080E1CB0: .4byte gBattleAnimAttacker
_080E1CB4: .4byte gBattleAnimArgs _080E1CB4: .4byte gBattleAnimArgs
_080E1CB8: .4byte 0xffff8000 _080E1CB8: .4byte 0xffff8000
@@ -12088,7 +12088,7 @@ _080E4048: .4byte gBattleAnimAttacker
_080E404C: .4byte gBattleAnimTarget _080E404C: .4byte gBattleAnimTarget
_080E4050: .4byte gTasks _080E4050: .4byte gTasks
_080E4054: _080E4054:
ldr r1, _080E4090 @ =gUnknown_2023D44 ldr r1, _080E4090 @ =gBattlerSpriteIds
ldr r0, _080E4094 @ =gBattleAnimAttacker ldr r0, _080E4094 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -12119,7 +12119,7 @@ _080E4054:
ldrsh r1, [r2, r3] ldrsh r1, [r2, r3]
b _080E4122 b _080E4122
.align 2, 0 .align 2, 0
_080E4090: .4byte gUnknown_2023D44 _080E4090: .4byte gBattlerSpriteIds
_080E4094: .4byte gBattleAnimAttacker _080E4094: .4byte gBattleAnimAttacker
_080E4098: .4byte gSprites _080E4098: .4byte gSprites
_080E409C: _080E409C:
@@ -12147,7 +12147,7 @@ _080E40B0:
strh r1, [r0, 0x26] strh r1, [r0, 0x26]
b _080E414C b _080E414C
_080E40C8: _080E40C8:
ldr r1, _080E4108 @ =gUnknown_2023D44 ldr r1, _080E4108 @ =gBattlerSpriteIds
ldr r0, _080E410C @ =gBattleAnimAttacker ldr r0, _080E410C @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -12180,7 +12180,7 @@ _080E40C8:
bgt _080E414C bgt _080E414C
b _080E4126 b _080E4126
.align 2, 0 .align 2, 0
_080E4108: .4byte gUnknown_2023D44 _080E4108: .4byte gBattlerSpriteIds
_080E410C: .4byte gBattleAnimAttacker _080E410C: .4byte gBattleAnimAttacker
_080E4110: .4byte gSprites _080E4110: .4byte gSprites
_080E4114: _080E4114:
@@ -12200,7 +12200,7 @@ _080E4126:
strh r0, [r2, 0x26] strh r0, [r2, 0x26]
b _080E414C b _080E414C
_080E412E: _080E412E:
ldr r1, _080E4154 @ =gUnknown_2023D44 ldr r1, _080E4154 @ =gBattlerSpriteIds
ldr r0, _080E4158 @ =gBattleAnimAttacker ldr r0, _080E4158 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -12219,7 +12219,7 @@ _080E414C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E4154: .4byte gUnknown_2023D44 _080E4154: .4byte gBattlerSpriteIds
_080E4158: .4byte gBattleAnimAttacker _080E4158: .4byte gBattleAnimAttacker
_080E415C: .4byte gSprites _080E415C: .4byte gSprites
thumb_func_end sub_80E3FC0 thumb_func_end sub_80E3FC0
asm/battle_anim_80EEC0C.s
+34 -34
View File
@@ -809,7 +809,7 @@ sub_80EF298: @ 80EF298
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r1, _080EF2C4 @ =gUnknown_2023D44 ldr r1, _080EF2C4 @ =gBattlerSpriteIds
ldr r0, _080EF2C8 @ =gBattleAnimAttacker ldr r0, _080EF2C8 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -829,7 +829,7 @@ sub_80EF298: @ 80EF298
beq _080EF2D6 beq _080EF2D6
b _080EF338 b _080EF338
.align 2, 0 .align 2, 0
_080EF2C4: .4byte gUnknown_2023D44 _080EF2C4: .4byte gBattlerSpriteIds
_080EF2C8: .4byte gBattleAnimAttacker _080EF2C8: .4byte gBattleAnimAttacker
_080EF2CC: .4byte gTasks _080EF2CC: .4byte gTasks
_080EF2D0: _080EF2D0:
@@ -900,7 +900,7 @@ sub_80EF344: @ 80EF344
sub sp, 0xC sub sp, 0xC
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r1, _080EF37C @ =gUnknown_2023D44 ldr r1, _080EF37C @ =gBattlerSpriteIds
ldr r4, _080EF380 @ =gBattleAnimAttacker ldr r4, _080EF380 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r1, r0, r1 adds r1, r0, r1
@@ -920,7 +920,7 @@ sub_80EF344: @ 80EF344
ldr r1, _080EF388 @ =gPlayerParty ldr r1, _080EF388 @ =gPlayerParty
b _080EF39C b _080EF39C
.align 2, 0 .align 2, 0
_080EF37C: .4byte gUnknown_2023D44 _080EF37C: .4byte gBattlerSpriteIds
_080EF380: .4byte gBattleAnimAttacker _080EF380: .4byte gBattleAnimAttacker
_080EF384: .4byte gBattlerPartyIndexes _080EF384: .4byte gBattlerPartyIndexes
_080EF388: .4byte gPlayerParty _080EF388: .4byte gPlayerParty
@@ -1260,7 +1260,7 @@ sub_80EF5AC: @ 80EF5AC
ldr r0, _080EF688 @ =gUnknown_2024018 ldr r0, _080EF688 @ =gUnknown_2024018
ldr r0, [r0] ldr r0, [r0]
ldr r3, [r0, 0x8] ldr r3, [r0, 0x8]
ldr r1, _080EF68C @ =gUnknown_2023D44 ldr r1, _080EF68C @ =gBattlerSpriteIds
mov r2, r8 mov r2, r8
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r1 adds r0, r1
@@ -1303,7 +1303,7 @@ _080EF67C: .4byte gSprites
_080EF680: .4byte gBattleAnimTarget _080EF680: .4byte gBattleAnimTarget
_080EF684: .4byte sub_80EF8C0 _080EF684: .4byte sub_80EF8C0
_080EF688: .4byte gUnknown_2024018 _080EF688: .4byte gUnknown_2024018
_080EF68C: .4byte gUnknown_2023D44 _080EF68C: .4byte gBattlerSpriteIds
_080EF690: .4byte gTasks _080EF690: .4byte gTasks
_080EF694: .4byte sub_80EF698 _080EF694: .4byte sub_80EF698
thumb_func_end sub_80EF5AC thumb_func_end sub_80EF5AC
@@ -1430,7 +1430,7 @@ _080EF708:
str r0, [r4] str r0, [r4]
movs r0, 0 movs r0, 0
bl GetBattlerAtPosition bl GetBattlerAtPosition
ldr r1, _080EF7DC @ =gUnknown_2023D44 ldr r1, _080EF7DC @ =gBattlerSpriteIds
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, r1 adds r0, r1
@@ -1462,7 +1462,7 @@ _080EF7CC: .4byte gUnknown_82606F4
_080EF7D0: .4byte gSprites _080EF7D0: .4byte gSprites
_080EF7D4: .4byte gBattleAnimTarget _080EF7D4: .4byte gBattleAnimTarget
_080EF7D8: .4byte SpriteCallbackDummy _080EF7D8: .4byte SpriteCallbackDummy
_080EF7DC: .4byte gUnknown_2023D44 _080EF7DC: .4byte gBattlerSpriteIds
_080EF7E0: .4byte sub_8012354 _080EF7E0: .4byte sub_8012354
_080EF7E4: .4byte gTasks _080EF7E4: .4byte gTasks
_080EF7E8: .4byte sub_80EF7EC _080EF7E8: .4byte sub_80EF7EC
@@ -1476,7 +1476,7 @@ sub_80EF7EC: @ 80EF7EC
ldr r6, _080EF84C @ =gSprites ldr r6, _080EF84C @ =gSprites
movs r0, 0 movs r0, 0
bl GetBattlerAtPosition bl GetBattlerAtPosition
ldr r1, _080EF850 @ =gUnknown_2023D44 ldr r1, _080EF850 @ =gBattlerSpriteIds
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, r1 adds r0, r1
@@ -1518,7 +1518,7 @@ _080EF846:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080EF84C: .4byte gSprites _080EF84C: .4byte gSprites
_080EF850: .4byte gUnknown_2023D44 _080EF850: .4byte gBattlerSpriteIds
_080EF854: .4byte gTasks _080EF854: .4byte gTasks
_080EF858: .4byte sub_80EF8C0 _080EF858: .4byte sub_80EF8C0
_080EF85C: .4byte sub_80EF864 _080EF85C: .4byte sub_80EF864
@@ -1533,7 +1533,7 @@ sub_80EF864: @ 80EF864
ldr r6, _080EF8B8 @ =gSprites ldr r6, _080EF8B8 @ =gSprites
movs r0, 0 movs r0, 0
bl GetBattlerAtPosition bl GetBattlerAtPosition
ldr r4, _080EF8BC @ =gUnknown_2023D44 ldr r4, _080EF8BC @ =gBattlerSpriteIds
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
adds r0, r4 adds r0, r4
@@ -1567,7 +1567,7 @@ _080EF8B0:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080EF8B8: .4byte gSprites _080EF8B8: .4byte gSprites
_080EF8BC: .4byte gUnknown_2023D44 _080EF8BC: .4byte gBattlerSpriteIds
thumb_func_end sub_80EF864 thumb_func_end sub_80EF864
thumb_func_start sub_80EF8C0 thumb_func_start sub_80EF8C0
@@ -1711,7 +1711,7 @@ sub_80EF9B4: @ 80EF9B4
ldr r0, _080EF9FC @ =sub_80EFA0C ldr r0, _080EF9FC @ =sub_80EFA0C
str r0, [r4, 0x1C] str r0, [r4, 0x1C]
ldr r2, _080EFA00 @ =gSprites ldr r2, _080EFA00 @ =gSprites
ldr r1, _080EFA04 @ =gUnknown_2023D44 ldr r1, _080EFA04 @ =gBattlerSpriteIds
ldr r0, _080EFA08 @ =gBattleAnimTarget ldr r0, _080EFA08 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1730,7 +1730,7 @@ _080EF9F0:
_080EF9F8: .4byte TaskDummy _080EF9F8: .4byte TaskDummy
_080EF9FC: .4byte sub_80EFA0C _080EF9FC: .4byte sub_80EFA0C
_080EFA00: .4byte gSprites _080EFA00: .4byte gSprites
_080EFA04: .4byte gUnknown_2023D44 _080EFA04: .4byte gBattlerSpriteIds
_080EFA08: .4byte gBattleAnimTarget _080EFA08: .4byte gBattleAnimTarget
thumb_func_end sub_80EF9B4 thumb_func_end sub_80EF9B4
@@ -1738,7 +1738,7 @@ _080EFA08: .4byte gBattleAnimTarget
sub_80EFA0C: @ 80EFA0C sub_80EFA0C: @ 80EFA0C
push {r4-r7,lr} push {r4-r7,lr}
adds r7, r0, 0 adds r7, r0, 0
ldr r1, _080EFA50 @ =gUnknown_2023D44 ldr r1, _080EFA50 @ =gBattlerSpriteIds
ldr r0, _080EFA54 @ =gBattleAnimTarget ldr r0, _080EFA54 @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1771,7 +1771,7 @@ _080EFA3E:
beq _080EFA62 beq _080EFA62
b _080EFB20 b _080EFB20
.align 2, 0 .align 2, 0
_080EFA50: .4byte gUnknown_2023D44 _080EFA50: .4byte gBattlerSpriteIds
_080EFA54: .4byte gBattleAnimTarget _080EFA54: .4byte gBattleAnimTarget
_080EFA58: .4byte gTasks _080EFA58: .4byte gTasks
_080EFA5C: _080EFA5C:
@@ -2555,7 +2555,7 @@ _080F004C:
cmp r1, r0 cmp r1, r0
bne _080F0088 bne _080F0088
ldr r5, _080F0098 @ =gSprites ldr r5, _080F0098 @ =gSprites
ldr r4, _080F009C @ =gUnknown_2023D44 ldr r4, _080F009C @ =gBattlerSpriteIds
ldrb r0, [r7] ldrb r0, [r7]
adds r0, r4 adds r0, r4
ldrb r1, [r0] ldrb r1, [r0]
@@ -2589,7 +2589,7 @@ _080F0088:
.align 2, 0 .align 2, 0
_080F0094: .4byte 0x0000013b _080F0094: .4byte 0x0000013b
_080F0098: .4byte gSprites _080F0098: .4byte gSprites
_080F009C: .4byte gUnknown_2023D44 _080F009C: .4byte gBattlerSpriteIds
_080F00A0: .4byte sub_80F00A4 _080F00A0: .4byte sub_80F00A4
thumb_func_end sub_80EFFC4 thumb_func_end sub_80EFFC4
@@ -2901,7 +2901,7 @@ sub_80F02B0: @ 80F02B0
bl LaunchBallFadeMonTask bl LaunchBallFadeMonTask
_080F0302: _080F0302:
ldr r6, _080F0370 @ =gSprites ldr r6, _080F0370 @ =gSprites
ldr r5, _080F0374 @ =gUnknown_2023D44 ldr r5, _080F0374 @ =gBattlerSpriteIds
ldr r4, _080F036C @ =gBattleAnimTarget ldr r4, _080F036C @ =gBattleAnimTarget
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -2952,7 +2952,7 @@ _080F0364: .4byte sub_80F0378
_080F0368: .4byte gUnknown_2023D68 _080F0368: .4byte gUnknown_2023D68
_080F036C: .4byte gBattleAnimTarget _080F036C: .4byte gBattleAnimTarget
_080F0370: .4byte gSprites _080F0370: .4byte gSprites
_080F0374: .4byte gUnknown_2023D44 _080F0374: .4byte gBattlerSpriteIds
thumb_func_end sub_80F02B0 thumb_func_end sub_80F02B0
thumb_func_start sub_80F0378 thumb_func_start sub_80F0378
@@ -2974,7 +2974,7 @@ sub_80F0378: @ 80F0378
strb r0, [r2] strb r0, [r2]
_080F0396: _080F0396:
ldr r4, _080F03C4 @ =gSprites ldr r4, _080F03C4 @ =gSprites
ldr r3, _080F03C8 @ =gUnknown_2023D44 ldr r3, _080F03C8 @ =gBattlerSpriteIds
ldr r2, _080F03CC @ =gBattleAnimTarget ldr r2, _080F03CC @ =gBattleAnimTarget
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
@@ -2996,7 +2996,7 @@ _080F0396:
b _080F03F0 b _080F03F0
.align 2, 0 .align 2, 0
_080F03C4: .4byte gSprites _080F03C4: .4byte gSprites
_080F03C8: .4byte gUnknown_2023D44 _080F03C8: .4byte gBattlerSpriteIds
_080F03CC: .4byte gBattleAnimTarget _080F03CC: .4byte gBattleAnimTarget
_080F03D0: _080F03D0:
ldr r6, _080F045C @ =0xfffffee0 ldr r6, _080F045C @ =0xfffffee0
@@ -3026,7 +3026,7 @@ _080F03F0:
cmp r5, 0 cmp r5, 0
beq _080F0456 beq _080F0456
ldr r4, _080F0460 @ =gSprites ldr r4, _080F0460 @ =gSprites
ldr r3, _080F0464 @ =gUnknown_2023D44 ldr r3, _080F0464 @ =gBattlerSpriteIds
ldr r2, _080F0468 @ =gBattleAnimTarget ldr r2, _080F0468 @ =gBattleAnimTarget
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
@@ -3073,7 +3073,7 @@ _080F0456:
.align 2, 0 .align 2, 0
_080F045C: .4byte 0xfffffee0 _080F045C: .4byte 0xfffffee0
_080F0460: .4byte gSprites _080F0460: .4byte gSprites
_080F0464: .4byte gUnknown_2023D44 _080F0464: .4byte gBattlerSpriteIds
_080F0468: .4byte gBattleAnimTarget _080F0468: .4byte gBattleAnimTarget
_080F046C: .4byte gUnknown_2024018 _080F046C: .4byte gUnknown_2024018
_080F0470: .4byte sub_80F018C _080F0470: .4byte sub_80F018C
@@ -5082,7 +5082,7 @@ sub_80F1420: @ 80F1420
lsrs r7, r0, 24 lsrs r7, r0, 24
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
ldr r0, _080F1454 @ =gUnknown_2023D44 ldr r0, _080F1454 @ =gBattlerSpriteIds
ldr r3, _080F1458 @ =gBattleAnimAttacker ldr r3, _080F1458 @ =gBattleAnimAttacker
ldrb r2, [r3] ldrb r2, [r3]
adds r0, r2, r0 adds r0, r2, r0
@@ -5102,7 +5102,7 @@ sub_80F1420: @ 80F1420
beq _080F1466 beq _080F1466
b _080F15BA b _080F15BA
.align 2, 0 .align 2, 0
_080F1454: .4byte gUnknown_2023D44 _080F1454: .4byte gBattlerSpriteIds
_080F1458: .4byte gBattleAnimAttacker _080F1458: .4byte gBattleAnimAttacker
_080F145C: .4byte gTasks _080F145C: .4byte gTasks
_080F1460: _080F1460:
@@ -5379,7 +5379,7 @@ _080F1644:
strh r0, [r4, 0x26] strh r0, [r4, 0x26]
b _080F16B4 b _080F16B4
_080F167E: _080F167E:
ldr r1, _080F16BC @ =gUnknown_2023D44 ldr r1, _080F16BC @ =gBattlerSpriteIds
ldr r4, _080F16C0 @ =gBattleAnimAttacker ldr r4, _080F16C0 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -5408,7 +5408,7 @@ _080F16B4:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F16BC: .4byte gUnknown_2023D44 _080F16BC: .4byte gBattlerSpriteIds
_080F16C0: .4byte gBattleAnimAttacker _080F16C0: .4byte gBattleAnimAttacker
_080F16C4: .4byte gSprites _080F16C4: .4byte gSprites
_080F16C8: .4byte 0x06010000 _080F16C8: .4byte 0x06010000
@@ -6013,7 +6013,7 @@ sub_80F1B3C: @ 80F1B3C
adds r0, r4, 0 adds r0, r4, 0
bl sub_8075068 bl sub_8075068
ldr r2, _080F1BB8 @ =gSprites ldr r2, _080F1BB8 @ =gSprites
ldr r1, _080F1BBC @ =gUnknown_2023D44 ldr r1, _080F1BBC @ =gBattlerSpriteIds
ldr r0, _080F1BC0 @ =gBattleAnimAttacker ldr r0, _080F1BC0 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -6034,7 +6034,7 @@ sub_80F1B3C: @ 80F1B3C
_080F1BB0: .4byte gBattleAnimArgs _080F1BB0: .4byte gBattleAnimArgs
_080F1BB4: .4byte 0x0000ffe0 _080F1BB4: .4byte 0x0000ffe0
_080F1BB8: .4byte gSprites _080F1BB8: .4byte gSprites
_080F1BBC: .4byte gUnknown_2023D44 _080F1BBC: .4byte gBattlerSpriteIds
_080F1BC0: .4byte gBattleAnimAttacker _080F1BC0: .4byte gBattleAnimAttacker
_080F1BC4: .4byte sub_8012354 _080F1BC4: .4byte sub_8012354
_080F1BC8: .4byte sub_80F1BCC _080F1BC8: .4byte sub_80F1BCC
@@ -6045,7 +6045,7 @@ sub_80F1BCC: @ 80F1BCC
push {lr} push {lr}
adds r3, r0, 0 adds r3, r0, 0
ldr r2, _080F1BF4 @ =gSprites ldr r2, _080F1BF4 @ =gSprites
ldr r1, _080F1BF8 @ =gUnknown_2023D44 ldr r1, _080F1BF8 @ =gBattlerSpriteIds
ldr r0, _080F1BFC @ =gBattleAnimAttacker ldr r0, _080F1BFC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -6065,7 +6065,7 @@ _080F1BF0:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F1BF4: .4byte gSprites _080F1BF4: .4byte gSprites
_080F1BF8: .4byte gUnknown_2023D44 _080F1BF8: .4byte gBattlerSpriteIds
_080F1BFC: .4byte gBattleAnimAttacker _080F1BFC: .4byte gBattleAnimAttacker
_080F1C00: .4byte sub_80F1C04 _080F1C00: .4byte sub_80F1C04
thumb_func_end sub_80F1BCC thumb_func_end sub_80F1BCC
@@ -6101,7 +6101,7 @@ sub_80F1C30: @ 80F1C30
push {r4,r5,lr} push {r4,r5,lr}
adds r4, r0, 0 adds r4, r0, 0
ldr r5, _080F1C80 @ =gSprites ldr r5, _080F1C80 @ =gSprites
ldr r3, _080F1C84 @ =gUnknown_2023D44 ldr r3, _080F1C84 @ =gBattlerSpriteIds
ldr r2, _080F1C88 @ =gBattleAnimAttacker ldr r2, _080F1C88 @ =gBattleAnimAttacker
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r3 adds r0, r3
@@ -6138,7 +6138,7 @@ _080F1C78:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080F1C80: .4byte gSprites _080F1C80: .4byte gSprites
_080F1C84: .4byte gUnknown_2023D44 _080F1C84: .4byte gBattlerSpriteIds
_080F1C88: .4byte gBattleAnimAttacker _080F1C88: .4byte gBattleAnimAttacker
thumb_func_end sub_80F1C30 thumb_func_end sub_80F1C30
asm/battle_anim_effects_1.s
+12 -12
View File
@@ -6380,7 +6380,7 @@ _080A53B6:
strh r1, [r4, 0x30] strh r1, [r4, 0x30]
movs r0, 0 movs r0, 0
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldr r1, _080A53DC @ =gUnknown_2023D44 ldr r1, _080A53DC @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -6395,7 +6395,7 @@ _080A53B6:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A53D8: .4byte gBattleAnimAttacker _080A53D8: .4byte gBattleAnimAttacker
_080A53DC: .4byte gUnknown_2023D44 _080A53DC: .4byte gBattlerSpriteIds
_080A53E0: .4byte sub_80A53E8 _080A53E0: .4byte sub_80A53E8
_080A53E4: .4byte sub_8074DC4 _080A53E4: .4byte sub_8074DC4
thumb_func_end sub_80A5398 thumb_func_end sub_80A5398
@@ -6408,7 +6408,7 @@ sub_80A53E8: @ 80A53E8
ldrsh r6, [r5, r0] ldrsh r6, [r5, r0]
cmp r6, 0 cmp r6, 0
bne _080A5424 bne _080A5424
ldr r1, _080A5464 @ =gUnknown_2023D44 ldr r1, _080A5464 @ =gBattlerSpriteIds
ldr r4, _080A5468 @ =gBattleAnimAttacker ldr r4, _080A5468 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -6464,7 +6464,7 @@ _080A545E:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A5464: .4byte gUnknown_2023D44 _080A5464: .4byte gBattlerSpriteIds
_080A5468: .4byte gBattleAnimAttacker _080A5468: .4byte gBattleAnimAttacker
_080A546C: .4byte 0xfffffd00 _080A546C: .4byte 0xfffffd00
_080A5470: .4byte sub_80A5584 _080A5470: .4byte sub_80A5584
@@ -6490,7 +6490,7 @@ _080A5492:
strh r1, [r4, 0x30] strh r1, [r4, 0x30]
movs r0, 0 movs r0, 0
strh r0, [r4, 0x32] strh r0, [r4, 0x32]
ldr r1, _080A54B8 @ =gUnknown_2023D44 ldr r1, _080A54B8 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r0, [r0] ldrb r0, [r0]
@@ -6505,7 +6505,7 @@ _080A5492:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A54B4: .4byte gBattleAnimAttacker _080A54B4: .4byte gBattleAnimAttacker
_080A54B8: .4byte gUnknown_2023D44 _080A54B8: .4byte gBattlerSpriteIds
_080A54BC: .4byte sub_80A5584 _080A54BC: .4byte sub_80A5584
_080A54C0: .4byte sub_8074DC4 _080A54C0: .4byte sub_8074DC4
thumb_func_end sub_80A5474 thumb_func_end sub_80A5474
@@ -6540,7 +6540,7 @@ sub_80A54E8: @ 80A54E8
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
cmp r0, 0 cmp r0, 0
bne _080A5538 bne _080A5538
ldr r1, _080A5524 @ =gUnknown_2023D44 ldr r1, _080A5524 @ =gBattlerSpriteIds
ldr r4, _080A5528 @ =gBattleAnimAttacker ldr r4, _080A5528 @ =gBattleAnimAttacker
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -6563,7 +6563,7 @@ sub_80A54E8: @ 80A54E8
lsls r0, 4 lsls r0, 4
b _080A5536 b _080A5536
.align 2, 0 .align 2, 0
_080A5524: .4byte gUnknown_2023D44 _080A5524: .4byte gBattlerSpriteIds
_080A5528: .4byte gBattleAnimAttacker _080A5528: .4byte gBattleAnimAttacker
_080A552C: _080A552C:
movs r0, 0x80 movs r0, 0x80
@@ -6649,7 +6649,7 @@ _080A55B6:
b _080A568E b _080A568E
_080A55BC: _080A55BC:
strh r5, [r4, 0x30] strh r5, [r4, 0x30]
ldr r1, _080A5640 @ =gUnknown_2023D44 ldr r1, _080A5640 @ =gBattlerSpriteIds
ldr r2, _080A5644 @ =gBattleAnimAttacker ldr r2, _080A5644 @ =gBattleAnimAttacker
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r1 adds r0, r1
@@ -6713,7 +6713,7 @@ _080A55FA:
strh r0, [r4, 0x2E] strh r0, [r4, 0x2E]
b _080A568E b _080A568E
.align 2, 0 .align 2, 0
_080A5640: .4byte gUnknown_2023D44 _080A5640: .4byte gBattlerSpriteIds
_080A5644: .4byte gBattleAnimAttacker _080A5644: .4byte gBattleAnimAttacker
_080A5648: .4byte 0xfffffe00 _080A5648: .4byte 0xfffffe00
_080A564C: _080A564C:
@@ -6762,7 +6762,7 @@ sub_80A5694: @ 80A5694
adds r0, r6 adds r0, r6
lsls r0, 3 lsls r0, 3
adds r5, r0, r1 adds r5, r0, r1
ldr r1, _080A56DC @ =gUnknown_2023D44 ldr r1, _080A56DC @ =gBattlerSpriteIds
ldr r2, _080A56E0 @ =gBattleAnimAttacker ldr r2, _080A56E0 @ =gBattleAnimAttacker
ldrb r0, [r2] ldrb r0, [r2]
adds r0, r1 adds r0, r1
@@ -6787,7 +6787,7 @@ sub_80A5694: @ 80A5694
b _080A5722 b _080A5722
.align 2, 0 .align 2, 0
_080A56D8: .4byte gTasks _080A56D8: .4byte gTasks
_080A56DC: .4byte gUnknown_2023D44 _080A56DC: .4byte gBattlerSpriteIds
_080A56E0: .4byte gBattleAnimAttacker _080A56E0: .4byte gBattleAnimAttacker
_080A56E4: .4byte gBattleAnimArgs _080A56E4: .4byte gBattleAnimArgs
_080A56E8: _080A56E8:
asm/battle_anim_effects_2.s
+18 -18
View File
@@ -195,7 +195,7 @@ sub_80A6F8C: @ 80A6F8C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
strh r0, [r5, 0x22] strh r0, [r5, 0x22]
ldr r1, _080A6FD8 @ =gUnknown_2023D44 ldr r1, _080A6FD8 @ =gBattlerSpriteIds
ldr r0, _080A6FDC @ =gBattleAnimTarget ldr r0, _080A6FDC @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -214,7 +214,7 @@ sub_80A6F8C: @ 80A6F8C
b _080A6FEE b _080A6FEE
.align 2, 0 .align 2, 0
_080A6FD4: .4byte gBattleAnimAttacker _080A6FD4: .4byte gBattleAnimAttacker
_080A6FD8: .4byte gUnknown_2023D44 _080A6FD8: .4byte gBattlerSpriteIds
_080A6FDC: .4byte gBattleAnimTarget _080A6FDC: .4byte gBattleAnimTarget
_080A6FE0: .4byte gBattleAnimArgs _080A6FE0: .4byte gBattleAnimArgs
_080A6FE4: _080A6FE4:
@@ -323,7 +323,7 @@ sub_80A70A0: @ 80A70A0
adds r4, r0, 0 adds r4, r0, 0
lsls r4, 24 lsls r4, 24
lsrs r4, 24 lsrs r4, 24
ldr r1, _080A70CC @ =gUnknown_2023D44 ldr r1, _080A70CC @ =gBattlerSpriteIds
ldr r0, _080A70D0 @ =gBattleAnimAttacker ldr r0, _080A70D0 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -341,7 +341,7 @@ sub_80A70A0: @ 80A70A0
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080A70CC: .4byte gUnknown_2023D44 _080A70CC: .4byte gBattlerSpriteIds
_080A70D0: .4byte gBattleAnimAttacker _080A70D0: .4byte gBattleAnimAttacker
_080A70D4: .4byte gTasks _080A70D4: .4byte gTasks
_080A70D8: .4byte sub_80A70DC _080A70D8: .4byte sub_80A70DC
@@ -352,7 +352,7 @@ sub_80A70DC: @ 80A70DC
push {r4-r6,lr} push {r4-r6,lr}
lsls r0, 24 lsls r0, 24
lsrs r5, r0, 24 lsrs r5, r0, 24
ldr r1, _080A710C @ =gUnknown_2023D44 ldr r1, _080A710C @ =gBattlerSpriteIds
ldr r0, _080A7110 @ =gBattleAnimAttacker ldr r0, _080A7110 @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r1, r0, r1 adds r1, r0, r1
@@ -373,7 +373,7 @@ sub_80A70DC: @ 80A70DC
adds r6, r2, 0 adds r6, r2, 0
b _080A7126 b _080A7126
.align 2, 0 .align 2, 0
_080A710C: .4byte gUnknown_2023D44 _080A710C: .4byte gBattlerSpriteIds
_080A7110: .4byte gBattleAnimAttacker _080A7110: .4byte gBattleAnimAttacker
_080A7114: .4byte gTasks _080A7114: .4byte gTasks
_080A7118: _080A7118:
@@ -4013,21 +4013,21 @@ _080A8D10:
cmp r0, 0 cmp r0, 0
beq _080A8D5C beq _080A8D5C
ldr r2, _080A8D54 @ =gSprites ldr r2, _080A8D54 @ =gSprites
ldr r0, _080A8D58 @ =gUnknown_2023D44 ldr r0, _080A8D58 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
b _080A8DEA b _080A8DEA
.align 2, 0 .align 2, 0
_080A8D50: .4byte gBattleAnimArgs _080A8D50: .4byte gBattleAnimArgs
_080A8D54: .4byte gSprites _080A8D54: .4byte gSprites
_080A8D58: .4byte gUnknown_2023D44 _080A8D58: .4byte gBattlerSpriteIds
_080A8D5C: _080A8D5C:
ldr r2, _080A8D64 @ =gSprites ldr r2, _080A8D64 @ =gSprites
ldr r0, _080A8D68 @ =gUnknown_2023D44 ldr r0, _080A8D68 @ =gBattlerSpriteIds
add r0, r8 add r0, r8
b _080A8DEA b _080A8DEA
.align 2, 0 .align 2, 0
_080A8D64: .4byte gSprites _080A8D64: .4byte gSprites
_080A8D68: .4byte gUnknown_2023D44 _080A8D68: .4byte gBattlerSpriteIds
_080A8D6C: _080A8D6C:
adds r0, r7, 0 adds r0, r7, 0
mov r1, r10 mov r1, r10
@@ -4053,7 +4053,7 @@ _080A8D6C:
cmp r0, 0 cmp r0, 0
beq _080A8DE4 beq _080A8DE4
ldr r3, _080A8DD8 @ =gSprites ldr r3, _080A8DD8 @ =gSprites
ldr r2, _080A8DDC @ =gUnknown_2023D44 ldr r2, _080A8DDC @ =gBattlerSpriteIds
adds r0, r7, r2 adds r0, r7, r2
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4080,13 +4080,13 @@ _080A8D6C:
.align 2, 0 .align 2, 0
_080A8DD4: .4byte gBattleAnimArgs _080A8DD4: .4byte gBattleAnimArgs
_080A8DD8: .4byte gSprites _080A8DD8: .4byte gSprites
_080A8DDC: .4byte gUnknown_2023D44 _080A8DDC: .4byte gBattlerSpriteIds
_080A8DE0: _080A8DE0:
adds r0, r6, 0 adds r0, r6, 0
b _080A8DF4 b _080A8DF4
_080A8DE4: _080A8DE4:
ldr r2, _080A8E40 @ =gSprites ldr r2, _080A8E40 @ =gSprites
ldr r0, _080A8E44 @ =gUnknown_2023D44 ldr r0, _080A8E44 @ =gBattlerSpriteIds
adds r0, r7, r0 adds r0, r7, r0
_080A8DEA: _080A8DEA:
ldrb r1, [r0] ldrb r1, [r0]
@@ -4132,7 +4132,7 @@ _080A8DFA:
b _080A8E6C b _080A8E6C
.align 2, 0 .align 2, 0
_080A8E40: .4byte gSprites _080A8E40: .4byte gSprites
_080A8E44: .4byte gUnknown_2023D44 _080A8E44: .4byte gBattlerSpriteIds
_080A8E48: .4byte gBattleAnimArgs _080A8E48: .4byte gBattleAnimArgs
_080A8E4C: _080A8E4C:
mov r4, sp mov r4, sp
@@ -7911,7 +7911,7 @@ sub_80AAB7C: @ 80AAB7C
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r3, _080AAB98 @ =gBattleAnimArgs ldr r3, _080AAB98 @ =gBattleAnimArgs
ldr r1, _080AAB9C @ =gUnknown_2037EE4 ldr r1, _080AAB9C @ =gAnimDisableStructPtr
ldr r1, [r1] ldr r1, [r1]
ldrb r2, [r1, 0x10] ldrb r2, [r1, 0x10]
movs r1, 0x1 movs r1, 0x1
@@ -7922,7 +7922,7 @@ sub_80AAB7C: @ 80AAB7C
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AAB98: .4byte gBattleAnimArgs _080AAB98: .4byte gBattleAnimArgs
_080AAB9C: .4byte gUnknown_2037EE4 _080AAB9C: .4byte gAnimDisableStructPtr
thumb_func_end sub_80AAB7C thumb_func_end sub_80AAB7C
thumb_func_start update_fury_cutter_counter_copy thumb_func_start update_fury_cutter_counter_copy
@@ -7931,7 +7931,7 @@ update_fury_cutter_counter_copy: @ 80AABA0
lsls r0, 24 lsls r0, 24
lsrs r0, 24 lsrs r0, 24
ldr r2, _080AABB8 @ =gBattleAnimArgs ldr r2, _080AABB8 @ =gBattleAnimArgs
ldr r1, _080AABBC @ =gUnknown_2037EE4 ldr r1, _080AABBC @ =gAnimDisableStructPtr
ldr r1, [r1] ldr r1, [r1]
ldrb r1, [r1, 0x10] ldrb r1, [r1, 0x10]
strh r1, [r2, 0xE] strh r1, [r2, 0xE]
@@ -7940,7 +7940,7 @@ update_fury_cutter_counter_copy: @ 80AABA0
bx r0 bx r0
.align 2, 0 .align 2, 0
_080AABB8: .4byte gBattleAnimArgs _080AABB8: .4byte gBattleAnimArgs
_080AABBC: .4byte gUnknown_2037EE4 _080AABBC: .4byte gAnimDisableStructPtr
thumb_func_end update_fury_cutter_counter_copy thumb_func_end update_fury_cutter_counter_copy
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/battle_anim_utility_funcs.s
+14 -14
View File
@@ -752,7 +752,7 @@ _080BADAA:
cmp r0, 0x1 cmp r0, 0x1
bne _080BADFE bne _080BADFE
ldr r3, _080BAE3C @ =gSprites ldr r3, _080BAE3C @ =gSprites
ldr r1, _080BAE40 @ =gUnknown_2023D44 ldr r1, _080BAE40 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
eors r0, r6 eors r0, r6
adds r0, r1 adds r0, r1
@@ -808,7 +808,7 @@ _080BAE30: .4byte 0x00003f42
_080BAE34: .4byte 0x00000c08 _080BAE34: .4byte 0x00000c08
_080BAE38: .4byte gBattleAnimAttacker _080BAE38: .4byte gBattleAnimAttacker
_080BAE3C: .4byte gSprites _080BAE3C: .4byte gSprites
_080BAE40: .4byte gUnknown_2023D44 _080BAE40: .4byte gBattlerSpriteIds
_080BAE44: .4byte gBattlerPartyIndexes _080BAE44: .4byte gBattlerPartyIndexes
_080BAE48: .4byte gEnemyParty _080BAE48: .4byte gEnemyParty
_080BAE4C: _080BAE4C:
@@ -1020,7 +1020,7 @@ _080BAFCA:
ldrsh r0, [r5, r1] ldrsh r0, [r5, r1]
cmp r0, 0x1 cmp r0, 0x1
bne _080BB050 bne _080BB050
ldr r2, _080BB080 @ =gUnknown_2023D44 ldr r2, _080BB080 @ =gBattlerSpriteIds
ldr r0, _080BB084 @ =gBattleAnimAttacker ldr r0, _080BB084 @ =gBattleAnimAttacker
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x2 movs r0, 0x2
@@ -1062,7 +1062,7 @@ _080BB070: .4byte gUnknown_2022984
_080BB074: .4byte gUnknown_2022986 _080BB074: .4byte gUnknown_2022986
_080BB078: .4byte 0x00003f3f _080BB078: .4byte 0x00003f3f
_080BB07C: .4byte gSprites _080BB07C: .4byte gSprites
_080BB080: .4byte gUnknown_2023D44 _080BB080: .4byte gBattlerSpriteIds
_080BB084: .4byte gBattleAnimAttacker _080BB084: .4byte gBattleAnimAttacker
thumb_func_end sub_80BAF38 thumb_func_end sub_80BAF38
@@ -1223,7 +1223,7 @@ _080BB1C0:
cmp r5, 0x1 cmp r5, 0x1
bne _080BB20A bne _080BB20A
ldr r3, _080BB24C @ =gSprites ldr r3, _080BB24C @ =gSprites
ldr r1, _080BB250 @ =gUnknown_2023D44 ldr r1, _080BB250 @ =gBattlerSpriteIds
ldr r0, [r4] ldr r0, [r4]
ldrb r0, [r0, 0x1] ldrb r0, [r0, 0x1]
adds r0, r1 adds r0, r1
@@ -1277,7 +1277,7 @@ _080BB240: .4byte 0x00003f3f
_080BB244: .4byte 0x00003f3d _080BB244: .4byte 0x00003f3d
_080BB248: .4byte 0x00003f42 _080BB248: .4byte 0x00003f42
_080BB24C: .4byte gSprites _080BB24C: .4byte gSprites
_080BB250: .4byte gUnknown_2023D44 _080BB250: .4byte gBattlerSpriteIds
_080BB254: .4byte gBattlerPartyIndexes _080BB254: .4byte gBattlerPartyIndexes
_080BB258: .4byte gEnemyParty _080BB258: .4byte gEnemyParty
_080BB25C: _080BB25C:
@@ -1323,7 +1323,7 @@ sub_80BB2A0: @ 80BB2A0
lsrs r5, r0, 24 lsrs r5, r0, 24
movs r0, 0 movs r0, 0
mov r8, r0 mov r8, r0
ldr r6, _080BB300 @ =gUnknown_2023D44 ldr r6, _080BB300 @ =gBattlerSpriteIds
ldr r4, _080BB304 @ =gUnknown_20399B4 ldr r4, _080BB304 @ =gUnknown_20399B4
ldr r2, [r4] ldr r2, [r4]
ldrb r0, [r2] ldrb r0, [r2]
@@ -1360,7 +1360,7 @@ _080BB2E2:
bl sub_807543C bl sub_807543C
b _080BB316 b _080BB316
.align 2, 0 .align 2, 0
_080BB300: .4byte gUnknown_2023D44 _080BB300: .4byte gBattlerSpriteIds
_080BB304: .4byte gUnknown_20399B4 _080BB304: .4byte gUnknown_20399B4
_080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap _080BB308: .4byte gFile_graphics_battle_anims_masks_stat_tilemap_1_tilemap
_080BB30C: _080BB30C:
@@ -1531,7 +1531,7 @@ _080BB44C:
strh r4, [r1, 0xE] strh r4, [r1, 0xE]
ldrb r0, [r3, 0x2] ldrb r0, [r3, 0x2]
strh r0, [r1, 0x14] strh r0, [r1, 0x14]
ldr r2, _080BB490 @ =gUnknown_2023D44 ldr r2, _080BB490 @ =gBattlerSpriteIds
ldrb r0, [r3, 0x1] ldrb r0, [r3, 0x1]
adds r0, r2 adds r0, r2
ldrb r0, [r0] ldrb r0, [r0]
@@ -1552,7 +1552,7 @@ _080BB44C:
bl PlaySE12WithPanning bl PlaySE12WithPanning
b _080BB4AC b _080BB4AC
.align 2, 0 .align 2, 0
_080BB490: .4byte gUnknown_2023D44 _080BB490: .4byte gBattlerSpriteIds
_080BB494: .4byte sub_80BB4B8 _080BB494: .4byte sub_80BB4B8
_080BB498: _080BB498:
movs r0, 0x40 movs r0, 0x40
@@ -2238,7 +2238,7 @@ _080BB9BA:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080BB9F8 beq _080BB9F8
ldr r0, _080BBA18 @ =gUnknown_2023D44 ldr r0, _080BBA18 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r0, [r0] ldrb r0, [r0]
lsls r2, r0, 4 lsls r2, r0, 4
@@ -2272,7 +2272,7 @@ _080BB9F8:
.align 2, 0 .align 2, 0
_080BBA10: .4byte gSprites _080BBA10: .4byte gSprites
_080BBA14: .4byte gBattleAnimAttacker _080BBA14: .4byte gBattleAnimAttacker
_080BBA18: .4byte gUnknown_2023D44 _080BBA18: .4byte gBattlerSpriteIds
_080BBA1C: .4byte gBattleAnimArgs _080BBA1C: .4byte gBattleAnimArgs
thumb_func_end sub_80BB9B0 thumb_func_end sub_80BB9B0
@@ -2420,7 +2420,7 @@ _080BBB4A:
bl GetMonData bl GetMonData
lsls r0, 16 lsls r0, 16
lsrs r4, r0, 16 lsrs r4, r0, 16
ldr r5, _080BBC18 @ =gUnknown_2023D44 ldr r5, _080BBC18 @ =gBattlerSpriteIds
adds r0, r7, r5 adds r0, r7, r5
ldrb r1, [r0] ldrb r1, [r0]
adds r0, r7, 0 adds r0, r7, 0
@@ -2510,7 +2510,7 @@ _080BBBA8:
.align 2, 0 .align 2, 0
_080BBC10: .4byte gBattlerPartyIndexes _080BBC10: .4byte gBattlerPartyIndexes
_080BBC14: .4byte gPlayerParty _080BBC14: .4byte gPlayerParty
_080BBC18: .4byte gUnknown_2023D44 _080BBC18: .4byte gBattlerSpriteIds
_080BBC1C: .4byte gBattle_BG1_X _080BBC1C: .4byte gBattle_BG1_X
_080BBC20: .4byte gBattle_BG1_Y _080BBC20: .4byte gBattle_BG1_Y
_080BBC24: .4byte gTasks _080BBC24: .4byte gTasks
asm/battle_controller_link_opponent.s
+36 -36
View File
@@ -70,7 +70,7 @@ _0803A6D0:
sub_803A6D4: @ 803A6D4 sub_803A6D4: @ 803A6D4
push {lr} push {lr}
ldr r2, _0803A6FC @ =gSprites ldr r2, _0803A6FC @ =gSprites
ldr r1, _0803A700 @ =gUnknown_2023D44 ldr r1, _0803A700 @ =gBattlerSpriteIds
ldr r0, _0803A704 @ =gActiveBattler ldr r0, _0803A704 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -90,7 +90,7 @@ _0803A6F8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803A6FC: .4byte gSprites _0803A6FC: .4byte gSprites
_0803A700: .4byte gUnknown_2023D44 _0803A700: .4byte gBattlerSpriteIds
_0803A704: .4byte gActiveBattler _0803A704: .4byte gActiveBattler
_0803A708: .4byte SpriteCallbackDummy _0803A708: .4byte SpriteCallbackDummy
thumb_func_end sub_803A6D4 thumb_func_end sub_803A6D4
@@ -99,7 +99,7 @@ _0803A708: .4byte SpriteCallbackDummy
sub_803A70C: @ 803A70C sub_803A70C: @ 803A70C
push {r4-r6,lr} push {r4-r6,lr}
ldr r4, _0803A784 @ =gSprites ldr r4, _0803A784 @ =gSprites
ldr r6, _0803A788 @ =gUnknown_2023D44 ldr r6, _0803A788 @ =gBattlerSpriteIds
ldr r5, _0803A78C @ =gActiveBattler ldr r5, _0803A78C @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r6 adds r0, r6
@@ -155,7 +155,7 @@ _0803A77C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803A784: .4byte gSprites _0803A784: .4byte gSprites
_0803A788: .4byte gUnknown_2023D44 _0803A788: .4byte gBattlerSpriteIds
_0803A78C: .4byte gActiveBattler _0803A78C: .4byte gActiveBattler
_0803A790: .4byte SpriteCallbackDummy _0803A790: .4byte SpriteCallbackDummy
_0803A794: .4byte 0x000003ff _0803A794: .4byte 0x000003ff
@@ -714,7 +714,7 @@ _0803AC10: .4byte sub_803A7E4
sub_803AC14: @ 803AC14 sub_803AC14: @ 803AC14
push {r4-r7,lr} push {r4-r7,lr}
ldr r2, _0803AC70 @ =gSprites ldr r2, _0803AC70 @ =gSprites
ldr r0, _0803AC74 @ =gUnknown_2023D44 ldr r0, _0803AC74 @ =gBattlerSpriteIds
ldr r7, _0803AC78 @ =gActiveBattler ldr r7, _0803AC78 @ =gActiveBattler
ldrb r3, [r7] ldrb r3, [r7]
adds r0, r3, r0 adds r0, r3, r0
@@ -758,7 +758,7 @@ sub_803AC14: @ 803AC14
b _0803ACC0 b _0803ACC0
.align 2, 0 .align 2, 0
_0803AC70: .4byte gSprites _0803AC70: .4byte gSprites
_0803AC74: .4byte gUnknown_2023D44 _0803AC74: .4byte gBattlerSpriteIds
_0803AC78: .4byte gActiveBattler _0803AC78: .4byte gActiveBattler
_0803AC7C: .4byte gUnknown_2024018 _0803AC7C: .4byte gUnknown_2024018
_0803AC80: .4byte gBattlerPartyIndexes _0803AC80: .4byte gBattlerPartyIndexes
@@ -842,7 +842,7 @@ _0803AD18:
sub_803AD20: @ 803AD20 sub_803AD20: @ 803AD20
push {lr} push {lr}
ldr r2, _0803AD54 @ =gSprites ldr r2, _0803AD54 @ =gSprites
ldr r0, _0803AD58 @ =gUnknown_2023D44 ldr r0, _0803AD58 @ =gBattlerSpriteIds
ldr r1, _0803AD5C @ =gActiveBattler ldr r1, _0803AD5C @ =gActiveBattler
ldrb r3, [r1] ldrb r3, [r1]
adds r0, r3, r0 adds r0, r3, r0
@@ -866,7 +866,7 @@ _0803AD4E:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803AD54: .4byte gSprites _0803AD54: .4byte gSprites
_0803AD58: .4byte gUnknown_2023D44 _0803AD58: .4byte gBattlerSpriteIds
_0803AD5C: .4byte gActiveBattler _0803AD5C: .4byte gActiveBattler
_0803AD60: .4byte gUnknown_3004FF0 _0803AD60: .4byte gUnknown_3004FF0
thumb_func_end sub_803AD20 thumb_func_end sub_803AD20
@@ -888,7 +888,7 @@ sub_803AD64: @ 803AD64
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _0803ADBE bne _0803ADBE
ldr r5, _0803ADCC @ =gUnknown_2023D44 ldr r5, _0803ADCC @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -920,7 +920,7 @@ _0803ADBE:
.align 2, 0 .align 2, 0
_0803ADC4: .4byte gUnknown_2024018 _0803ADC4: .4byte gUnknown_2024018
_0803ADC8: .4byte gActiveBattler _0803ADC8: .4byte gActiveBattler
_0803ADCC: .4byte gUnknown_2023D44 _0803ADCC: .4byte gBattlerSpriteIds
_0803ADD0: .4byte gSprites _0803ADD0: .4byte gSprites
_0803ADD4: .4byte gUnknown_3004FF0 _0803ADD4: .4byte gUnknown_3004FF0
thumb_func_end sub_803AD64 thumb_func_end sub_803AD64
@@ -942,7 +942,7 @@ _0803ADEA:
thumb_func_start DoHitAnimBlinkSpriteEffect_4 thumb_func_start DoHitAnimBlinkSpriteEffect_4
DoHitAnimBlinkSpriteEffect_4: @ 803ADF0 DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
push {r4,lr} push {r4,lr}
ldr r1, _0803AE2C @ =gUnknown_2023D44 ldr r1, _0803AE2C @ =gBattlerSpriteIds
ldr r0, _0803AE30 @ =gActiveBattler ldr r0, _0803AE30 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -970,7 +970,7 @@ DoHitAnimBlinkSpriteEffect_4: @ 803ADF0
bl RecordedOpponentBufferExecCompleted bl RecordedOpponentBufferExecCompleted
b _0803AE66 b _0803AE66
.align 2, 0 .align 2, 0
_0803AE2C: .4byte gUnknown_2023D44 _0803AE2C: .4byte gBattlerSpriteIds
_0803AE30: .4byte gActiveBattler _0803AE30: .4byte gActiveBattler
_0803AE34: .4byte gSprites _0803AE34: .4byte gSprites
_0803AE38: .4byte gUnknown_2024005 _0803AE38: .4byte gUnknown_2024005
@@ -1132,7 +1132,7 @@ sub_803AF28: @ 803AF28
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
ldr r1, _0803AFE0 @ =gUnknown_2023D44 ldr r1, _0803AFE0 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -1179,7 +1179,7 @@ _0803AFCC:
_0803AFD4: .4byte gUnknown_2024018 _0803AFD4: .4byte gUnknown_2024018
_0803AFD8: .4byte gActiveBattler _0803AFD8: .4byte gActiveBattler
_0803AFDC: .4byte 0x000027f9 _0803AFDC: .4byte 0x000027f9
_0803AFE0: .4byte gUnknown_2023D44 _0803AFE0: .4byte gBattlerSpriteIds
_0803AFE4: .4byte gSprites _0803AFE4: .4byte gSprites
_0803AFE8: .4byte gUnknown_3004FF0 _0803AFE8: .4byte gUnknown_3004FF0
_0803AFEC: .4byte gBattlerPartyIndexes _0803AFEC: .4byte gBattlerPartyIndexes
@@ -3599,7 +3599,7 @@ LinkOpponentHandleLoadPokeSprite: @ 803C3B4
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _0803C4EC @ =gUnknown_2023D44 ldr r4, _0803C4EC @ =gBattlerSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
@@ -3678,7 +3678,7 @@ _0803C4DC: .4byte gBattlerPartyIndexes
_0803C4E0: .4byte gActiveBattler _0803C4E0: .4byte gActiveBattler
_0803C4E4: .4byte gEnemyParty _0803C4E4: .4byte gEnemyParty
_0803C4E8: .4byte gMultiuseSpriteTemplate _0803C4E8: .4byte gMultiuseSpriteTemplate
_0803C4EC: .4byte gUnknown_2023D44 _0803C4EC: .4byte gBattlerSpriteIds
_0803C4F0: .4byte gSprites _0803C4F0: .4byte gSprites
_0803C4F4: .4byte 0x0000ff10 _0803C4F4: .4byte 0x0000ff10
_0803C4F8: .4byte gBattleMonForms _0803C4F8: .4byte gBattleMonForms
@@ -3803,7 +3803,7 @@ sub_803C550: @ 803C550
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _0803C6C4 @ =gUnknown_2023D44 ldr r4, _0803C6C4 @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _0803C6C8 @ =gSprites ldr r5, _0803C6C8 @ =gSprites
@@ -3893,7 +3893,7 @@ _0803C6B4: .4byte gEnemyParty
_0803C6B8: .4byte sub_8033E3C _0803C6B8: .4byte sub_8033E3C
_0803C6BC: .4byte gUnknown_3004FFC _0803C6BC: .4byte gUnknown_3004FFC
_0803C6C0: .4byte gMultiuseSpriteTemplate _0803C6C0: .4byte gMultiuseSpriteTemplate
_0803C6C4: .4byte gUnknown_2023D44 _0803C6C4: .4byte gBattlerSpriteIds
_0803C6C8: .4byte gSprites _0803C6C8: .4byte gSprites
_0803C6CC: .4byte gBattleMonForms _0803C6CC: .4byte gBattleMonForms
_0803C6D0: .4byte SpriteCallbackDummy _0803C6D0: .4byte SpriteCallbackDummy
@@ -3933,7 +3933,7 @@ _0803C710: .4byte gUnknown_2024018
_0803C714: .4byte gUnknown_3004FE0 _0803C714: .4byte gUnknown_3004FE0
_0803C718: .4byte sub_803C76C _0803C718: .4byte sub_803C76C
_0803C71C: _0803C71C:
ldr r5, _0803C760 @ =gUnknown_2023D44 ldr r5, _0803C760 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3963,7 +3963,7 @@ _0803C758:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803C760: .4byte gUnknown_2023D44 _0803C760: .4byte gBattlerSpriteIds
_0803C764: .4byte gSprites _0803C764: .4byte gSprites
_0803C768: .4byte gUnknown_3004FF0 _0803C768: .4byte gUnknown_3004FF0
thumb_func_end LinkOpponentHandleReturnPokeToBall thumb_func_end LinkOpponentHandleReturnPokeToBall
@@ -4278,7 +4278,7 @@ _0803C992:
adds r1, r6, 0 adds r1, r6, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r5, _0803CAD8 @ =gUnknown_2023D44 ldr r5, _0803CAD8 @ =gBattlerSpriteIds
mov r2, r8 mov r2, r8
ldrb r1, [r2] ldrb r1, [r2]
adds r1, r5 adds r1, r5
@@ -4392,7 +4392,7 @@ _0803CAC8: .4byte gFacilityClassToPicIndex
_0803CACC: .4byte gActiveBattler _0803CACC: .4byte gActiveBattler
_0803CAD0: .4byte gMultiuseSpriteTemplate _0803CAD0: .4byte gMultiuseSpriteTemplate
_0803CAD4: .4byte gUnknown_823932C _0803CAD4: .4byte gUnknown_823932C
_0803CAD8: .4byte gUnknown_2023D44 _0803CAD8: .4byte gBattlerSpriteIds
_0803CADC: .4byte gSprites _0803CADC: .4byte gSprites
_0803CAE0: .4byte 0x0000ff10 _0803CAE0: .4byte 0x0000ff10
_0803CAE4: .4byte gTrainerFrontPicPaletteTable _0803CAE4: .4byte gTrainerFrontPicPaletteTable
@@ -4415,7 +4415,7 @@ sub_803CB00: @ 803CB00
thumb_func_start sub_803CB0C thumb_func_start sub_803CB0C
sub_803CB0C: @ 803CB0C sub_803CB0C: @ 803CB0C
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _0803CB9C @ =gUnknown_2023D44 ldr r6, _0803CB9C @ =gBattlerSpriteIds
ldr r4, _0803CBA0 @ =gActiveBattler ldr r4, _0803CBA0 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
@@ -4484,7 +4484,7 @@ sub_803CB0C: @ 803CB0C
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803CB9C: .4byte gUnknown_2023D44 _0803CB9C: .4byte gBattlerSpriteIds
_0803CBA0: .4byte gActiveBattler _0803CBA0: .4byte gActiveBattler
_0803CBA4: .4byte gSprites _0803CBA4: .4byte gSprites
_0803CBA8: .4byte sub_8075590 _0803CBA8: .4byte sub_8075590
@@ -4548,7 +4548,7 @@ _0803CC0C:
movs r1, 0x3F movs r1, 0x3F
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _0803CC50 @ =gSprites ldr r2, _0803CC50 @ =gSprites
ldr r1, _0803CC54 @ =gUnknown_2023D44 ldr r1, _0803CC54 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -4571,7 +4571,7 @@ _0803CC48:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803CC50: .4byte gSprites _0803CC50: .4byte gSprites
_0803CC54: .4byte gUnknown_2023D44 _0803CC54: .4byte gBattlerSpriteIds
_0803CC58: .4byte sub_8011EA0 _0803CC58: .4byte sub_8011EA0
_0803CC5C: .4byte gUnknown_3004FE0 _0803CC5C: .4byte gUnknown_3004FE0
_0803CC60: .4byte sub_803AD20 _0803CC60: .4byte sub_803AD20
@@ -4633,7 +4633,7 @@ _0803CCA6:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _0803CD80 @ =gUnknown_2037F16 ldr r5, _0803CD80 @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -4701,7 +4701,7 @@ _0803CCA6:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _0803CD94 @ =gUnknown_2037EE4 ldr r3, _0803CD94 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4725,12 +4725,12 @@ _0803CCA6:
.align 2, 0 .align 2, 0
_0803CD78: .4byte gActiveBattler _0803CD78: .4byte gActiveBattler
_0803CD7C: .4byte gUnknown_2022BC4 _0803CD7C: .4byte gUnknown_2022BC4
_0803CD80: .4byte gUnknown_2037F16 _0803CD80: .4byte gAnimMoveTurn
_0803CD84: .4byte gUnknown_2037EEC _0803CD84: .4byte gUnknown_2037EEC
_0803CD88: .4byte gUnknown_2037EE8 _0803CD88: .4byte gUnknown_2037EE8
_0803CD8C: .4byte gUnknown_2037EFE _0803CD8C: .4byte gUnknown_2037EFE
_0803CD90: .4byte gUnknown_2037F00 _0803CD90: .4byte gUnknown_2037F00
_0803CD94: .4byte gUnknown_2037EE4 _0803CD94: .4byte gAnimDisableStructPtr
_0803CD98: .4byte gUnknown_2024008 _0803CD98: .4byte gUnknown_2024008
_0803CD9C: _0803CD9C:
ldr r0, _0803CDC0 @ =gUnknown_2024018 ldr r0, _0803CDC0 @ =gUnknown_2024018
@@ -5437,7 +5437,7 @@ _0803D2F0: .4byte gUnknown_2022870
RecordedOpponentHandleHitAnimation: @ 803D2F4 RecordedOpponentHandleHitAnimation: @ 803D2F4
push {r4,lr} push {r4,lr}
ldr r3, _0803D31C @ =gSprites ldr r3, _0803D31C @ =gSprites
ldr r2, _0803D320 @ =gUnknown_2023D44 ldr r2, _0803D320 @ =gBattlerSpriteIds
ldr r4, _0803D324 @ =gActiveBattler ldr r4, _0803D324 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -5455,7 +5455,7 @@ RecordedOpponentHandleHitAnimation: @ 803D2F4
b _0803D352 b _0803D352
.align 2, 0 .align 2, 0
_0803D31C: .4byte gSprites _0803D31C: .4byte gSprites
_0803D320: .4byte gUnknown_2023D44 _0803D320: .4byte gBattlerSpriteIds
_0803D324: .4byte gActiveBattler _0803D324: .4byte gActiveBattler
_0803D328: _0803D328:
ldr r1, _0803D358 @ =gUnknown_2024005 ldr r1, _0803D358 @ =gUnknown_2024005
@@ -5612,7 +5612,7 @@ _0803D450: .4byte gUnknown_2023F4C
thumb_func_start sub_803D454 thumb_func_start sub_803D454
sub_803D454: @ 803D454 sub_803D454: @ 803D454
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, _0803D534 @ =gUnknown_2023D44 ldr r5, _0803D534 @ =gBattlerSpriteIds
ldr r6, _0803D538 @ =gActiveBattler ldr r6, _0803D538 @ =gActiveBattler
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r5 adds r0, r5
@@ -5722,7 +5722,7 @@ _0803D516:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0803D534: .4byte gUnknown_2023D44 _0803D534: .4byte gBattlerSpriteIds
_0803D538: .4byte gActiveBattler _0803D538: .4byte gActiveBattler
_0803D53C: .4byte gSprites _0803D53C: .4byte gSprites
_0803D540: .4byte sub_8075590 _0803D540: .4byte sub_8075590
@@ -6100,7 +6100,7 @@ RecordedOpponentHandleSpriteInvisibility: @ 803D834
cmp r0, 0 cmp r0, 0
beq _0803D87A beq _0803D87A
ldr r3, _0803D888 @ =gSprites ldr r3, _0803D888 @ =gSprites
ldr r0, _0803D88C @ =gUnknown_2023D44 ldr r0, _0803D88C @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -6133,7 +6133,7 @@ _0803D87A:
.align 2, 0 .align 2, 0
_0803D884: .4byte gActiveBattler _0803D884: .4byte gActiveBattler
_0803D888: .4byte gSprites _0803D888: .4byte gSprites
_0803D88C: .4byte gUnknown_2023D44 _0803D88C: .4byte gBattlerSpriteIds
_0803D890: .4byte gUnknown_2022BC4 _0803D890: .4byte gUnknown_2022BC4
thumb_func_end RecordedOpponentHandleSpriteInvisibility thumb_func_end RecordedOpponentHandleSpriteInvisibility
asm/battle_controller_link_partner.s
+38 -38
View File
@@ -70,7 +70,7 @@ _080D426C:
sub_80D4270: @ 80D4270 sub_80D4270: @ 80D4270
push {lr} push {lr}
ldr r2, _080D4298 @ =gSprites ldr r2, _080D4298 @ =gSprites
ldr r1, _080D429C @ =gUnknown_2023D44 ldr r1, _080D429C @ =gBattlerSpriteIds
ldr r0, _080D42A0 @ =gActiveBattler ldr r0, _080D42A0 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -90,7 +90,7 @@ _080D4294:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D4298: .4byte gSprites _080D4298: .4byte gSprites
_080D429C: .4byte gUnknown_2023D44 _080D429C: .4byte gBattlerSpriteIds
_080D42A0: .4byte gActiveBattler _080D42A0: .4byte gActiveBattler
_080D42A4: .4byte SpriteCallbackDummy _080D42A4: .4byte SpriteCallbackDummy
thumb_func_end sub_80D4270 thumb_func_end sub_80D4270
@@ -99,7 +99,7 @@ _080D42A4: .4byte SpriteCallbackDummy
sub_80D42A8: @ 80D42A8 sub_80D42A8: @ 80D42A8
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _080D4300 @ =gSprites ldr r6, _080D4300 @ =gSprites
ldr r5, _080D4304 @ =gUnknown_2023D44 ldr r5, _080D4304 @ =gBattlerSpriteIds
ldr r4, _080D4308 @ =gActiveBattler ldr r4, _080D4308 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -139,7 +139,7 @@ _080D42F8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D4300: .4byte gSprites _080D4300: .4byte gSprites
_080D4304: .4byte gUnknown_2023D44 _080D4304: .4byte gBattlerSpriteIds
_080D4308: .4byte gActiveBattler _080D4308: .4byte gActiveBattler
_080D430C: .4byte SpriteCallbackDummy _080D430C: .4byte SpriteCallbackDummy
thumb_func_end sub_80D42A8 thumb_func_end sub_80D42A8
@@ -456,7 +456,7 @@ _080D458C: .4byte sub_80D4358
sub_80D4590: @ 80D4590 sub_80D4590: @ 80D4590
push {lr} push {lr}
ldr r2, _080D45C4 @ =gSprites ldr r2, _080D45C4 @ =gSprites
ldr r1, _080D45C8 @ =gUnknown_2023D44 ldr r1, _080D45C8 @ =gBattlerSpriteIds
ldr r0, _080D45CC @ =gActiveBattler ldr r0, _080D45CC @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -481,7 +481,7 @@ _080D45BE:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D45C4: .4byte gSprites _080D45C4: .4byte gSprites
_080D45C8: .4byte gUnknown_2023D44 _080D45C8: .4byte gBattlerSpriteIds
_080D45CC: .4byte gActiveBattler _080D45CC: .4byte gActiveBattler
thumb_func_end sub_80D4590 thumb_func_end sub_80D4590
@@ -543,7 +543,7 @@ _080D463C: .4byte gPlayerParty
sub_80D4640: @ 80D4640 sub_80D4640: @ 80D4640
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _080D4698 @ =gSprites ldr r6, _080D4698 @ =gSprites
ldr r5, _080D469C @ =gUnknown_2023D44 ldr r5, _080D469C @ =gBattlerSpriteIds
ldr r4, _080D46A0 @ =gActiveBattler ldr r4, _080D46A0 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -583,7 +583,7 @@ _080D4690:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D4698: .4byte gSprites _080D4698: .4byte gSprites
_080D469C: .4byte gUnknown_2023D44 _080D469C: .4byte gBattlerSpriteIds
_080D46A0: .4byte gActiveBattler _080D46A0: .4byte gActiveBattler
_080D46A4: .4byte gUnknown_3004FF0 _080D46A4: .4byte gUnknown_3004FF0
thumb_func_end sub_80D4640 thumb_func_end sub_80D4640
@@ -605,7 +605,7 @@ sub_80D46A8: @ 80D46A8
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080D46FC bne _080D46FC
ldr r5, _080D470C @ =gUnknown_2023D44 ldr r5, _080D470C @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -635,7 +635,7 @@ _080D46FC:
.align 2, 0 .align 2, 0
_080D4704: .4byte gUnknown_2024018 _080D4704: .4byte gUnknown_2024018
_080D4708: .4byte gActiveBattler _080D4708: .4byte gActiveBattler
_080D470C: .4byte gUnknown_2023D44 _080D470C: .4byte gBattlerSpriteIds
_080D4710: .4byte gSprites _080D4710: .4byte gSprites
_080D4714: .4byte gUnknown_3004FF0 _080D4714: .4byte gUnknown_3004FF0
thumb_func_end sub_80D46A8 thumb_func_end sub_80D46A8
@@ -657,7 +657,7 @@ _080D472A:
thumb_func_start sub_80D4730 thumb_func_start sub_80D4730
sub_80D4730: @ 80D4730 sub_80D4730: @ 80D4730
push {r4,lr} push {r4,lr}
ldr r1, _080D476C @ =gUnknown_2023D44 ldr r1, _080D476C @ =gBattlerSpriteIds
ldr r0, _080D4770 @ =gActiveBattler ldr r0, _080D4770 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -685,7 +685,7 @@ sub_80D4730: @ 80D4730
bl sub_80D49E8 bl sub_80D49E8
b _080D47A6 b _080D47A6
.align 2, 0 .align 2, 0
_080D476C: .4byte gUnknown_2023D44 _080D476C: .4byte gBattlerSpriteIds
_080D4770: .4byte gActiveBattler _080D4770: .4byte gActiveBattler
_080D4774: .4byte gSprites _080D4774: .4byte gSprites
_080D4778: .4byte gUnknown_2024005 _080D4778: .4byte gUnknown_2024005
@@ -852,7 +852,7 @@ sub_80D484C: @ 80D484C
ldr r5, _080D492C @ =gPlayerParty ldr r5, _080D492C @ =gPlayerParty
adds r0, r5 adds r0, r5
bl HandleLowHpMusicChange bl HandleLowHpMusicChange
ldr r1, _080D4930 @ =gUnknown_2023D44 ldr r1, _080D4930 @ =gBattlerSpriteIds
ldrb r0, [r7] ldrb r0, [r7]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -901,7 +901,7 @@ _080D4920: .4byte 0x000027f9
_080D4924: .4byte c3_0802FDF4 _080D4924: .4byte c3_0802FDF4
_080D4928: .4byte gBattlerPartyIndexes _080D4928: .4byte gBattlerPartyIndexes
_080D492C: .4byte gPlayerParty _080D492C: .4byte gPlayerParty
_080D4930: .4byte gUnknown_2023D44 _080D4930: .4byte gBattlerSpriteIds
_080D4934: .4byte gSprites _080D4934: .4byte gSprites
_080D4938: .4byte gUnknown_3004FF0 _080D4938: .4byte gUnknown_3004FF0
_080D493C: .4byte gUnknown_3004FE0 _080D493C: .4byte gUnknown_3004FE0
@@ -3393,7 +3393,7 @@ LinkPartnerHandleLoadPokeSprite: @ 80D5DB4
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _080D5EB8 @ =gUnknown_2023D44 ldr r4, _080D5EB8 @ =gBattlerSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
@@ -3455,7 +3455,7 @@ _080D5EA8: .4byte gBattlerPartyIndexes
_080D5EAC: .4byte gActiveBattler _080D5EAC: .4byte gActiveBattler
_080D5EB0: .4byte gPlayerParty _080D5EB0: .4byte gPlayerParty
_080D5EB4: .4byte gMultiuseSpriteTemplate _080D5EB4: .4byte gMultiuseSpriteTemplate
_080D5EB8: .4byte gUnknown_2023D44 _080D5EB8: .4byte gBattlerSpriteIds
_080D5EBC: .4byte gSprites _080D5EBC: .4byte gSprites
_080D5EC0: .4byte 0x0000ff10 _080D5EC0: .4byte 0x0000ff10
_080D5EC4: .4byte gBattleMonForms _080D5EC4: .4byte gBattleMonForms
@@ -3585,7 +3585,7 @@ sub_80D5F40: @ 80D5F40
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _080D609C @ =gUnknown_2023D44 ldr r4, _080D609C @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _080D60A0 @ =gSprites ldr r5, _080D60A0 @ =gSprites
@@ -3675,7 +3675,7 @@ _080D608C: .4byte gPlayerParty
_080D6090: .4byte sub_8033E3C _080D6090: .4byte sub_8033E3C
_080D6094: .4byte gUnknown_3004FFC _080D6094: .4byte gUnknown_3004FFC
_080D6098: .4byte gMultiuseSpriteTemplate _080D6098: .4byte gMultiuseSpriteTemplate
_080D609C: .4byte gUnknown_2023D44 _080D609C: .4byte gBattlerSpriteIds
_080D60A0: .4byte gSprites _080D60A0: .4byte gSprites
_080D60A4: .4byte gBattleMonForms _080D60A4: .4byte gBattleMonForms
_080D60A8: .4byte SpriteCallbackDummy _080D60A8: .4byte SpriteCallbackDummy
@@ -3715,7 +3715,7 @@ _080D60E8: .4byte gUnknown_2024018
_080D60EC: .4byte gUnknown_3004FE0 _080D60EC: .4byte gUnknown_3004FE0
_080D60F0: .4byte sub_80D613C _080D60F0: .4byte sub_80D613C
_080D60F4: _080D60F4:
ldr r5, _080D6130 @ =gUnknown_2023D44 ldr r5, _080D6130 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3743,7 +3743,7 @@ _080D612A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D6130: .4byte gUnknown_2023D44 _080D6130: .4byte gBattlerSpriteIds
_080D6134: .4byte gSprites _080D6134: .4byte gSprites
_080D6138: .4byte gUnknown_3004FF0 _080D6138: .4byte gUnknown_3004FF0
thumb_func_end LinkPartnerHandleReturnPokeToBall thumb_func_end LinkPartnerHandleReturnPokeToBall
@@ -3926,7 +3926,7 @@ _080D6258:
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r6, _080D6324 @ =gUnknown_2023D44 ldr r6, _080D6324 @ =gBattlerSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -3987,7 +3987,7 @@ _080D6258:
_080D6318: .4byte gActiveBattler _080D6318: .4byte gActiveBattler
_080D631C: .4byte gMultiuseSpriteTemplate _080D631C: .4byte gMultiuseSpriteTemplate
_080D6320: .4byte gUnknown_8239F8C _080D6320: .4byte gUnknown_8239F8C
_080D6324: .4byte gUnknown_2023D44 _080D6324: .4byte gBattlerSpriteIds
_080D6328: .4byte gSprites _080D6328: .4byte gSprites
_080D632C: .4byte 0x0000fffe _080D632C: .4byte 0x0000fffe
_080D6330: .4byte sub_8033EEC _080D6330: .4byte sub_8033EEC
@@ -4006,7 +4006,7 @@ sub_80D633C: @ 80D633C
thumb_func_start sub_80D6348 thumb_func_start sub_80D6348
sub_80D6348: @ 80D6348 sub_80D6348: @ 80D6348
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _080D63D4 @ =gUnknown_2023D44 ldr r6, _080D63D4 @ =gBattlerSpriteIds
ldr r4, _080D63D8 @ =gActiveBattler ldr r4, _080D63D8 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
@@ -4074,7 +4074,7 @@ sub_80D6348: @ 80D6348
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080D63D4: .4byte gUnknown_2023D44 _080D63D4: .4byte gBattlerSpriteIds
_080D63D8: .4byte gActiveBattler _080D63D8: .4byte gActiveBattler
_080D63DC: .4byte gSprites _080D63DC: .4byte gSprites
_080D63E0: .4byte 0x0000ffd8 _080D63E0: .4byte 0x0000ffd8
@@ -4150,7 +4150,7 @@ _080D6448:
movs r0, 0x10 movs r0, 0x10
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _080D64CC @ =gSprites ldr r2, _080D64CC @ =gSprites
ldr r3, _080D64D0 @ =gUnknown_2023D44 ldr r3, _080D64D0 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -4192,7 +4192,7 @@ _080D64BE:
_080D64C4: .4byte gBattlerPartyIndexes _080D64C4: .4byte gBattlerPartyIndexes
_080D64C8: .4byte gPlayerParty _080D64C8: .4byte gPlayerParty
_080D64CC: .4byte gSprites _080D64CC: .4byte gSprites
_080D64D0: .4byte gUnknown_2023D44 _080D64D0: .4byte gBattlerSpriteIds
_080D64D4: .4byte sub_8012110 _080D64D4: .4byte sub_8012110
_080D64D8: .4byte gUnknown_3004FE0 _080D64D8: .4byte gUnknown_3004FE0
_080D64DC: .4byte sub_80D4640 _080D64DC: .4byte sub_80D4640
@@ -4254,7 +4254,7 @@ _080D6522:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _080D65FC @ =gUnknown_2037F16 ldr r5, _080D65FC @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -4322,7 +4322,7 @@ _080D6522:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _080D6610 @ =gUnknown_2037EE4 ldr r3, _080D6610 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4346,12 +4346,12 @@ _080D6522:
.align 2, 0 .align 2, 0
_080D65F4: .4byte gActiveBattler _080D65F4: .4byte gActiveBattler
_080D65F8: .4byte gUnknown_2022BC4 _080D65F8: .4byte gUnknown_2022BC4
_080D65FC: .4byte gUnknown_2037F16 _080D65FC: .4byte gAnimMoveTurn
_080D6600: .4byte gUnknown_2037EEC _080D6600: .4byte gUnknown_2037EEC
_080D6604: .4byte gUnknown_2037EE8 _080D6604: .4byte gUnknown_2037EE8
_080D6608: .4byte gUnknown_2037EFE _080D6608: .4byte gUnknown_2037EFE
_080D660C: .4byte gUnknown_2037F00 _080D660C: .4byte gUnknown_2037F00
_080D6610: .4byte gUnknown_2037EE4 _080D6610: .4byte gAnimDisableStructPtr
_080D6614: .4byte gUnknown_2024008 _080D6614: .4byte gUnknown_2024008
_080D6618: _080D6618:
ldr r0, _080D663C @ =gUnknown_2024018 ldr r0, _080D663C @ =gUnknown_2024018
@@ -5058,7 +5058,7 @@ _080D6B6C: .4byte gUnknown_2022870
LinkPartnerHandleHitAnimation: @ 80D6B70 LinkPartnerHandleHitAnimation: @ 80D6B70
push {r4,lr} push {r4,lr}
ldr r3, _080D6B98 @ =gSprites ldr r3, _080D6B98 @ =gSprites
ldr r2, _080D6B9C @ =gUnknown_2023D44 ldr r2, _080D6B9C @ =gBattlerSpriteIds
ldr r4, _080D6BA0 @ =gActiveBattler ldr r4, _080D6BA0 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -5076,7 +5076,7 @@ LinkPartnerHandleHitAnimation: @ 80D6B70
b _080D6BCE b _080D6BCE
.align 2, 0 .align 2, 0
_080D6B98: .4byte gSprites _080D6B98: .4byte gSprites
_080D6B9C: .4byte gUnknown_2023D44 _080D6B9C: .4byte gBattlerSpriteIds
_080D6BA0: .4byte gActiveBattler _080D6BA0: .4byte gActiveBattler
_080D6BA4: _080D6BA4:
ldr r1, _080D6BD4 @ =gUnknown_2024005 ldr r1, _080D6BD4 @ =gUnknown_2024005
@@ -5234,7 +5234,7 @@ _080D6CD0: .4byte gUnknown_2023F4C
thumb_func_start sub_80D6CD4 thumb_func_start sub_80D6CD4
sub_80D6CD4: @ 80D6CD4 sub_80D6CD4: @ 80D6CD4
push {r4-r7,lr} push {r4-r7,lr}
ldr r5, _080D6DDC @ =gUnknown_2023D44 ldr r5, _080D6DDC @ =gBattlerSpriteIds
ldr r6, _080D6DE0 @ =gActiveBattler ldr r6, _080D6DE0 @ =gActiveBattler
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r5 adds r0, r5
@@ -5358,7 +5358,7 @@ _080D6DC2:
adds r0, 0x2 adds r0, 0x2
b _080D6E0C b _080D6E0C
.align 2, 0 .align 2, 0
_080D6DDC: .4byte gUnknown_2023D44 _080D6DDC: .4byte gBattlerSpriteIds
_080D6DE0: .4byte gActiveBattler _080D6DE0: .4byte gActiveBattler
_080D6DE4: .4byte gSprites _080D6DE4: .4byte gSprites
_080D6DE8: .4byte 0x0000ffd8 _080D6DE8: .4byte 0x0000ffd8
@@ -5386,7 +5386,7 @@ _080D6E0C:
movs r2, 0x20 movs r2, 0x20
bl LoadCompressedPalette bl LoadCompressedPalette
ldr r2, _080D6EA8 @ =gSprites ldr r2, _080D6EA8 @ =gSprites
ldr r1, _080D6EAC @ =gUnknown_2023D44 ldr r1, _080D6EAC @ =gBattlerSpriteIds
ldr r5, _080D6EB0 @ =gActiveBattler ldr r5, _080D6EB0 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
@@ -5453,7 +5453,7 @@ _080D6E86:
.align 2, 0 .align 2, 0
_080D6EA4: .4byte gUnknown_8239FD4 _080D6EA4: .4byte gUnknown_8239FD4
_080D6EA8: .4byte gSprites _080D6EA8: .4byte gSprites
_080D6EAC: .4byte gUnknown_2023D44 _080D6EAC: .4byte gBattlerSpriteIds
_080D6EB0: .4byte gActiveBattler _080D6EB0: .4byte gActiveBattler
_080D6EB4: .4byte sub_80D6ED0 _080D6EB4: .4byte sub_80D6ED0
_080D6EB8: .4byte gTasks _080D6EB8: .4byte gTasks
@@ -5781,7 +5781,7 @@ LinkPartnerHandleSpriteInvisibility: @ 80D7144
cmp r0, 0 cmp r0, 0
beq _080D718A beq _080D718A
ldr r3, _080D7198 @ =gSprites ldr r3, _080D7198 @ =gSprites
ldr r0, _080D719C @ =gUnknown_2023D44 ldr r0, _080D719C @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -5814,7 +5814,7 @@ _080D718A:
.align 2, 0 .align 2, 0
_080D7194: .4byte gActiveBattler _080D7194: .4byte gActiveBattler
_080D7198: .4byte gSprites _080D7198: .4byte gSprites
_080D719C: .4byte gUnknown_2023D44 _080D719C: .4byte gBattlerSpriteIds
_080D71A0: .4byte gUnknown_2022BC4 _080D71A0: .4byte gUnknown_2022BC4
thumb_func_end LinkPartnerHandleSpriteInvisibility thumb_func_end LinkPartnerHandleSpriteInvisibility
asm/battle_controller_oak.s
+34 -34
View File
@@ -422,7 +422,7 @@ _080E78D8:
sub_80E78E0: @ 80E78E0 sub_80E78E0: @ 80E78E0
push {lr} push {lr}
ldr r2, _080E7908 @ =gSprites ldr r2, _080E7908 @ =gSprites
ldr r1, _080E790C @ =gUnknown_2023D44 ldr r1, _080E790C @ =gBattlerSpriteIds
ldr r0, _080E7910 @ =gActiveBattler ldr r0, _080E7910 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -442,7 +442,7 @@ _080E7904:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E7908: .4byte gSprites _080E7908: .4byte gSprites
_080E790C: .4byte gUnknown_2023D44 _080E790C: .4byte gBattlerSpriteIds
_080E7910: .4byte gActiveBattler _080E7910: .4byte gActiveBattler
_080E7914: .4byte SpriteCallbackDummy _080E7914: .4byte SpriteCallbackDummy
thumb_func_end sub_80E78E0 thumb_func_end sub_80E78E0
@@ -1653,7 +1653,7 @@ _080E82F0: .4byte sub_80E8930
sub_80E82F4: @ 80E82F4 sub_80E82F4: @ 80E82F4
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _080E834C @ =gSprites ldr r6, _080E834C @ =gSprites
ldr r5, _080E8350 @ =gUnknown_2023D44 ldr r5, _080E8350 @ =gBattlerSpriteIds
ldr r4, _080E8354 @ =gActiveBattler ldr r4, _080E8354 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -1693,7 +1693,7 @@ _080E8344:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E834C: .4byte gSprites _080E834C: .4byte gSprites
_080E8350: .4byte gUnknown_2023D44 _080E8350: .4byte gBattlerSpriteIds
_080E8354: .4byte gActiveBattler _080E8354: .4byte gActiveBattler
_080E8358: .4byte gUnknown_3004FF0 _080E8358: .4byte gUnknown_3004FF0
thumb_func_end sub_80E82F4 thumb_func_end sub_80E82F4
@@ -2432,7 +2432,7 @@ _080E8942:
thumb_func_start DoHitAnimBlinkSpriteEffect_3 thumb_func_start DoHitAnimBlinkSpriteEffect_3
DoHitAnimBlinkSpriteEffect_3: @ 80E8948 DoHitAnimBlinkSpriteEffect_3: @ 80E8948
push {r4,lr} push {r4,lr}
ldr r1, _080E8984 @ =gUnknown_2023D44 ldr r1, _080E8984 @ =gBattlerSpriteIds
ldr r0, _080E8988 @ =gActiveBattler ldr r0, _080E8988 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -2460,7 +2460,7 @@ DoHitAnimBlinkSpriteEffect_3: @ 80E8948
bl WallyBufferExecCompleted bl WallyBufferExecCompleted
b _080E89BE b _080E89BE
.align 2, 0 .align 2, 0
_080E8984: .4byte gUnknown_2023D44 _080E8984: .4byte gBattlerSpriteIds
_080E8988: .4byte gActiveBattler _080E8988: .4byte gActiveBattler
_080E898C: .4byte gSprites _080E898C: .4byte gSprites
_080E8990: .4byte gUnknown_2024005 _080E8990: .4byte gUnknown_2024005
@@ -2510,7 +2510,7 @@ sub_80E89C4: @ 80E89C4
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080E8A18 bne _080E8A18
ldr r5, _080E8A28 @ =gUnknown_2023D44 ldr r5, _080E8A28 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2540,7 +2540,7 @@ _080E8A18:
.align 2, 0 .align 2, 0
_080E8A20: .4byte gUnknown_2024018 _080E8A20: .4byte gUnknown_2024018
_080E8A24: .4byte gActiveBattler _080E8A24: .4byte gActiveBattler
_080E8A28: .4byte gUnknown_2023D44 _080E8A28: .4byte gBattlerSpriteIds
_080E8A2C: .4byte gSprites _080E8A2C: .4byte gSprites
_080E8A30: .4byte gUnknown_3004FF0 _080E8A30: .4byte gUnknown_3004FF0
thumb_func_end sub_80E89C4 thumb_func_end sub_80E89C4
@@ -2549,7 +2549,7 @@ _080E8A30: .4byte gUnknown_3004FF0
sub_80E8A34: @ 80E8A34 sub_80E8A34: @ 80E8A34
push {lr} push {lr}
ldr r2, _080E8A5C @ =gSprites ldr r2, _080E8A5C @ =gSprites
ldr r1, _080E8A60 @ =gUnknown_2023D44 ldr r1, _080E8A60 @ =gBattlerSpriteIds
ldr r0, _080E8A64 @ =gActiveBattler ldr r0, _080E8A64 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -2569,7 +2569,7 @@ _080E8A58:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E8A5C: .4byte gSprites _080E8A5C: .4byte gSprites
_080E8A60: .4byte gUnknown_2023D44 _080E8A60: .4byte gBattlerSpriteIds
_080E8A64: .4byte gActiveBattler _080E8A64: .4byte gActiveBattler
_080E8A68: .4byte SpriteCallbackDummy _080E8A68: .4byte SpriteCallbackDummy
thumb_func_end sub_80E8A34 thumb_func_end sub_80E8A34
@@ -4919,7 +4919,7 @@ _080E9E18: .4byte gActiveBattler
_080E9E1C: .4byte gUnknown_3004FE0 _080E9E1C: .4byte gUnknown_3004FE0
_080E9E20: .4byte sub_80E89C4 _080E9E20: .4byte sub_80E89C4
_080E9E24: _080E9E24:
ldr r5, _080E9E60 @ =gUnknown_2023D44 ldr r5, _080E9E60 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4947,7 +4947,7 @@ _080E9E5A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080E9E60: .4byte gUnknown_2023D44 _080E9E60: .4byte gBattlerSpriteIds
_080E9E64: .4byte gSprites _080E9E64: .4byte gSprites
_080E9E68: .4byte gUnknown_3004FF0 _080E9E68: .4byte gUnknown_3004FF0
thumb_func_end WallyHandleReturnMonToBall thumb_func_end WallyHandleReturnMonToBall
@@ -4993,7 +4993,7 @@ sub_80E9E6C: @ 80E9E6C
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r2, _080E9EDC @ =gUnknown_2023D44 ldr r2, _080E9EDC @ =gBattlerSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
b _080E9F1C b _080E9F1C
.align 2, 0 .align 2, 0
@@ -5002,7 +5002,7 @@ _080E9ECC: .4byte gSaveBlock2Ptr
_080E9ED0: .4byte gActiveBattler _080E9ED0: .4byte gActiveBattler
_080E9ED4: .4byte gMultiuseSpriteTemplate _080E9ED4: .4byte gMultiuseSpriteTemplate
_080E9ED8: .4byte gUnknown_8239F8C _080E9ED8: .4byte gUnknown_8239F8C
_080E9EDC: .4byte gUnknown_2023D44 _080E9EDC: .4byte gBattlerSpriteIds
_080E9EE0: _080E9EE0:
ldr r4, _080E9F8C @ =gActiveBattler ldr r4, _080E9F8C @ =gActiveBattler
ldrb r1, [r4] ldrb r1, [r4]
@@ -5028,13 +5028,13 @@ _080E9EE0:
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r2, _080E9F98 @ =gUnknown_2023D44 ldr r2, _080E9F98 @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
_080E9F1C: _080E9F1C:
adds r1, r2 adds r1, r2
strb r0, [r1] strb r0, [r1]
ldr r4, _080E9F9C @ =gSprites ldr r4, _080E9F9C @ =gSprites
ldr r5, _080E9F98 @ =gUnknown_2023D44 ldr r5, _080E9F98 @ =gBattlerSpriteIds
ldr r6, _080E9F8C @ =gActiveBattler ldr r6, _080E9F8C @ =gActiveBattler
ldrb r3, [r6] ldrb r3, [r6]
adds r0, r3, r5 adds r0, r3, r5
@@ -5090,7 +5090,7 @@ _080E9F1C:
_080E9F8C: .4byte gActiveBattler _080E9F8C: .4byte gActiveBattler
_080E9F90: .4byte gMultiuseSpriteTemplate _080E9F90: .4byte gMultiuseSpriteTemplate
_080E9F94: .4byte gUnknown_8239F8C _080E9F94: .4byte gUnknown_8239F8C
_080E9F98: .4byte gUnknown_2023D44 _080E9F98: .4byte gBattlerSpriteIds
_080E9F9C: .4byte gSprites _080E9F9C: .4byte gSprites
_080E9FA0: .4byte 0x0000fffe _080E9FA0: .4byte 0x0000fffe
_080E9FA4: .4byte sub_8033EEC _080E9FA4: .4byte sub_8033EEC
@@ -5139,7 +5139,7 @@ sub_80E9FB0: @ 80E9FB0
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r2, _080EA020 @ =gUnknown_2023D44 ldr r2, _080EA020 @ =gBattlerSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
b _080EA060 b _080EA060
.align 2, 0 .align 2, 0
@@ -5148,7 +5148,7 @@ _080EA010: .4byte gSaveBlock2Ptr
_080EA014: .4byte gActiveBattler _080EA014: .4byte gActiveBattler
_080EA018: .4byte gMultiuseSpriteTemplate _080EA018: .4byte gMultiuseSpriteTemplate
_080EA01C: .4byte gUnknown_8239F8C _080EA01C: .4byte gUnknown_8239F8C
_080EA020: .4byte gUnknown_2023D44 _080EA020: .4byte gBattlerSpriteIds
_080EA024: _080EA024:
ldr r4, _080EA0D0 @ =gActiveBattler ldr r4, _080EA0D0 @ =gActiveBattler
ldrb r1, [r4] ldrb r1, [r4]
@@ -5174,13 +5174,13 @@ _080EA024:
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r2, _080EA0DC @ =gUnknown_2023D44 ldr r2, _080EA0DC @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
_080EA060: _080EA060:
adds r1, r2 adds r1, r2
strb r0, [r1] strb r0, [r1]
ldr r4, _080EA0E0 @ =gSprites ldr r4, _080EA0E0 @ =gSprites
ldr r5, _080EA0DC @ =gUnknown_2023D44 ldr r5, _080EA0DC @ =gBattlerSpriteIds
ldr r6, _080EA0D0 @ =gActiveBattler ldr r6, _080EA0D0 @ =gActiveBattler
ldrb r3, [r6] ldrb r3, [r6]
adds r0, r3, r5 adds r0, r3, r5
@@ -5236,7 +5236,7 @@ _080EA060:
_080EA0D0: .4byte gActiveBattler _080EA0D0: .4byte gActiveBattler
_080EA0D4: .4byte gMultiuseSpriteTemplate _080EA0D4: .4byte gMultiuseSpriteTemplate
_080EA0D8: .4byte gUnknown_8239F8C _080EA0D8: .4byte gUnknown_8239F8C
_080EA0DC: .4byte gUnknown_2023D44 _080EA0DC: .4byte gBattlerSpriteIds
_080EA0E0: .4byte gSprites _080EA0E0: .4byte gSprites
_080EA0E4: .4byte 0x0000ffa0 _080EA0E4: .4byte 0x0000ffa0
_080EA0E8: .4byte sub_8033EEC _080EA0E8: .4byte sub_8033EEC
@@ -5318,7 +5318,7 @@ _080EA154:
movs r0, 0x10 movs r0, 0x10
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _080EA1D8 @ =gSprites ldr r2, _080EA1D8 @ =gSprites
ldr r3, _080EA1DC @ =gUnknown_2023D44 ldr r3, _080EA1DC @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -5360,7 +5360,7 @@ _080EA1CA:
_080EA1D0: .4byte gBattlerPartyIndexes _080EA1D0: .4byte gBattlerPartyIndexes
_080EA1D4: .4byte gPlayerParty _080EA1D4: .4byte gPlayerParty
_080EA1D8: .4byte gSprites _080EA1D8: .4byte gSprites
_080EA1DC: .4byte gUnknown_2023D44 _080EA1DC: .4byte gBattlerSpriteIds
_080EA1E0: .4byte sub_8012110 _080EA1E0: .4byte sub_8012110
_080EA1E4: .4byte gUnknown_3004FE0 _080EA1E4: .4byte gUnknown_3004FE0
_080EA1E8: .4byte sub_80E82F4 _080EA1E8: .4byte sub_80E82F4
@@ -5483,7 +5483,7 @@ sub_80EA2B8: @ 80EA2B8
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _080EA394 @ =gUnknown_2037F16 ldr r5, _080EA394 @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -5551,7 +5551,7 @@ sub_80EA2B8: @ 80EA2B8
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _080EA3A8 @ =gUnknown_2037EE4 ldr r3, _080EA3A8 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -5575,12 +5575,12 @@ sub_80EA2B8: @ 80EA2B8
.align 2, 0 .align 2, 0
_080EA38C: .4byte gUnknown_2022BC4 _080EA38C: .4byte gUnknown_2022BC4
_080EA390: .4byte gActiveBattler _080EA390: .4byte gActiveBattler
_080EA394: .4byte gUnknown_2037F16 _080EA394: .4byte gAnimMoveTurn
_080EA398: .4byte gUnknown_2037EEC _080EA398: .4byte gUnknown_2037EEC
_080EA39C: .4byte gUnknown_2037EE8 _080EA39C: .4byte gUnknown_2037EE8
_080EA3A0: .4byte gUnknown_2037EFE _080EA3A0: .4byte gUnknown_2037EFE
_080EA3A4: .4byte gUnknown_2037F00 _080EA3A4: .4byte gUnknown_2037F00
_080EA3A8: .4byte gUnknown_2037EE4 _080EA3A8: .4byte gAnimDisableStructPtr
_080EA3AC: .4byte gUnknown_2024008 _080EA3AC: .4byte gUnknown_2024008
_080EA3B0: _080EA3B0:
ldr r0, _080EA3D4 @ =gUnknown_2024018 ldr r0, _080EA3D4 @ =gUnknown_2024018
@@ -6641,7 +6641,7 @@ sub_80EABFC: @ 80EABFC
sub_80EAC08: @ 80EAC08 sub_80EAC08: @ 80EAC08
push {r4,lr} push {r4,lr}
ldr r3, _080EAC30 @ =gSprites ldr r3, _080EAC30 @ =gSprites
ldr r2, _080EAC34 @ =gUnknown_2023D44 ldr r2, _080EAC34 @ =gBattlerSpriteIds
ldr r4, _080EAC38 @ =gActiveBattler ldr r4, _080EAC38 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -6659,7 +6659,7 @@ sub_80EAC08: @ 80EAC08
b _080EAC66 b _080EAC66
.align 2, 0 .align 2, 0
_080EAC30: .4byte gSprites _080EAC30: .4byte gSprites
_080EAC34: .4byte gUnknown_2023D44 _080EAC34: .4byte gBattlerSpriteIds
_080EAC38: .4byte gActiveBattler _080EAC38: .4byte gActiveBattler
_080EAC3C: _080EAC3C:
ldr r1, _080EAC6C @ =gUnknown_2024005 ldr r1, _080EAC6C @ =gUnknown_2024005
@@ -6812,7 +6812,7 @@ sub_80EAD54: @ 80EAD54
bne _080EAD64 bne _080EAD64
b _080EAEE4 b _080EAEE4
_080EAD64: _080EAD64:
ldr r6, _080EAEA4 @ =gUnknown_2023D44 ldr r6, _080EAEA4 @ =gBattlerSpriteIds
ldr r7, _080EAEA8 @ =gActiveBattler ldr r7, _080EAEA8 @ =gActiveBattler
ldrb r0, [r7] ldrb r0, [r7]
adds r0, r6 adds r0, r6
@@ -6966,7 +6966,7 @@ _080EAE84:
b _080EAF18 b _080EAF18
.align 2, 0 .align 2, 0
_080EAEA0: .4byte gBattleTypeFlags _080EAEA0: .4byte gBattleTypeFlags
_080EAEA4: .4byte gUnknown_2023D44 _080EAEA4: .4byte gBattlerSpriteIds
_080EAEA8: .4byte gActiveBattler _080EAEA8: .4byte gActiveBattler
_080EAEAC: .4byte gSprites _080EAEAC: .4byte gSprites
_080EAEB0: .4byte 0x0000ffd8 _080EAEB0: .4byte 0x0000ffd8
@@ -7094,7 +7094,7 @@ sub_80EAF34: @ 80EAF34
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _080EB098 @ =gUnknown_2023D44 ldr r4, _080EB098 @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _080EB09C @ =gSprites ldr r5, _080EB09C @ =gSprites
@@ -7185,7 +7185,7 @@ _080EB088: .4byte gPlayerParty
_080EB08C: .4byte sub_8033E3C _080EB08C: .4byte sub_8033E3C
_080EB090: .4byte gUnknown_3004FFC _080EB090: .4byte gUnknown_3004FFC
_080EB094: .4byte gMultiuseSpriteTemplate _080EB094: .4byte gMultiuseSpriteTemplate
_080EB098: .4byte gUnknown_2023D44 _080EB098: .4byte gBattlerSpriteIds
_080EB09C: .4byte gSprites _080EB09C: .4byte gSprites
_080EB0A0: .4byte gBattleMonForms _080EB0A0: .4byte gBattleMonForms
_080EB0A4: .4byte SpriteCallbackDummy _080EB0A4: .4byte SpriteCallbackDummy
asm/battle_controller_opponent.s
+40 -40
View File
@@ -70,7 +70,7 @@ _08035AE4:
sub_8035AE8: @ 8035AE8 sub_8035AE8: @ 8035AE8
push {lr} push {lr}
ldr r2, _08035B10 @ =gSprites ldr r2, _08035B10 @ =gSprites
ldr r1, _08035B14 @ =gUnknown_2023D44 ldr r1, _08035B14 @ =gBattlerSpriteIds
ldr r0, _08035B18 @ =gActiveBattler ldr r0, _08035B18 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -90,7 +90,7 @@ _08035B0C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08035B10: .4byte gSprites _08035B10: .4byte gSprites
_08035B14: .4byte gUnknown_2023D44 _08035B14: .4byte gBattlerSpriteIds
_08035B18: .4byte gActiveBattler _08035B18: .4byte gActiveBattler
_08035B1C: .4byte SpriteCallbackDummy _08035B1C: .4byte SpriteCallbackDummy
thumb_func_end sub_8035AE8 thumb_func_end sub_8035AE8
@@ -99,7 +99,7 @@ _08035B1C: .4byte SpriteCallbackDummy
sub_8035B20: @ 8035B20 sub_8035B20: @ 8035B20
push {lr} push {lr}
ldr r2, _08035B48 @ =gSprites ldr r2, _08035B48 @ =gSprites
ldr r1, _08035B4C @ =gUnknown_2023D44 ldr r1, _08035B4C @ =gBattlerSpriteIds
ldr r0, _08035B50 @ =gActiveBattler ldr r0, _08035B50 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -119,7 +119,7 @@ _08035B44:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08035B48: .4byte gSprites _08035B48: .4byte gSprites
_08035B4C: .4byte gUnknown_2023D44 _08035B4C: .4byte gBattlerSpriteIds
_08035B50: .4byte gActiveBattler _08035B50: .4byte gActiveBattler
_08035B54: .4byte SpriteCallbackDummy _08035B54: .4byte SpriteCallbackDummy
thumb_func_end sub_8035B20 thumb_func_end sub_8035B20
@@ -128,7 +128,7 @@ _08035B54: .4byte SpriteCallbackDummy
sub_8035B58: @ 8035B58 sub_8035B58: @ 8035B58
push {r4-r6,lr} push {r4-r6,lr}
ldr r4, _08035BD0 @ =gSprites ldr r4, _08035BD0 @ =gSprites
ldr r6, _08035BD4 @ =gUnknown_2023D44 ldr r6, _08035BD4 @ =gBattlerSpriteIds
ldr r5, _08035BD8 @ =gActiveBattler ldr r5, _08035BD8 @ =gActiveBattler
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r6 adds r0, r6
@@ -184,7 +184,7 @@ _08035BC8:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08035BD0: .4byte gSprites _08035BD0: .4byte gSprites
_08035BD4: .4byte gUnknown_2023D44 _08035BD4: .4byte gBattlerSpriteIds
_08035BD8: .4byte gActiveBattler _08035BD8: .4byte gActiveBattler
_08035BDC: .4byte SpriteCallbackDummy _08035BDC: .4byte SpriteCallbackDummy
_08035BE0: .4byte 0x000003ff _08035BE0: .4byte 0x000003ff
@@ -685,7 +685,7 @@ _08035FE4: .4byte sub_8035C30
sub_8035FE8: @ 8035FE8 sub_8035FE8: @ 8035FE8
push {r4-r7,lr} push {r4-r7,lr}
ldr r2, _08036044 @ =gSprites ldr r2, _08036044 @ =gSprites
ldr r0, _08036048 @ =gUnknown_2023D44 ldr r0, _08036048 @ =gBattlerSpriteIds
ldr r7, _0803604C @ =gActiveBattler ldr r7, _0803604C @ =gActiveBattler
ldrb r3, [r7] ldrb r3, [r7]
adds r0, r3, r0 adds r0, r3, r0
@@ -729,7 +729,7 @@ sub_8035FE8: @ 8035FE8
b _08036094 b _08036094
.align 2, 0 .align 2, 0
_08036044: .4byte gSprites _08036044: .4byte gSprites
_08036048: .4byte gUnknown_2023D44 _08036048: .4byte gBattlerSpriteIds
_0803604C: .4byte gActiveBattler _0803604C: .4byte gActiveBattler
_08036050: .4byte gUnknown_2024018 _08036050: .4byte gUnknown_2024018
_08036054: .4byte gBattlerPartyIndexes _08036054: .4byte gBattlerPartyIndexes
@@ -838,7 +838,7 @@ _08036124:
sub_803612C: @ 803612C sub_803612C: @ 803612C
push {lr} push {lr}
ldr r2, _08036160 @ =gSprites ldr r2, _08036160 @ =gSprites
ldr r0, _08036164 @ =gUnknown_2023D44 ldr r0, _08036164 @ =gBattlerSpriteIds
ldr r1, _08036168 @ =gActiveBattler ldr r1, _08036168 @ =gActiveBattler
ldrb r3, [r1] ldrb r3, [r1]
adds r0, r3, r0 adds r0, r3, r0
@@ -862,7 +862,7 @@ _0803615A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08036160: .4byte gSprites _08036160: .4byte gSprites
_08036164: .4byte gUnknown_2023D44 _08036164: .4byte gBattlerSpriteIds
_08036168: .4byte gActiveBattler _08036168: .4byte gActiveBattler
_0803616C: .4byte gUnknown_3004FF0 _0803616C: .4byte gUnknown_3004FF0
thumb_func_end sub_803612C thumb_func_end sub_803612C
@@ -884,7 +884,7 @@ sub_8036170: @ 8036170
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080361CA bne _080361CA
ldr r5, _080361D8 @ =gUnknown_2023D44 ldr r5, _080361D8 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -916,7 +916,7 @@ _080361CA:
.align 2, 0 .align 2, 0
_080361D0: .4byte gUnknown_2024018 _080361D0: .4byte gUnknown_2024018
_080361D4: .4byte gActiveBattler _080361D4: .4byte gActiveBattler
_080361D8: .4byte gUnknown_2023D44 _080361D8: .4byte gBattlerSpriteIds
_080361DC: .4byte gSprites _080361DC: .4byte gSprites
_080361E0: .4byte gUnknown_3004FF0 _080361E0: .4byte gUnknown_3004FF0
thumb_func_end sub_8036170 thumb_func_end sub_8036170
@@ -938,7 +938,7 @@ _080361F6:
thumb_func_start sub_80361FC thumb_func_start sub_80361FC
sub_80361FC: @ 80361FC sub_80361FC: @ 80361FC
push {r4,lr} push {r4,lr}
ldr r1, _08036238 @ =gUnknown_2023D44 ldr r1, _08036238 @ =gBattlerSpriteIds
ldr r0, _0803623C @ =gActiveBattler ldr r0, _0803623C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -966,7 +966,7 @@ sub_80361FC: @ 80361FC
bl OpponentBufferExecCompleted bl OpponentBufferExecCompleted
b _08036272 b _08036272
.align 2, 0 .align 2, 0
_08036238: .4byte gUnknown_2023D44 _08036238: .4byte gBattlerSpriteIds
_0803623C: .4byte gActiveBattler _0803623C: .4byte gActiveBattler
_08036240: .4byte gSprites _08036240: .4byte gSprites
_08036244: .4byte gUnknown_2024005 _08036244: .4byte gUnknown_2024005
@@ -1128,7 +1128,7 @@ sub_8036334: @ 8036334
bl FreeSpriteTilesByTag bl FreeSpriteTilesByTag
adds r0, r4, 0 adds r0, r4, 0
bl FreeSpritePaletteByTag bl FreeSpritePaletteByTag
ldr r1, _080363EC @ =gUnknown_2023D44 ldr r1, _080363EC @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -1175,7 +1175,7 @@ _080363D8:
_080363E0: .4byte gUnknown_2024018 _080363E0: .4byte gUnknown_2024018
_080363E4: .4byte gActiveBattler _080363E4: .4byte gActiveBattler
_080363E8: .4byte 0x000027f9 _080363E8: .4byte 0x000027f9
_080363EC: .4byte gUnknown_2023D44 _080363EC: .4byte gBattlerSpriteIds
_080363F0: .4byte gSprites _080363F0: .4byte gSprites
_080363F4: .4byte gUnknown_3004FF0 _080363F4: .4byte gUnknown_3004FF0
_080363F8: .4byte gBattlerPartyIndexes _080363F8: .4byte gBattlerPartyIndexes
@@ -3666,7 +3666,7 @@ _080378AA:
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl CreateSprite bl CreateSprite
ldr r4, _080379A4 @ =gUnknown_2023D44 ldr r4, _080379A4 @ =gBattlerSpriteIds
ldrb r1, [r7] ldrb r1, [r7]
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
@@ -3759,7 +3759,7 @@ _08037986:
.align 2, 0 .align 2, 0
_0803799C: .4byte gActiveBattler _0803799C: .4byte gActiveBattler
_080379A0: .4byte gMultiuseSpriteTemplate _080379A0: .4byte gMultiuseSpriteTemplate
_080379A4: .4byte gUnknown_2023D44 _080379A4: .4byte gBattlerSpriteIds
_080379A8: .4byte gSprites _080379A8: .4byte gSprites
_080379AC: .4byte 0x0000ff10 _080379AC: .4byte 0x0000ff10
_080379B0: .4byte gBattleMonForms _080379B0: .4byte gBattleMonForms
@@ -3895,7 +3895,7 @@ sub_8037A28: @ 8037A28
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _08037B9C @ =gUnknown_2023D44 ldr r4, _08037B9C @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _08037BA0 @ =gSprites ldr r5, _08037BA0 @ =gSprites
@@ -3985,7 +3985,7 @@ _08037B8C: .4byte gEnemyParty
_08037B90: .4byte sub_8033E3C _08037B90: .4byte sub_8033E3C
_08037B94: .4byte gUnknown_3004FFC _08037B94: .4byte gUnknown_3004FFC
_08037B98: .4byte gMultiuseSpriteTemplate _08037B98: .4byte gMultiuseSpriteTemplate
_08037B9C: .4byte gUnknown_2023D44 _08037B9C: .4byte gBattlerSpriteIds
_08037BA0: .4byte gSprites _08037BA0: .4byte gSprites
_08037BA4: .4byte gBattleMonForms _08037BA4: .4byte gBattleMonForms
_08037BA8: .4byte SpriteCallbackDummy _08037BA8: .4byte SpriteCallbackDummy
@@ -4025,7 +4025,7 @@ _08037BE8: .4byte gUnknown_2024018
_08037BEC: .4byte gUnknown_3004FE0 _08037BEC: .4byte gUnknown_3004FE0
_08037BF0: .4byte sub_8037C44 _08037BF0: .4byte sub_8037C44
_08037BF4: _08037BF4:
ldr r5, _08037C38 @ =gUnknown_2023D44 ldr r5, _08037C38 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4055,7 +4055,7 @@ _08037C30:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08037C38: .4byte gUnknown_2023D44 _08037C38: .4byte gBattlerSpriteIds
_08037C3C: .4byte gSprites _08037C3C: .4byte gSprites
_08037C40: .4byte gUnknown_3004FF0 _08037C40: .4byte gUnknown_3004FF0
thumb_func_end sub_8037BAC thumb_func_end sub_8037BAC
@@ -4227,7 +4227,7 @@ _08037D3A:
movs r1, 0xB0 movs r1, 0xB0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r5, _08037E7C @ =gUnknown_2023D44 ldr r5, _08037E7C @ =gBattlerSpriteIds
mov r2, r8 mov r2, r8
ldrb r1, [r2] ldrb r1, [r2]
adds r1, r5 adds r1, r5
@@ -4341,7 +4341,7 @@ _08037E6C: .4byte gTrainers
_08037E70: .4byte gActiveBattler _08037E70: .4byte gActiveBattler
_08037E74: .4byte gMultiuseSpriteTemplate _08037E74: .4byte gMultiuseSpriteTemplate
_08037E78: .4byte gUnknown_823932C _08037E78: .4byte gUnknown_823932C
_08037E7C: .4byte gUnknown_2023D44 _08037E7C: .4byte gBattlerSpriteIds
_08037E80: .4byte gSprites _08037E80: .4byte gSprites
_08037E84: .4byte 0x0000ff10 _08037E84: .4byte 0x0000ff10
_08037E88: .4byte gTrainerFrontPicPaletteTable _08037E88: .4byte gTrainerFrontPicPaletteTable
@@ -4439,7 +4439,7 @@ _08037F0E:
movs r1, 0xB0 movs r1, 0xB0
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r5, _08038050 @ =gUnknown_2023D44 ldr r5, _08038050 @ =gBattlerSpriteIds
mov r2, r8 mov r2, r8
ldrb r1, [r2] ldrb r1, [r2]
adds r1, r5 adds r1, r5
@@ -4561,7 +4561,7 @@ _08038040: .4byte gTrainers
_08038044: .4byte gActiveBattler _08038044: .4byte gActiveBattler
_08038048: .4byte gMultiuseSpriteTemplate _08038048: .4byte gMultiuseSpriteTemplate
_0803804C: .4byte gUnknown_823932C _0803804C: .4byte gUnknown_823932C
_08038050: .4byte gUnknown_2023D44 _08038050: .4byte gBattlerSpriteIds
_08038054: .4byte gSprites _08038054: .4byte gSprites
_08038058: .4byte 0x0000fffe _08038058: .4byte 0x0000fffe
_0803805C: .4byte gTrainerFrontPicPaletteTable _0803805C: .4byte gTrainerFrontPicPaletteTable
@@ -4576,7 +4576,7 @@ _08038074: .4byte sub_8035B20
thumb_func_start sub_8038078 thumb_func_start sub_8038078
sub_8038078: @ 8038078 sub_8038078: @ 8038078
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _08038108 @ =gUnknown_2023D44 ldr r6, _08038108 @ =gBattlerSpriteIds
ldr r4, _0803810C @ =gActiveBattler ldr r4, _0803810C @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r6 adds r0, r6
@@ -4645,7 +4645,7 @@ sub_8038078: @ 8038078
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08038108: .4byte gUnknown_2023D44 _08038108: .4byte gBattlerSpriteIds
_0803810C: .4byte gActiveBattler _0803810C: .4byte gActiveBattler
_08038110: .4byte gSprites _08038110: .4byte gSprites
_08038114: .4byte sub_8075590 _08038114: .4byte sub_8075590
@@ -4709,7 +4709,7 @@ _08038178:
movs r1, 0x3F movs r1, 0x3F
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _080381BC @ =gSprites ldr r2, _080381BC @ =gSprites
ldr r1, _080381C0 @ =gUnknown_2023D44 ldr r1, _080381C0 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -4732,7 +4732,7 @@ _080381B4:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080381BC: .4byte gSprites _080381BC: .4byte gSprites
_080381C0: .4byte gUnknown_2023D44 _080381C0: .4byte gBattlerSpriteIds
_080381C4: .4byte sub_8011EA0 _080381C4: .4byte sub_8011EA0
_080381C8: .4byte gUnknown_3004FE0 _080381C8: .4byte gUnknown_3004FE0
_080381CC: .4byte sub_803612C _080381CC: .4byte sub_803612C
@@ -4794,7 +4794,7 @@ _08038212:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _080382EC @ =gUnknown_2037F16 ldr r5, _080382EC @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -4862,7 +4862,7 @@ _08038212:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _08038300 @ =gUnknown_2037EE4 ldr r3, _08038300 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4886,12 +4886,12 @@ _08038212:
.align 2, 0 .align 2, 0
_080382E4: .4byte gActiveBattler _080382E4: .4byte gActiveBattler
_080382E8: .4byte gUnknown_2022BC4 _080382E8: .4byte gUnknown_2022BC4
_080382EC: .4byte gUnknown_2037F16 _080382EC: .4byte gAnimMoveTurn
_080382F0: .4byte gUnknown_2037EEC _080382F0: .4byte gUnknown_2037EEC
_080382F4: .4byte gUnknown_2037EE8 _080382F4: .4byte gUnknown_2037EE8
_080382F8: .4byte gUnknown_2037EFE _080382F8: .4byte gUnknown_2037EFE
_080382FC: .4byte gUnknown_2037F00 _080382FC: .4byte gUnknown_2037F00
_08038300: .4byte gUnknown_2037EE4 _08038300: .4byte gAnimDisableStructPtr
_08038304: .4byte gUnknown_2024008 _08038304: .4byte gUnknown_2024008
_08038308: _08038308:
ldr r0, _0803832C @ =gUnknown_2024018 ldr r0, _0803832C @ =gUnknown_2024018
@@ -5926,7 +5926,7 @@ _08038B1C: .4byte gUnknown_2022870
OpponentHandleHitAnimation: @ 8038B20 OpponentHandleHitAnimation: @ 8038B20
push {r4,lr} push {r4,lr}
ldr r3, _08038B48 @ =gSprites ldr r3, _08038B48 @ =gSprites
ldr r2, _08038B4C @ =gUnknown_2023D44 ldr r2, _08038B4C @ =gBattlerSpriteIds
ldr r4, _08038B50 @ =gActiveBattler ldr r4, _08038B50 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -5944,7 +5944,7 @@ OpponentHandleHitAnimation: @ 8038B20
b _08038B7E b _08038B7E
.align 2, 0 .align 2, 0
_08038B48: .4byte gSprites _08038B48: .4byte gSprites
_08038B4C: .4byte gUnknown_2023D44 _08038B4C: .4byte gBattlerSpriteIds
_08038B50: .4byte gActiveBattler _08038B50: .4byte gActiveBattler
_08038B54: _08038B54:
ldr r1, _08038B84 @ =gUnknown_2024005 ldr r1, _08038B84 @ =gUnknown_2024005
@@ -6101,7 +6101,7 @@ _08038C7C: .4byte gUnknown_2023F4C
thumb_func_start sub_8038C80 thumb_func_start sub_8038C80
sub_8038C80: @ 8038C80 sub_8038C80: @ 8038C80
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, _08038D60 @ =gUnknown_2023D44 ldr r5, _08038D60 @ =gBattlerSpriteIds
ldr r6, _08038D64 @ =gActiveBattler ldr r6, _08038D64 @ =gActiveBattler
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r5 adds r0, r5
@@ -6211,7 +6211,7 @@ _08038D42:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08038D60: .4byte gUnknown_2023D44 _08038D60: .4byte gBattlerSpriteIds
_08038D64: .4byte gActiveBattler _08038D64: .4byte gActiveBattler
_08038D68: .4byte gSprites _08038D68: .4byte gSprites
_08038D6C: .4byte sub_8075590 _08038D6C: .4byte sub_8075590
@@ -6589,7 +6589,7 @@ sub_8039060: @ 8039060
cmp r0, 0 cmp r0, 0
beq _080390A6 beq _080390A6
ldr r3, _080390B4 @ =gSprites ldr r3, _080390B4 @ =gSprites
ldr r0, _080390B8 @ =gUnknown_2023D44 ldr r0, _080390B8 @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -6622,7 +6622,7 @@ _080390A6:
.align 2, 0 .align 2, 0
_080390B0: .4byte gActiveBattler _080390B0: .4byte gActiveBattler
_080390B4: .4byte gSprites _080390B4: .4byte gSprites
_080390B8: .4byte gUnknown_2023D44 _080390B8: .4byte gBattlerSpriteIds
_080390BC: .4byte gUnknown_2022BC4 _080390BC: .4byte gUnknown_2022BC4
thumb_func_end sub_8039060 thumb_func_end sub_8039060
asm/battle_controller_player.s
+54 -54
View File
@@ -131,7 +131,7 @@ _0802E400:
CompleteOnBankSpritePosX_0: @ 802E404 CompleteOnBankSpritePosX_0: @ 802E404
push {lr} push {lr}
ldr r2, _0802E42C @ =gSprites ldr r2, _0802E42C @ =gSprites
ldr r1, _0802E430 @ =gUnknown_2023D44 ldr r1, _0802E430 @ =gBattlerSpriteIds
ldr r0, _0802E434 @ =gActiveBattler ldr r0, _0802E434 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -150,7 +150,7 @@ _0802E426:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802E42C: .4byte gSprites _0802E42C: .4byte gSprites
_0802E430: .4byte gUnknown_2023D44 _0802E430: .4byte gBattlerSpriteIds
_0802E434: .4byte gActiveBattler _0802E434: .4byte gActiveBattler
thumb_func_end CompleteOnBankSpritePosX_0 thumb_func_end CompleteOnBankSpritePosX_0
@@ -480,7 +480,7 @@ _0802E6B6:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r2, _0802E718 @ =gSprites ldr r2, _0802E718 @ =gSprites
ldr r1, _0802E71C @ =gUnknown_2023D44 ldr r1, _0802E71C @ =gBattlerSpriteIds
ldr r4, _0802E70C @ =gUnknown_3004FF4 ldr r4, _0802E70C @ =gUnknown_3004FF4
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r1 adds r0, r1
@@ -514,7 +514,7 @@ _0802E70C: .4byte gUnknown_3004FF4
_0802E710: .4byte gBattlersCount _0802E710: .4byte gBattlersCount
_0802E714: .4byte gMain _0802E714: .4byte gMain
_0802E718: .4byte gSprites _0802E718: .4byte gSprites
_0802E71C: .4byte gUnknown_2023D44 _0802E71C: .4byte gBattlerSpriteIds
_0802E720: .4byte sub_8012098 _0802E720: .4byte sub_8012098
_0802E724: .4byte gUnknown_2023FFC _0802E724: .4byte gUnknown_2023FFC
_0802E728: .4byte gActiveBattler _0802E728: .4byte gActiveBattler
@@ -526,7 +526,7 @@ _0802E72C:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r2, _0802E784 @ =gSprites ldr r2, _0802E784 @ =gSprites
ldr r1, _0802E788 @ =gUnknown_2023D44 ldr r1, _0802E788 @ =gBattlerSpriteIds
ldr r5, _0802E78C @ =gUnknown_3004FF4 ldr r5, _0802E78C @ =gUnknown_3004FF4
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
@@ -561,7 +561,7 @@ _0802E72C:
b _0802E9DC b _0802E9DC
.align 2, 0 .align 2, 0
_0802E784: .4byte gSprites _0802E784: .4byte gSprites
_0802E788: .4byte gUnknown_2023D44 _0802E788: .4byte gBattlerSpriteIds
_0802E78C: .4byte gUnknown_3004FF4 _0802E78C: .4byte gUnknown_3004FF4
_0802E790: .4byte sub_8012098 _0802E790: .4byte sub_8012098
_0802E794: .4byte gUnknown_3004FE0 _0802E794: .4byte gUnknown_3004FE0
@@ -577,7 +577,7 @@ _0802E7AA:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r2, _0802E7DC @ =gSprites ldr r2, _0802E7DC @ =gSprites
ldr r1, _0802E7E0 @ =gUnknown_2023D44 ldr r1, _0802E7E0 @ =gBattlerSpriteIds
ldr r3, _0802E7E4 @ =gUnknown_3004FF4 ldr r3, _0802E7E4 @ =gUnknown_3004FF4
ldrb r0, [r3] ldrb r0, [r3]
adds r0, r1 adds r0, r1
@@ -600,7 +600,7 @@ _0802E7CC:
b _0802E7F6 b _0802E7F6
.align 2, 0 .align 2, 0
_0802E7DC: .4byte gSprites _0802E7DC: .4byte gSprites
_0802E7E0: .4byte gUnknown_2023D44 _0802E7E0: .4byte gBattlerSpriteIds
_0802E7E4: .4byte gUnknown_3004FF4 _0802E7E4: .4byte gUnknown_3004FF4
_0802E7E8: .4byte sub_8012098 _0802E7E8: .4byte sub_8012098
_0802E7EC: _0802E7EC:
@@ -718,7 +718,7 @@ _0802E8CE:
movs r0, 0x5 movs r0, 0x5
bl PlaySE bl PlaySE
ldr r2, _0802E900 @ =gSprites ldr r2, _0802E900 @ =gSprites
ldr r1, _0802E904 @ =gUnknown_2023D44 ldr r1, _0802E904 @ =gBattlerSpriteIds
ldr r3, _0802E908 @ =gUnknown_3004FF4 ldr r3, _0802E908 @ =gUnknown_3004FF4
ldrb r0, [r3] ldrb r0, [r3]
adds r0, r1 adds r0, r1
@@ -741,7 +741,7 @@ _0802E8F0:
b _0802E91A b _0802E91A
.align 2, 0 .align 2, 0
_0802E900: .4byte gSprites _0802E900: .4byte gSprites
_0802E904: .4byte gUnknown_2023D44 _0802E904: .4byte gBattlerSpriteIds
_0802E908: .4byte gUnknown_3004FF4 _0802E908: .4byte gUnknown_3004FF4
_0802E90C: .4byte sub_8012098 _0802E90C: .4byte sub_8012098
_0802E910: _0802E910:
@@ -841,7 +841,7 @@ _0802E9C0:
beq _0802E8F0 beq _0802E8F0
_0802E9C4: _0802E9C4:
ldr r2, _0802EA04 @ =gSprites ldr r2, _0802EA04 @ =gSprites
ldr r1, _0802EA08 @ =gUnknown_2023D44 ldr r1, _0802EA08 @ =gBattlerSpriteIds
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -867,7 +867,7 @@ _0802E9F8: .4byte gAbsentBattlerFlags
_0802E9FC: .4byte gBitTable _0802E9FC: .4byte gBitTable
_0802EA00: .4byte gUnknown_3004FF4 _0802EA00: .4byte gUnknown_3004FF4
_0802EA04: .4byte gSprites _0802EA04: .4byte gSprites
_0802EA08: .4byte gUnknown_2023D44 _0802EA08: .4byte gBattlerSpriteIds
_0802EA0C: .4byte sub_8012044 _0802EA0C: .4byte sub_8012044
thumb_func_end sub_802E674 thumb_func_end sub_802E674
@@ -1095,7 +1095,7 @@ _0802EBDE:
_0802EBE4: _0802EBE4:
strb r0, [r1] strb r0, [r1]
ldr r2, _0802EC04 @ =gSprites ldr r2, _0802EC04 @ =gSprites
ldr r1, _0802EC08 @ =gUnknown_2023D44 ldr r1, _0802EC08 @ =gBattlerSpriteIds
ldr r0, _0802EC00 @ =gUnknown_3004FF4 ldr r0, _0802EC00 @ =gUnknown_3004FF4
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1110,7 +1110,7 @@ _0802EBE4:
.align 2, 0 .align 2, 0
_0802EC00: .4byte gUnknown_3004FF4 _0802EC00: .4byte gUnknown_3004FF4
_0802EC04: .4byte gSprites _0802EC04: .4byte gSprites
_0802EC08: .4byte gUnknown_2023D44 _0802EC08: .4byte gBattlerSpriteIds
_0802EC0C: .4byte sub_8012044 _0802EC0C: .4byte sub_8012044
_0802EC10: _0802EC10:
movs r7, 0x2 movs r7, 0x2
@@ -2462,7 +2462,7 @@ _0802F72C: .4byte gUnknown_3004F80
sub_802F730: @ 802F730 sub_802F730: @ 802F730
push {lr} push {lr}
ldr r2, _0802F758 @ =gSprites ldr r2, _0802F758 @ =gSprites
ldr r1, _0802F75C @ =gUnknown_2023D44 ldr r1, _0802F75C @ =gBattlerSpriteIds
ldr r0, _0802F760 @ =gActiveBattler ldr r0, _0802F760 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -2482,7 +2482,7 @@ _0802F754:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802F758: .4byte gSprites _0802F758: .4byte gSprites
_0802F75C: .4byte gUnknown_2023D44 _0802F75C: .4byte gBattlerSpriteIds
_0802F760: .4byte gActiveBattler _0802F760: .4byte gActiveBattler
_0802F764: .4byte SpriteCallbackDummy _0802F764: .4byte SpriteCallbackDummy
thumb_func_end sub_802F730 thumb_func_end sub_802F730
@@ -2491,7 +2491,7 @@ _0802F764: .4byte SpriteCallbackDummy
sub_802F768: @ 802F768 sub_802F768: @ 802F768
push {lr} push {lr}
ldr r2, _0802F790 @ =gSprites ldr r2, _0802F790 @ =gSprites
ldr r1, _0802F794 @ =gUnknown_2023D44 ldr r1, _0802F794 @ =gBattlerSpriteIds
ldr r0, _0802F798 @ =gActiveBattler ldr r0, _0802F798 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -2511,7 +2511,7 @@ _0802F78C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802F790: .4byte gSprites _0802F790: .4byte gSprites
_0802F794: .4byte gUnknown_2023D44 _0802F794: .4byte gBattlerSpriteIds
_0802F798: .4byte gActiveBattler _0802F798: .4byte gActiveBattler
_0802F79C: .4byte SpriteCallbackDummy _0802F79C: .4byte SpriteCallbackDummy
thumb_func_end sub_802F768 thumb_func_end sub_802F768
@@ -2520,7 +2520,7 @@ _0802F79C: .4byte SpriteCallbackDummy
sub_802F7A0: @ 802F7A0 sub_802F7A0: @ 802F7A0
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _0802F7FC @ =gSprites ldr r6, _0802F7FC @ =gSprites
ldr r5, _0802F800 @ =gUnknown_2023D44 ldr r5, _0802F800 @ =gBattlerSpriteIds
ldr r4, _0802F804 @ =gActiveBattler ldr r4, _0802F804 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -2562,7 +2562,7 @@ _0802F7F4:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0802F7FC: .4byte gSprites _0802F7FC: .4byte gSprites
_0802F800: .4byte gUnknown_2023D44 _0802F800: .4byte gBattlerSpriteIds
_0802F804: .4byte gActiveBattler _0802F804: .4byte gActiveBattler
_0802F808: .4byte SpriteCallbackDummy _0802F808: .4byte SpriteCallbackDummy
_0802F80C: .4byte gSaveBlock2Ptr _0802F80C: .4byte gSaveBlock2Ptr
@@ -4010,7 +4010,7 @@ sub_80303A8: @ 80303A8
negs r1, r0 negs r1, r0
orrs r1, r0 orrs r1, r0
lsrs r6, r1, 31 lsrs r6, r1, 31
ldr r0, _08030400 @ =gUnknown_2023D44 ldr r0, _08030400 @ =gBattlerSpriteIds
adds r0, r7, r0 adds r0, r7, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4031,7 +4031,7 @@ _080303F0:
mov pc, r0 mov pc, r0
.align 2, 0 .align 2, 0
_080303FC: .4byte gTasks+0x8 _080303FC: .4byte gTasks+0x8
_08030400: .4byte gUnknown_2023D44 _08030400: .4byte gBattlerSpriteIds
_08030404: .4byte gSprites _08030404: .4byte gSprites
_08030408: .4byte _0803040C _08030408: .4byte _0803040C
.align 2, 0 .align 2, 0
@@ -4179,7 +4179,7 @@ _08030534: .4byte sub_802FE94
sub_8030538: @ 8030538 sub_8030538: @ 8030538
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _08030590 @ =gSprites ldr r6, _08030590 @ =gSprites
ldr r5, _08030594 @ =gUnknown_2023D44 ldr r5, _08030594 @ =gBattlerSpriteIds
ldr r4, _08030598 @ =gActiveBattler ldr r4, _08030598 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
@@ -4219,7 +4219,7 @@ _08030588:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08030590: .4byte gSprites _08030590: .4byte gSprites
_08030594: .4byte gUnknown_2023D44 _08030594: .4byte gBattlerSpriteIds
_08030598: .4byte gActiveBattler _08030598: .4byte gActiveBattler
_0803059C: .4byte gUnknown_3004FF0 _0803059C: .4byte gUnknown_3004FF0
thumb_func_end sub_8030538 thumb_func_end sub_8030538
@@ -4241,7 +4241,7 @@ sub_80305A0: @ 80305A0
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _080305F4 bne _080305F4
ldr r5, _08030604 @ =gUnknown_2023D44 ldr r5, _08030604 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4271,7 +4271,7 @@ _080305F4:
.align 2, 0 .align 2, 0
_080305FC: .4byte gUnknown_2024018 _080305FC: .4byte gUnknown_2024018
_08030600: .4byte gActiveBattler _08030600: .4byte gActiveBattler
_08030604: .4byte gUnknown_2023D44 _08030604: .4byte gBattlerSpriteIds
_08030608: .4byte gSprites _08030608: .4byte gSprites
_0803060C: .4byte gUnknown_3004FF0 _0803060C: .4byte gUnknown_3004FF0
thumb_func_end sub_80305A0 thumb_func_end sub_80305A0
@@ -4485,7 +4485,7 @@ _080307B0: .4byte gActiveBattler
thumb_func_start DoHitAnimBlinkSpriteEffect thumb_func_start DoHitAnimBlinkSpriteEffect
DoHitAnimBlinkSpriteEffect: @ 80307B4 DoHitAnimBlinkSpriteEffect: @ 80307B4
push {r4,lr} push {r4,lr}
ldr r1, _080307F0 @ =gUnknown_2023D44 ldr r1, _080307F0 @ =gBattlerSpriteIds
ldr r0, _080307F4 @ =gActiveBattler ldr r0, _080307F4 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -4513,7 +4513,7 @@ DoHitAnimBlinkSpriteEffect: @ 80307B4
bl PlayerBufferExecCompleted bl PlayerBufferExecCompleted
b _0803082A b _0803082A
.align 2, 0 .align 2, 0
_080307F0: .4byte gUnknown_2023D44 _080307F0: .4byte gBattlerSpriteIds
_080307F4: .4byte gActiveBattler _080307F4: .4byte gActiveBattler
_080307F8: .4byte gSprites _080307F8: .4byte gSprites
_080307FC: .4byte gUnknown_2024005 _080307FC: .4byte gUnknown_2024005
@@ -7299,7 +7299,7 @@ PlayerHandleLoadMonSprite: @ 8031F00
adds r0, r2 adds r0, r2
bl sub_8034498 bl sub_8034498
ldr r2, _08031F58 @ =gSprites ldr r2, _08031F58 @ =gSprites
ldr r0, _08031F5C @ =gUnknown_2023D44 ldr r0, _08031F5C @ =gBattlerSpriteIds
ldrb r3, [r4] ldrb r3, [r4]
adds r0, r3, r0 adds r0, r3, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -7327,7 +7327,7 @@ _08031F4C: .4byte gBattlerPartyIndexes
_08031F50: .4byte gActiveBattler _08031F50: .4byte gActiveBattler
_08031F54: .4byte gPlayerParty _08031F54: .4byte gPlayerParty
_08031F58: .4byte gSprites _08031F58: .4byte gSprites
_08031F5C: .4byte gUnknown_2023D44 _08031F5C: .4byte gBattlerSpriteIds
_08031F60: .4byte gUnknown_3004FE0 _08031F60: .4byte gUnknown_3004FE0
_08031F64: .4byte CompleteOnBankSpritePosX_0 _08031F64: .4byte CompleteOnBankSpritePosX_0
thumb_func_end PlayerHandleLoadMonSprite thumb_func_end PlayerHandleLoadMonSprite
@@ -7465,7 +7465,7 @@ sub_8031FF4: @ 8031FF4
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _08032150 @ =gUnknown_2023D44 ldr r4, _08032150 @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _08032154 @ =gSprites ldr r5, _08032154 @ =gSprites
@@ -7555,7 +7555,7 @@ _08032140: .4byte gPlayerParty
_08032144: .4byte sub_8033E3C _08032144: .4byte sub_8033E3C
_08032148: .4byte gUnknown_3004FFC _08032148: .4byte gUnknown_3004FFC
_0803214C: .4byte gMultiuseSpriteTemplate _0803214C: .4byte gMultiuseSpriteTemplate
_08032150: .4byte gUnknown_2023D44 _08032150: .4byte gBattlerSpriteIds
_08032154: .4byte gSprites _08032154: .4byte gSprites
_08032158: .4byte gBattleMonForms _08032158: .4byte gBattleMonForms
_0803215C: .4byte SpriteCallbackDummy _0803215C: .4byte SpriteCallbackDummy
@@ -7595,7 +7595,7 @@ _0803219C: .4byte gUnknown_2024018
_080321A0: .4byte gUnknown_3004FE0 _080321A0: .4byte gUnknown_3004FE0
_080321A4: .4byte sub_80321F0 _080321A4: .4byte sub_80321F0
_080321A8: _080321A8:
ldr r5, _080321E4 @ =gUnknown_2023D44 ldr r5, _080321E4 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -7623,7 +7623,7 @@ _080321DE:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080321E4: .4byte gUnknown_2023D44 _080321E4: .4byte gBattlerSpriteIds
_080321E8: .4byte gSprites _080321E8: .4byte gSprites
_080321EC: .4byte gUnknown_3004FF0 _080321EC: .4byte gUnknown_3004FF0
thumb_func_end PlayerHandleReturnPokeToBall thumb_func_end PlayerHandleReturnPokeToBall
@@ -7833,7 +7833,7 @@ _08032342:
mov r1, r8 mov r1, r8
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r6, _08032410 @ =gUnknown_2023D44 ldr r6, _08032410 @ =gBattlerSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -7895,7 +7895,7 @@ _08032400: .4byte gSaveBlock2Ptr
_08032404: .4byte gActiveBattler _08032404: .4byte gActiveBattler
_08032408: .4byte gMultiuseSpriteTemplate _08032408: .4byte gMultiuseSpriteTemplate
_0803240C: .4byte gUnknown_8239F8C _0803240C: .4byte gUnknown_8239F8C
_08032410: .4byte gUnknown_2023D44 _08032410: .4byte gBattlerSpriteIds
_08032414: .4byte gSprites _08032414: .4byte gSprites
_08032418: .4byte 0x0000fffe _08032418: .4byte 0x0000fffe
_0803241C: .4byte sub_8033EEC _0803241C: .4byte sub_8033EEC
@@ -8003,7 +8003,7 @@ _080324BE:
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r6, _08032578 @ =gUnknown_2023D44 ldr r6, _08032578 @ =gBattlerSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -8063,7 +8063,7 @@ _08032568: .4byte gSaveBlock2Ptr
_0803256C: .4byte gActiveBattler _0803256C: .4byte gActiveBattler
_08032570: .4byte gMultiuseSpriteTemplate _08032570: .4byte gMultiuseSpriteTemplate
_08032574: .4byte gUnknown_8239F8C _08032574: .4byte gUnknown_8239F8C
_08032578: .4byte gUnknown_2023D44 _08032578: .4byte gBattlerSpriteIds
_0803257C: .4byte gSprites _0803257C: .4byte gSprites
_08032580: .4byte 0x0000ffa0 _08032580: .4byte 0x0000ffa0
_08032584: .4byte sub_8033EEC _08032584: .4byte sub_8033EEC
@@ -8074,7 +8074,7 @@ _0803258C: .4byte sub_802F768
thumb_func_start PlayerHandleTrainerSlideBack thumb_func_start PlayerHandleTrainerSlideBack
PlayerHandleTrainerSlideBack: @ 8032590 PlayerHandleTrainerSlideBack: @ 8032590
push {r4-r6,lr} push {r4-r6,lr}
ldr r5, _08032630 @ =gUnknown_2023D44 ldr r5, _08032630 @ =gBattlerSpriteIds
ldr r6, _08032634 @ =gActiveBattler ldr r6, _08032634 @ =gActiveBattler
ldrb r0, [r6] ldrb r0, [r6]
adds r0, r5 adds r0, r5
@@ -8151,7 +8151,7 @@ PlayerHandleTrainerSlideBack: @ 8032590
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08032630: .4byte gUnknown_2023D44 _08032630: .4byte gBattlerSpriteIds
_08032634: .4byte gActiveBattler _08032634: .4byte gActiveBattler
_08032638: .4byte gSprites _08032638: .4byte gSprites
_0803263C: .4byte 0x0000ffd8 _0803263C: .4byte 0x0000ffd8
@@ -8227,7 +8227,7 @@ _080326A4:
movs r0, 0x10 movs r0, 0x10
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _08032728 @ =gSprites ldr r2, _08032728 @ =gSprites
ldr r3, _0803272C @ =gUnknown_2023D44 ldr r3, _0803272C @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -8269,7 +8269,7 @@ _0803271A:
_08032720: .4byte gBattlerPartyIndexes _08032720: .4byte gBattlerPartyIndexes
_08032724: .4byte gPlayerParty _08032724: .4byte gPlayerParty
_08032728: .4byte gSprites _08032728: .4byte gSprites
_0803272C: .4byte gUnknown_2023D44 _0803272C: .4byte gBattlerSpriteIds
_08032730: .4byte sub_8012110 _08032730: .4byte sub_8012110
_08032734: .4byte gUnknown_3004FE0 _08032734: .4byte gUnknown_3004FE0
_08032738: .4byte sub_8030538 _08032738: .4byte sub_8030538
@@ -8428,7 +8428,7 @@ _08032852:
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _0803292C @ =gUnknown_2037F16 ldr r5, _0803292C @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -8496,7 +8496,7 @@ _08032852:
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _08032940 @ =gUnknown_2037EE4 ldr r3, _08032940 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -8520,12 +8520,12 @@ _08032852:
.align 2, 0 .align 2, 0
_08032924: .4byte gActiveBattler _08032924: .4byte gActiveBattler
_08032928: .4byte gUnknown_2022BC4 _08032928: .4byte gUnknown_2022BC4
_0803292C: .4byte gUnknown_2037F16 _0803292C: .4byte gAnimMoveTurn
_08032930: .4byte gUnknown_2037EEC _08032930: .4byte gUnknown_2037EEC
_08032934: .4byte gUnknown_2037EE8 _08032934: .4byte gUnknown_2037EE8
_08032938: .4byte gUnknown_2037EFE _08032938: .4byte gUnknown_2037EFE
_0803293C: .4byte gUnknown_2037F00 _0803293C: .4byte gUnknown_2037F00
_08032940: .4byte gUnknown_2037EE4 _08032940: .4byte gAnimDisableStructPtr
_08032944: .4byte gUnknown_2024008 _08032944: .4byte gUnknown_2024008
_08032948: _08032948:
ldr r0, _0803296C @ =gUnknown_2024018 ldr r0, _0803296C @ =gUnknown_2024018
@@ -9754,7 +9754,7 @@ _08033310: .4byte gUnknown_2022870
PlayerHandleHitAnimation: @ 8033314 PlayerHandleHitAnimation: @ 8033314
push {r4,lr} push {r4,lr}
ldr r3, _0803333C @ =gSprites ldr r3, _0803333C @ =gSprites
ldr r2, _08033340 @ =gUnknown_2023D44 ldr r2, _08033340 @ =gBattlerSpriteIds
ldr r4, _08033344 @ =gActiveBattler ldr r4, _08033344 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -9772,7 +9772,7 @@ PlayerHandleHitAnimation: @ 8033314
b _08033372 b _08033372
.align 2, 0 .align 2, 0
_0803333C: .4byte gSprites _0803333C: .4byte gSprites
_08033340: .4byte gUnknown_2023D44 _08033340: .4byte gBattlerSpriteIds
_08033344: .4byte gActiveBattler _08033344: .4byte gActiveBattler
_08033348: _08033348:
ldr r1, _08033378 @ =gUnknown_2024005 ldr r1, _08033378 @ =gUnknown_2024005
@@ -9930,7 +9930,7 @@ _08033474: .4byte gUnknown_2023F4C
thumb_func_start PlayerHandleIntroTrainerBallThrow thumb_func_start PlayerHandleIntroTrainerBallThrow
PlayerHandleIntroTrainerBallThrow: @ 8033478 PlayerHandleIntroTrainerBallThrow: @ 8033478
push {r4-r7,lr} push {r4-r7,lr}
ldr r6, _080335B8 @ =gUnknown_2023D44 ldr r6, _080335B8 @ =gBattlerSpriteIds
ldr r7, _080335BC @ =gActiveBattler ldr r7, _080335BC @ =gActiveBattler
ldrb r0, [r7] ldrb r0, [r7]
adds r0, r6 adds r0, r6
@@ -10085,7 +10085,7 @@ _0803359A:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080335B8: .4byte gUnknown_2023D44 _080335B8: .4byte gBattlerSpriteIds
_080335BC: .4byte gActiveBattler _080335BC: .4byte gActiveBattler
_080335C0: .4byte gSprites _080335C0: .4byte gSprites
_080335C4: .4byte 0x0000ffd8 _080335C4: .4byte 0x0000ffd8
@@ -10129,7 +10129,7 @@ sub_80335F8: @ 80335F8
adds r0, r1 adds r0, r1
adds r1, r4, 0 adds r1, r4, 0
bl sub_8034498 bl sub_8034498
ldr r0, _08033658 @ =gUnknown_2023D44 ldr r0, _08033658 @ =gBattlerSpriteIds
adds r4, r0 adds r4, r0
ldrb r1, [r4] ldrb r1, [r4]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -10145,7 +10145,7 @@ sub_80335F8: @ 80335F8
.align 2, 0 .align 2, 0
_08033650: .4byte gBattlerPartyIndexes _08033650: .4byte gBattlerPartyIndexes
_08033654: .4byte gPlayerParty _08033654: .4byte gPlayerParty
_08033658: .4byte gUnknown_2023D44 _08033658: .4byte gBattlerSpriteIds
_0803365C: .4byte gSprites _0803365C: .4byte gSprites
thumb_func_end sub_80335F8 thumb_func_end sub_80335F8
@@ -10476,7 +10476,7 @@ PlayerHandleSpriteInvisibility: @ 80338EC
cmp r0, 0 cmp r0, 0
beq _08033932 beq _08033932
ldr r3, _08033940 @ =gSprites ldr r3, _08033940 @ =gSprites
ldr r0, _08033944 @ =gUnknown_2023D44 ldr r0, _08033944 @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r0, r1, r0 adds r0, r1, r0
ldrb r0, [r0] ldrb r0, [r0]
@@ -10509,7 +10509,7 @@ _08033932:
.align 2, 0 .align 2, 0
_0803393C: .4byte gActiveBattler _0803393C: .4byte gActiveBattler
_08033940: .4byte gSprites _08033940: .4byte gSprites
_08033944: .4byte gUnknown_2023D44 _08033944: .4byte gBattlerSpriteIds
_08033948: .4byte gUnknown_2022BC4 _08033948: .4byte gUnknown_2022BC4
thumb_func_end PlayerHandleSpriteInvisibility thumb_func_end PlayerHandleSpriteInvisibility
asm/battle_controller_pokedude.s
+38 -38
View File
@@ -98,7 +98,7 @@ sub_8156140: @ 8156140
sub_815614C: @ 815614C sub_815614C: @ 815614C
push {lr} push {lr}
ldr r2, _08156174 @ =gSprites ldr r2, _08156174 @ =gSprites
ldr r1, _08156178 @ =gUnknown_2023D44 ldr r1, _08156178 @ =gBattlerSpriteIds
ldr r0, _0815617C @ =gActiveBattler ldr r0, _0815617C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -118,7 +118,7 @@ _08156170:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08156174: .4byte gSprites _08156174: .4byte gSprites
_08156178: .4byte gUnknown_2023D44 _08156178: .4byte gBattlerSpriteIds
_0815617C: .4byte gActiveBattler _0815617C: .4byte gActiveBattler
_08156180: .4byte SpriteCallbackDummy _08156180: .4byte SpriteCallbackDummy
thumb_func_end sub_815614C thumb_func_end sub_815614C
@@ -127,7 +127,7 @@ _08156180: .4byte SpriteCallbackDummy
sub_8156184: @ 8156184 sub_8156184: @ 8156184
push {r4-r7,lr} push {r4-r7,lr}
ldr r2, _081561E0 @ =gSprites ldr r2, _081561E0 @ =gSprites
ldr r0, _081561E4 @ =gUnknown_2023D44 ldr r0, _081561E4 @ =gBattlerSpriteIds
ldr r7, _081561E8 @ =gActiveBattler ldr r7, _081561E8 @ =gActiveBattler
ldrb r3, [r7] ldrb r3, [r7]
adds r0, r3, r0 adds r0, r3, r0
@@ -171,7 +171,7 @@ sub_8156184: @ 8156184
b _08156230 b _08156230
.align 2, 0 .align 2, 0
_081561E0: .4byte gSprites _081561E0: .4byte gSprites
_081561E4: .4byte gUnknown_2023D44 _081561E4: .4byte gBattlerSpriteIds
_081561E8: .4byte gActiveBattler _081561E8: .4byte gActiveBattler
_081561EC: .4byte gUnknown_2024018 _081561EC: .4byte gUnknown_2024018
_081561F0: .4byte gBattlerPartyIndexes _081561F0: .4byte gBattlerPartyIndexes
@@ -1635,7 +1635,7 @@ sub_8156DCC: @ 8156DCC
cmp r0, 0 cmp r0, 0
bne _08156E3C bne _08156E3C
ldr r6, _08156E30 @ =gSprites ldr r6, _08156E30 @ =gSprites
ldr r5, _08156E34 @ =gUnknown_2023D44 ldr r5, _08156E34 @ =gBattlerSpriteIds
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r5 adds r0, r5
ldrb r1, [r0] ldrb r1, [r0]
@@ -1672,11 +1672,11 @@ sub_8156DCC: @ 8156DCC
.align 2, 0 .align 2, 0
_08156E2C: .4byte gActiveBattler _08156E2C: .4byte gActiveBattler
_08156E30: .4byte gSprites _08156E30: .4byte gSprites
_08156E34: .4byte gUnknown_2023D44 _08156E34: .4byte gBattlerSpriteIds
_08156E38: .4byte gUnknown_3004FF0 _08156E38: .4byte gUnknown_3004FF0
_08156E3C: _08156E3C:
ldr r2, _08156E6C @ =gSprites ldr r2, _08156E6C @ =gSprites
ldr r0, _08156E70 @ =gUnknown_2023D44 ldr r0, _08156E70 @ =gBattlerSpriteIds
ldrb r3, [r4] ldrb r3, [r4]
adds r0, r3, r0 adds r0, r3, r0
ldrb r1, [r0] ldrb r1, [r0]
@@ -1700,7 +1700,7 @@ _08156E66:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08156E6C: .4byte gSprites _08156E6C: .4byte gSprites
_08156E70: .4byte gUnknown_2023D44 _08156E70: .4byte gBattlerSpriteIds
_08156E74: .4byte gUnknown_3004FF0 _08156E74: .4byte gUnknown_3004FF0
thumb_func_end sub_8156DCC thumb_func_end sub_8156DCC
@@ -1775,7 +1775,7 @@ _08156EFA:
thumb_func_start sub_8156F00 thumb_func_start sub_8156F00
sub_8156F00: @ 8156F00 sub_8156F00: @ 8156F00
push {r4,lr} push {r4,lr}
ldr r1, _08156F3C @ =gUnknown_2023D44 ldr r1, _08156F3C @ =gBattlerSpriteIds
ldr r0, _08156F40 @ =gActiveBattler ldr r0, _08156F40 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1803,7 +1803,7 @@ sub_8156F00: @ 8156F00
bl PlayerPartnerBufferExecCompleted bl PlayerPartnerBufferExecCompleted
b _08156F76 b _08156F76
.align 2, 0 .align 2, 0
_08156F3C: .4byte gUnknown_2023D44 _08156F3C: .4byte gBattlerSpriteIds
_08156F40: .4byte gActiveBattler _08156F40: .4byte gActiveBattler
_08156F44: .4byte gSprites _08156F44: .4byte gSprites
_08156F48: .4byte gUnknown_2024005 _08156F48: .4byte gUnknown_2024005
@@ -1853,7 +1853,7 @@ sub_8156F7C: @ 8156F7C
ands r0, r1 ands r0, r1
cmp r0, 0 cmp r0, 0
bne _08156FD0 bne _08156FD0
ldr r5, _08156FE0 @ =gUnknown_2023D44 ldr r5, _08156FE0 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1883,7 +1883,7 @@ _08156FD0:
.align 2, 0 .align 2, 0
_08156FD8: .4byte gUnknown_2024018 _08156FD8: .4byte gUnknown_2024018
_08156FDC: .4byte gActiveBattler _08156FDC: .4byte gActiveBattler
_08156FE0: .4byte gUnknown_2023D44 _08156FE0: .4byte gBattlerSpriteIds
_08156FE4: .4byte gSprites _08156FE4: .4byte gSprites
_08156FE8: .4byte gUnknown_3004FF0 _08156FE8: .4byte gUnknown_3004FF0
thumb_func_end sub_8156F7C thumb_func_end sub_8156F7C
@@ -1892,7 +1892,7 @@ _08156FE8: .4byte gUnknown_3004FF0
sub_8156FEC: @ 8156FEC sub_8156FEC: @ 8156FEC
push {lr} push {lr}
ldr r2, _08157014 @ =gSprites ldr r2, _08157014 @ =gSprites
ldr r1, _08157018 @ =gUnknown_2023D44 ldr r1, _08157018 @ =gBattlerSpriteIds
ldr r0, _0815701C @ =gActiveBattler ldr r0, _0815701C @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -1912,7 +1912,7 @@ _08157010:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08157014: .4byte gSprites _08157014: .4byte gSprites
_08157018: .4byte gUnknown_2023D44 _08157018: .4byte gBattlerSpriteIds
_0815701C: .4byte gActiveBattler _0815701C: .4byte gActiveBattler
_08157020: .4byte SpriteCallbackDummy _08157020: .4byte SpriteCallbackDummy
thumb_func_end sub_8156FEC thumb_func_end sub_8156FEC
@@ -3950,7 +3950,7 @@ sub_81580E0: @ 81580E0
adds r1, r4, 0 adds r1, r4, 0
adds r2, r5, 0 adds r2, r5, 0
bl CreateSprite bl CreateSprite
ldr r4, _08158224 @ =gUnknown_2023D44 ldr r4, _08158224 @ =gBattlerSpriteIds
ldrb r1, [r6] ldrb r1, [r6]
adds r1, r4 adds r1, r4
strb r0, [r1] strb r0, [r1]
@@ -4038,7 +4038,7 @@ _08158214: .4byte gActiveBattler
_08158218: .4byte gBattlerPartyIndexes _08158218: .4byte gBattlerPartyIndexes
_0815821C: .4byte gEnemyParty _0815821C: .4byte gEnemyParty
_08158220: .4byte gMultiuseSpriteTemplate _08158220: .4byte gMultiuseSpriteTemplate
_08158224: .4byte gUnknown_2023D44 _08158224: .4byte gBattlerSpriteIds
_08158228: .4byte gSprites _08158228: .4byte gSprites
_0815822C: .4byte 0x0000ff10 _0815822C: .4byte 0x0000ff10
_08158230: .4byte gBattleMonForms _08158230: .4byte gBattleMonForms
@@ -4135,7 +4135,7 @@ _081582F0: .4byte gActiveBattler
_081582F4: .4byte gUnknown_3004FE0 _081582F4: .4byte gUnknown_3004FE0
_081582F8: .4byte sub_8156F7C _081582F8: .4byte sub_8156F7C
_081582FC: _081582FC:
ldr r5, _08158338 @ =gUnknown_2023D44 ldr r5, _08158338 @ =gBattlerSpriteIds
adds r0, r2, r5 adds r0, r2, r5
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -4163,7 +4163,7 @@ _08158332:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_08158338: .4byte gUnknown_2023D44 _08158338: .4byte gBattlerSpriteIds
_0815833C: .4byte gSprites _0815833C: .4byte gSprites
_08158340: .4byte gUnknown_3004FF0 _08158340: .4byte gUnknown_3004FF0
thumb_func_end sub_81582C0 thumb_func_end sub_81582C0
@@ -4202,7 +4202,7 @@ sub_8158344: @ 8158344
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r5, _081583E4 @ =gUnknown_2023D44 ldr r5, _081583E4 @ =gBattlerSpriteIds
ldrb r1, [r7] ldrb r1, [r7]
adds r1, r5 adds r1, r5
strb r0, [r1] strb r0, [r1]
@@ -4243,7 +4243,7 @@ sub_8158344: @ 8158344
_081583D8: .4byte gActiveBattler _081583D8: .4byte gActiveBattler
_081583DC: .4byte gMultiuseSpriteTemplate _081583DC: .4byte gMultiuseSpriteTemplate
_081583E0: .4byte gUnknown_8239F8C _081583E0: .4byte gUnknown_8239F8C
_081583E4: .4byte gUnknown_2023D44 _081583E4: .4byte gBattlerSpriteIds
_081583E8: .4byte gSprites _081583E8: .4byte gSprites
_081583EC: .4byte 0x0000fffe _081583EC: .4byte 0x0000fffe
_081583F0: _081583F0:
@@ -4281,7 +4281,7 @@ _081583F0:
movs r1, 0xB0 movs r1, 0xB0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r5, _08158518 @ =gUnknown_2023D44 ldr r5, _08158518 @ =gBattlerSpriteIds
ldrb r1, [r7] ldrb r1, [r7]
adds r1, r5 adds r1, r5
strb r0, [r1] strb r0, [r1]
@@ -4387,7 +4387,7 @@ _081584E2:
.align 2, 0 .align 2, 0
_08158510: .4byte gMultiuseSpriteTemplate _08158510: .4byte gMultiuseSpriteTemplate
_08158514: .4byte gUnknown_823932C _08158514: .4byte gUnknown_823932C
_08158518: .4byte gUnknown_2023D44 _08158518: .4byte gBattlerSpriteIds
_0815851C: .4byte gSprites _0815851C: .4byte gSprites
_08158520: .4byte 0x0000ff10 _08158520: .4byte 0x0000ff10
_08158524: .4byte gTrainerFrontPicPaletteTable _08158524: .4byte gTrainerFrontPicPaletteTable
@@ -4427,7 +4427,7 @@ sub_8158544: @ 8158544
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r6, _081585F8 @ =gUnknown_2023D44 ldr r6, _081585F8 @ =gBattlerSpriteIds
ldrb r1, [r4] ldrb r1, [r4]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -4486,7 +4486,7 @@ sub_8158544: @ 8158544
_081585EC: .4byte gActiveBattler _081585EC: .4byte gActiveBattler
_081585F0: .4byte gMultiuseSpriteTemplate _081585F0: .4byte gMultiuseSpriteTemplate
_081585F4: .4byte gUnknown_8239F8C _081585F4: .4byte gUnknown_8239F8C
_081585F8: .4byte gUnknown_2023D44 _081585F8: .4byte gBattlerSpriteIds
_081585FC: .4byte gSprites _081585FC: .4byte gSprites
_08158600: .4byte 0x0000ffa0 _08158600: .4byte 0x0000ffa0
_08158604: .4byte sub_8033EEC _08158604: .4byte sub_8033EEC
@@ -4574,7 +4574,7 @@ _08158670:
movs r0, 0x10 movs r0, 0x10
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _081586F0 @ =gSprites ldr r2, _081586F0 @ =gSprites
ldr r3, _081586F4 @ =gUnknown_2023D44 ldr r3, _081586F4 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r3 adds r0, r3
ldrb r1, [r0] ldrb r1, [r0]
@@ -4606,14 +4606,14 @@ _08158670:
_081586E8: .4byte gBattlerPartyIndexes _081586E8: .4byte gBattlerPartyIndexes
_081586EC: .4byte gPlayerParty _081586EC: .4byte gPlayerParty
_081586F0: .4byte gSprites _081586F0: .4byte gSprites
_081586F4: .4byte gUnknown_2023D44 _081586F4: .4byte gBattlerSpriteIds
_081586F8: .4byte sub_8012110 _081586F8: .4byte sub_8012110
_081586FC: _081586FC:
movs r0, 0x10 movs r0, 0x10
movs r1, 0x3F movs r1, 0x3F
bl PlaySE12WithPanning bl PlaySE12WithPanning
ldr r2, _08158730 @ =gSprites ldr r2, _08158730 @ =gSprites
ldr r1, _08158734 @ =gUnknown_2023D44 ldr r1, _08158734 @ =gBattlerSpriteIds
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
@@ -4638,7 +4638,7 @@ _0815872A:
bx r0 bx r0
.align 2, 0 .align 2, 0
_08158730: .4byte gSprites _08158730: .4byte gSprites
_08158734: .4byte gUnknown_2023D44 _08158734: .4byte gBattlerSpriteIds
_08158738: .4byte sub_8011EA0 _08158738: .4byte sub_8011EA0
_0815873C: .4byte gUnknown_3004FE0 _0815873C: .4byte gUnknown_3004FE0
_08158740: .4byte gActiveBattler _08158740: .4byte gActiveBattler
@@ -4762,7 +4762,7 @@ sub_8158814: @ 8158814
ldrb r1, [r1] ldrb r1, [r1]
lsls r1, 8 lsls r1, 8
orrs r0, r1 orrs r0, r1
ldr r5, _081588F0 @ =gUnknown_2037F16 ldr r5, _081588F0 @ =gAnimMoveTurn
mov r1, r12 mov r1, r12
adds r1, 0x3 adds r1, 0x3
adds r2, r1 adds r2, r1
@@ -4830,7 +4830,7 @@ sub_8158814: @ 8158814
lsls r1, 8 lsls r1, 8
orrs r3, r1 orrs r3, r1
strh r3, [r4] strh r3, [r4]
ldr r3, _08158904 @ =gUnknown_2037EE4 ldr r3, _08158904 @ =gAnimDisableStructPtr
ldrb r2, [r6] ldrb r2, [r6]
lsls r2, 9 lsls r2, 9
mov r1, r12 mov r1, r12
@@ -4854,12 +4854,12 @@ sub_8158814: @ 8158814
.align 2, 0 .align 2, 0
_081588E8: .4byte gUnknown_2022BC4 _081588E8: .4byte gUnknown_2022BC4
_081588EC: .4byte gActiveBattler _081588EC: .4byte gActiveBattler
_081588F0: .4byte gUnknown_2037F16 _081588F0: .4byte gAnimMoveTurn
_081588F4: .4byte gUnknown_2037EEC _081588F4: .4byte gUnknown_2037EEC
_081588F8: .4byte gUnknown_2037EE8 _081588F8: .4byte gUnknown_2037EE8
_081588FC: .4byte gUnknown_2037EFE _081588FC: .4byte gUnknown_2037EFE
_08158900: .4byte gUnknown_2037F00 _08158900: .4byte gUnknown_2037F00
_08158904: .4byte gUnknown_2037EE4 _08158904: .4byte gAnimDisableStructPtr
_08158908: .4byte gUnknown_2024008 _08158908: .4byte gUnknown_2024008
_0815890C: _0815890C:
ldr r0, _08158930 @ =gUnknown_2024018 ldr r0, _08158930 @ =gUnknown_2024018
@@ -5936,7 +5936,7 @@ sub_8159184: @ 8159184
sub_8159190: @ 8159190 sub_8159190: @ 8159190
push {r4,lr} push {r4,lr}
ldr r3, _081591B8 @ =gSprites ldr r3, _081591B8 @ =gSprites
ldr r2, _081591BC @ =gUnknown_2023D44 ldr r2, _081591BC @ =gBattlerSpriteIds
ldr r4, _081591C0 @ =gActiveBattler ldr r4, _081591C0 @ =gActiveBattler
ldrb r0, [r4] ldrb r0, [r4]
adds r0, r2 adds r0, r2
@@ -5954,7 +5954,7 @@ sub_8159190: @ 8159190
b _081591EE b _081591EE
.align 2, 0 .align 2, 0
_081591B8: .4byte gSprites _081591B8: .4byte gSprites
_081591BC: .4byte gUnknown_2023D44 _081591BC: .4byte gBattlerSpriteIds
_081591C0: .4byte gActiveBattler _081591C0: .4byte gActiveBattler
_081591C4: _081591C4:
ldr r1, _081591F4 @ =gUnknown_2024005 ldr r1, _081591F4 @ =gUnknown_2024005
@@ -6119,7 +6119,7 @@ _08159300: .4byte gUnknown_2023F4C
thumb_func_start sub_8159304 thumb_func_start sub_8159304
sub_8159304: @ 8159304 sub_8159304: @ 8159304
push {r4-r7,lr} push {r4-r7,lr}
ldr r6, _0815943C @ =gUnknown_2023D44 ldr r6, _0815943C @ =gBattlerSpriteIds
ldr r7, _08159440 @ =gActiveBattler ldr r7, _08159440 @ =gActiveBattler
ldrb r0, [r7] ldrb r0, [r7]
adds r0, r6 adds r0, r6
@@ -6269,7 +6269,7 @@ _0815941C:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_0815943C: .4byte gUnknown_2023D44 _0815943C: .4byte gBattlerSpriteIds
_08159440: .4byte gActiveBattler _08159440: .4byte gActiveBattler
_08159444: .4byte gSprites _08159444: .4byte gSprites
_08159448: .4byte 0x0000ffd8 _08159448: .4byte 0x0000ffd8
@@ -6359,7 +6359,7 @@ sub_8159478: @ 8159478
adds r1, r5, 0 adds r1, r5, 0
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r4, _081595DC @ =gUnknown_2023D44 ldr r4, _081595DC @ =gBattlerSpriteIds
adds r4, r6, r4 adds r4, r6, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _081595E0 @ =gSprites ldr r5, _081595E0 @ =gSprites
@@ -6450,7 +6450,7 @@ _081595CC: .4byte gPlayerParty
_081595D0: .4byte sub_8033E3C _081595D0: .4byte sub_8033E3C
_081595D4: .4byte gUnknown_3004FFC _081595D4: .4byte gUnknown_3004FFC
_081595D8: .4byte gMultiuseSpriteTemplate _081595D8: .4byte gMultiuseSpriteTemplate
_081595DC: .4byte gUnknown_2023D44 _081595DC: .4byte gBattlerSpriteIds
_081595E0: .4byte gSprites _081595E0: .4byte gSprites
_081595E4: .4byte gBattleMonForms _081595E4: .4byte gBattleMonForms
_081595E8: .4byte SpriteCallbackDummy _081595E8: .4byte SpriteCallbackDummy
asm/battle_controller_safari.s
+4 -4
View File
@@ -259,7 +259,7 @@ _080DD724: .4byte gActiveBattler
sub_80DD728: @ 80DD728 sub_80DD728: @ 80DD728
push {lr} push {lr}
ldr r2, _080DD750 @ =gSprites ldr r2, _080DD750 @ =gSprites
ldr r1, _080DD754 @ =gUnknown_2023D44 ldr r1, _080DD754 @ =gBattlerSpriteIds
ldr r0, _080DD758 @ =gActiveBattler ldr r0, _080DD758 @ =gActiveBattler
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -279,7 +279,7 @@ _080DD74C:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080DD750: .4byte gSprites _080DD750: .4byte gSprites
_080DD754: .4byte gUnknown_2023D44 _080DD754: .4byte gBattlerSpriteIds
_080DD758: .4byte gActiveBattler _080DD758: .4byte gActiveBattler
_080DD75C: .4byte SpriteCallbackDummy _080DD75C: .4byte SpriteCallbackDummy
thumb_func_end sub_80DD728 thumb_func_end sub_80DD728
@@ -646,7 +646,7 @@ SafariHandleDrawTrainerPic: @ 80DD9C4
movs r1, 0x50 movs r1, 0x50
movs r3, 0x1E movs r3, 0x1E
bl CreateSprite bl CreateSprite
ldr r6, _080DDA8C @ =gUnknown_2023D44 ldr r6, _080DDA8C @ =gBattlerSpriteIds
ldrb r1, [r5] ldrb r1, [r5]
adds r1, r6 adds r1, r6
strb r0, [r1] strb r0, [r1]
@@ -706,7 +706,7 @@ _080DDA7C: .4byte gSaveBlock2Ptr
_080DDA80: .4byte gActiveBattler _080DDA80: .4byte gActiveBattler
_080DDA84: .4byte gMultiuseSpriteTemplate _080DDA84: .4byte gMultiuseSpriteTemplate
_080DDA88: .4byte gUnknown_8239F8C _080DDA88: .4byte gUnknown_8239F8C
_080DDA8C: .4byte gUnknown_2023D44 _080DDA8C: .4byte gBattlerSpriteIds
_080DDA90: .4byte gSprites _080DDA90: .4byte gSprites
_080DDA94: .4byte 0x0000fffe _080DDA94: .4byte 0x0000fffe
_080DDA98: .4byte sub_8033EEC _080DDA98: .4byte sub_8033EEC
asm/battle_gfx_sfx_util.s
+16 -16
View File
@@ -394,7 +394,7 @@ _08034094:
cmp r5, 0x2 cmp r5, 0x2
bne _080340E0 bne _080340E0
ldr r1, _080340D8 @ =gSprites ldr r1, _080340D8 @ =gSprites
ldr r0, _080340DC @ =gUnknown_2023D44 ldr r0, _080340DC @ =gBattlerSpriteIds
adds r0, r6, r0 adds r0, r6, r0
ldrb r2, [r0] ldrb r2, [r0]
lsls r0, r2, 4 lsls r0, r2, 4
@@ -415,7 +415,7 @@ _08034094:
b _08034132 b _08034132
.align 2, 0 .align 2, 0
_080340D8: .4byte gSprites _080340D8: .4byte gSprites
_080340DC: .4byte gUnknown_2023D44 _080340DC: .4byte gBattlerSpriteIds
_080340E0: _080340E0:
ldr r0, _08034144 @ =gBattleAnimAttacker ldr r0, _08034144 @ =gBattleAnimAttacker
mov r2, r10 mov r2, r10
@@ -1718,7 +1718,7 @@ CopyAllBattleSpritesInvisibilities: @ 8034B40
negs r0, r0 negs r0, r0
mov r8, r0 mov r8, r0
ldr r7, _08034BAC @ =gUnknown_2024018 ldr r7, _08034BAC @ =gUnknown_2024018
ldr r6, _08034BB0 @ =gUnknown_2023D44 ldr r6, _08034BB0 @ =gBattlerSpriteIds
_08034B64: _08034B64:
ldr r0, [r7] ldr r0, [r7]
ldr r0, [r0] ldr r0, [r0]
@@ -1756,7 +1756,7 @@ _08034B96:
_08034BA4: .4byte gBattlersCount _08034BA4: .4byte gBattlersCount
_08034BA8: .4byte gSprites _08034BA8: .4byte gSprites
_08034BAC: .4byte gUnknown_2024018 _08034BAC: .4byte gUnknown_2024018
_08034BB0: .4byte gUnknown_2023D44 _08034BB0: .4byte gBattlerSpriteIds
thumb_func_end CopyAllBattleSpritesInvisibilities thumb_func_end CopyAllBattleSpritesInvisibilities
thumb_func_start CopyBattleSpriteInvisibility thumb_func_start CopyBattleSpriteInvisibility
@@ -1769,7 +1769,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
lsls r3, r0, 2 lsls r3, r0, 2
adds r3, r1 adds r3, r1
ldr r2, _08034BEC @ =gSprites ldr r2, _08034BEC @ =gSprites
ldr r1, _08034BF0 @ =gUnknown_2023D44 ldr r1, _08034BF0 @ =gBattlerSpriteIds
adds r0, r1 adds r0, r1
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1790,7 +1790,7 @@ CopyBattleSpriteInvisibility: @ 8034BB4
.align 2, 0 .align 2, 0
_08034BE8: .4byte gUnknown_2024018 _08034BE8: .4byte gUnknown_2024018
_08034BEC: .4byte gSprites _08034BEC: .4byte gSprites
_08034BF0: .4byte gUnknown_2023D44 _08034BF0: .4byte gBattlerSpriteIds
thumb_func_end CopyBattleSpriteInvisibility thumb_func_end CopyBattleSpriteInvisibility
thumb_func_start sub_8034BF4 thumb_func_start sub_8034BF4
@@ -1869,7 +1869,7 @@ _08034C16:
adds r0, r5 adds r0, r5
ldr r2, [r0] ldr r2, [r0]
ldr r5, _08034D68 @ =gSprites ldr r5, _08034D68 @ =gSprites
ldr r4, _08034D6C @ =gUnknown_2023D44 ldr r4, _08034D6C @ =gBattlerSpriteIds
add r4, r9 add r4, r9
ldrb r1, [r4] ldrb r1, [r4]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1964,7 +1964,7 @@ _08034D5C: .4byte gEnemyParty
_08034D60: .4byte gMonFrontPicTable _08034D60: .4byte gMonFrontPicTable
_08034D64: .4byte gMonSpritesGfxPtr _08034D64: .4byte gMonSpritesGfxPtr
_08034D68: .4byte gSprites _08034D68: .4byte gSprites
_08034D6C: .4byte gUnknown_2023D44 _08034D6C: .4byte gBattlerSpriteIds
_08034D70: .4byte 0x06010000 _08034D70: .4byte 0x06010000
_08034D74: .4byte 0x040000d4 _08034D74: .4byte 0x040000d4
_08034D78: .4byte 0x84000200 _08034D78: .4byte 0x84000200
@@ -1974,7 +1974,7 @@ _08034D84: .4byte gUnknown_3004FF0
_08034D88: _08034D88:
cmp r2, 0 cmp r2, 0
beq _08034E4C beq _08034E4C
ldr r0, _08034E28 @ =gUnknown_2023D44 ldr r0, _08034E28 @ =gBattlerSpriteIds
mov r3, r9 mov r3, r9
adds r5, r3, r0 adds r5, r3, r0
ldrb r1, [r5] ldrb r1, [r5]
@@ -2048,7 +2048,7 @@ _08034E0E:
strh r0, [r1, 0x22] strh r0, [r1, 0x22]
b _08035062 b _08035062
.align 2, 0 .align 2, 0
_08034E28: .4byte gUnknown_2023D44 _08034E28: .4byte gBattlerSpriteIds
_08034E2C: .4byte gSprites _08034E2C: .4byte gSprites
_08034E30: .4byte gUnknown_2024018 _08034E30: .4byte gUnknown_2024018
_08034E34: .4byte gBattleStruct _08034E34: .4byte gBattleStruct
@@ -2189,7 +2189,7 @@ _08034F5E:
adds r0, 0x4 adds r0, 0x4
adds r0, r5 adds r0, r5
ldr r2, [r0] ldr r2, [r0]
ldr r0, _08035088 @ =gUnknown_2023D44 ldr r0, _08035088 @ =gBattlerSpriteIds
add r0, r9 add r0, r9
str r0, [sp, 0x10] str r0, [sp, 0x10]
ldrb r1, [r0] ldrb r1, [r0]
@@ -2318,7 +2318,7 @@ _08035078: .4byte gEnemyParty
_0803507C: .4byte gMonFrontPicTable _0803507C: .4byte gMonFrontPicTable
_08035080: .4byte gMonSpritesGfxPtr _08035080: .4byte gMonSpritesGfxPtr
_08035084: .4byte gUnknown_2024008 _08035084: .4byte gUnknown_2024008
_08035088: .4byte gUnknown_2023D44 _08035088: .4byte gBattlerSpriteIds
_0803508C: .4byte gSprites _0803508C: .4byte gSprites
_08035090: .4byte 0x06010000 _08035090: .4byte 0x06010000
_08035094: .4byte 0x040000d4 _08035094: .4byte 0x040000d4
@@ -2820,7 +2820,7 @@ _0803547C:
cmp r0, 0 cmp r0, 0
beq _08035514 beq _08035514
ldr r4, _080354E4 @ =gSprites ldr r4, _080354E4 @ =gSprites
ldr r0, _080354E8 @ =gUnknown_2023D44 ldr r0, _080354E8 @ =gBattlerSpriteIds
adds r3, r5, r0 adds r3, r5, r0
ldrb r1, [r3] ldrb r1, [r3]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -2864,7 +2864,7 @@ _0803547C:
.align 2, 0 .align 2, 0
_080354E0: .4byte gBattlersCount _080354E0: .4byte gBattlersCount
_080354E4: .4byte gSprites _080354E4: .4byte gSprites
_080354E8: .4byte gUnknown_2023D44 _080354E8: .4byte gBattlerSpriteIds
_080354EC: .4byte gUnknown_2024018 _080354EC: .4byte gUnknown_2024018
_080354F0: _080354F0:
ldrb r0, [r3] ldrb r0, [r3]
@@ -3026,7 +3026,7 @@ SpriteCB_EnemyShadow: @ 8035624
ldrh r0, [r5, 0x2E] ldrh r0, [r5, 0x2E]
lsls r0, 24 lsls r0, 24
lsrs r4, r0, 24 lsrs r4, r0, 24
ldr r0, _08035668 @ =gUnknown_2023D44 ldr r0, _08035668 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -3051,7 +3051,7 @@ _08035660:
str r0, [r5, 0x1C] str r0, [r5, 0x1C]
b _080356EA b _080356EA
.align 2, 0 .align 2, 0
_08035668: .4byte gUnknown_2023D44 _08035668: .4byte gBattlerSpriteIds
_0803566C: .4byte gSprites _0803566C: .4byte gSprites
_08035670: .4byte SpriteCB_SetInvisible _08035670: .4byte SpriteCB_SetInvisible
_08035674: _08035674:
asm/dark.s
+12 -12
View File
@@ -96,7 +96,7 @@ sub_80B7954: @ 80B7954
cmp r4, 0x10 cmp r4, 0x10
bne _080B79D6 bne _080B79D6
ldr r2, _080B79C4 @ =gSprites ldr r2, _080B79C4 @ =gSprites
ldr r1, _080B79C8 @ =gUnknown_2023D44 ldr r1, _080B79C8 @ =gBattlerSpriteIds
ldr r0, _080B79CC @ =gBattleAnimAttacker ldr r0, _080B79CC @ =gBattleAnimAttacker
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -116,7 +116,7 @@ sub_80B7954: @ 80B7954
.align 2, 0 .align 2, 0
_080B79C0: .4byte gTasks _080B79C0: .4byte gTasks
_080B79C4: .4byte gSprites _080B79C4: .4byte gSprites
_080B79C8: .4byte gUnknown_2023D44 _080B79C8: .4byte gBattlerSpriteIds
_080B79CC: .4byte gBattleAnimAttacker _080B79CC: .4byte gBattleAnimAttacker
_080B79D0: _080B79D0:
ldrh r0, [r6, 0xC] ldrh r0, [r6, 0xC]
@@ -1666,7 +1666,7 @@ sub_80B85B8: @ 80B85B8
bl sub_8072E48 bl sub_8072E48
ldr r0, _080B865C @ =gSprites ldr r0, _080B865C @ =gSprites
mov r9, r0 mov r9, r0
ldr r0, _080B8660 @ =gUnknown_2023D44 ldr r0, _080B8660 @ =gBattlerSpriteIds
mov r8, r0 mov r8, r0
ldrb r0, [r6] ldrb r0, [r6]
add r0, r8 add r0, r8
@@ -1721,7 +1721,7 @@ _080B8642:
.align 2, 0 .align 2, 0
_080B8658: .4byte gBattleAnimAttacker _080B8658: .4byte gBattleAnimAttacker
_080B865C: .4byte gSprites _080B865C: .4byte gSprites
_080B8660: .4byte gUnknown_2023D44 _080B8660: .4byte gBattlerSpriteIds
thumb_func_end sub_80B85B8 thumb_func_end sub_80B85B8
thumb_func_start sub_80B8664 thumb_func_start sub_80B8664
@@ -1866,7 +1866,7 @@ _080B8780:
cmp r0, 0x1 cmp r0, 0x1
bne _080B87CA bne _080B87CA
ldr r3, _080B8808 @ =gSprites ldr r3, _080B8808 @ =gSprites
ldr r1, _080B880C @ =gUnknown_2023D44 ldr r1, _080B880C @ =gBattlerSpriteIds
ldrb r0, [r4] ldrb r0, [r4]
eors r0, r5 eors r0, r5
adds r0, r1 adds r0, r1
@@ -1917,7 +1917,7 @@ _080B87FC: .4byte 0x00003f42
_080B8800: .4byte 0x00000c08 _080B8800: .4byte 0x00000c08
_080B8804: .4byte gBattleAnimAttacker _080B8804: .4byte gBattleAnimAttacker
_080B8808: .4byte gSprites _080B8808: .4byte gSprites
_080B880C: .4byte gUnknown_2023D44 _080B880C: .4byte gBattlerSpriteIds
_080B8810: .4byte gBattlerPartyIndexes _080B8810: .4byte gBattlerPartyIndexes
_080B8814: .4byte gEnemyParty _080B8814: .4byte gEnemyParty
_080B8818: _080B8818:
@@ -2111,7 +2111,7 @@ _080B8990:
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
cmp r0, 0x1 cmp r0, 0x1
bne _080B8A5E bne _080B8A5E
ldr r2, _080B89F4 @ =gUnknown_2023D44 ldr r2, _080B89F4 @ =gBattlerSpriteIds
ldr r0, _080B89F8 @ =gBattleAnimAttacker ldr r0, _080B89F8 @ =gBattleAnimAttacker
ldrb r1, [r0] ldrb r1, [r0]
movs r0, 0x2 movs r0, 0x2
@@ -2139,7 +2139,7 @@ _080B8990:
_080B89E8: .4byte gTasks _080B89E8: .4byte gTasks
_080B89EC: .4byte gBattle_BG1_X _080B89EC: .4byte gBattle_BG1_X
_080B89F0: .4byte gSprites _080B89F0: .4byte gSprites
_080B89F4: .4byte gUnknown_2023D44 _080B89F4: .4byte gBattlerSpriteIds
_080B89F8: .4byte gBattleAnimAttacker _080B89F8: .4byte gBattleAnimAttacker
_080B89FC: _080B89FC:
cmp r0, 0x3 cmp r0, 0x3
@@ -2258,12 +2258,12 @@ _080B8AE0:
lsls r0, 24 lsls r0, 24
cmp r0, 0 cmp r0, 0
beq _080B8B04 beq _080B8B04
ldr r0, _080B8B00 @ =gUnknown_2023D44 ldr r0, _080B8B00 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r2, [r0] ldrb r2, [r0]
b _080B8B06 b _080B8B06
.align 2, 0 .align 2, 0
_080B8B00: .4byte gUnknown_2023D44 _080B8B00: .4byte gBattlerSpriteIds
_080B8B04: _080B8B04:
movs r2, 0xFF movs r2, 0xFF
_080B8B06: _080B8B06:
@@ -2296,7 +2296,7 @@ sub_80B8B38: @ 80B8B38
push {lr} push {lr}
lsls r0, 24 lsls r0, 24
lsrs r3, r0, 24 lsrs r3, r0, 24
ldr r2, _080B8B64 @ =gUnknown_2037F16 ldr r2, _080B8B64 @ =gAnimMoveTurn
ldrb r0, [r2] ldrb r0, [r2]
cmp r0, 0x1 cmp r0, 0x1
bhi _080B8B4C bhi _080B8B4C
@@ -2316,7 +2316,7 @@ _080B8B58:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B8B64: .4byte gUnknown_2037F16 _080B8B64: .4byte gAnimMoveTurn
_080B8B68: .4byte gBattleAnimArgs _080B8B68: .4byte gBattleAnimArgs
thumb_func_end sub_80B8B38 thumb_func_end sub_80B8B38
asm/fighting.s
+2 -2
View File
@@ -1492,7 +1492,7 @@ sub_80B13F8: @ 80B13F8
strh r0, [r5, 0x34] strh r0, [r5, 0x34]
ldrh r0, [r1, 0x4] ldrh r0, [r1, 0x4]
strh r0, [r5, 0x36] strh r0, [r5, 0x36]
ldr r0, _080B147C @ =gUnknown_2037F16 ldr r0, _080B147C @ =gAnimMoveTurn
ldrb r6, [r0] ldrb r6, [r0]
ldrb r0, [r4] ldrb r0, [r4]
bl GetBattlerSide bl GetBattlerSide
@@ -1531,7 +1531,7 @@ _080B1456:
.align 2, 0 .align 2, 0
_080B1474: .4byte gBattleAnimTarget _080B1474: .4byte gBattleAnimTarget
_080B1478: .4byte gBattleAnimArgs _080B1478: .4byte gBattleAnimArgs
_080B147C: .4byte gUnknown_2037F16 _080B147C: .4byte gAnimMoveTurn
_080B1480: .4byte sub_80B13D4 _080B1480: .4byte sub_80B13D4
thumb_func_end sub_80B13F8 thumb_func_end sub_80B13F8
asm/fire.s
+2 -2
View File
@@ -2391,7 +2391,7 @@ _080ADB0E:
ldrh r0, [r2, 0x8] ldrh r0, [r2, 0x8]
adds r0, 0x1 adds r0, 0x1
strh r0, [r2, 0x8] strh r0, [r2, 0x8]
ldr r1, _080ADB38 @ =gUnknown_2023D44 ldr r1, _080ADB38 @ =gBattlerSpriteIds
ldr r0, _080ADB3C @ =gBattleAnimTarget ldr r0, _080ADB3C @ =gBattleAnimTarget
ldrb r0, [r0] ldrb r0, [r0]
adds r0, r1 adds r0, r1
@@ -2407,7 +2407,7 @@ _080ADB0E:
.align 2, 0 .align 2, 0
_080ADB30: .4byte gTasks _080ADB30: .4byte gTasks
_080ADB34: .4byte gBattleAnimArgs _080ADB34: .4byte gBattleAnimArgs
_080ADB38: .4byte gUnknown_2023D44 _080ADB38: .4byte gBattlerSpriteIds
_080ADB3C: .4byte gBattleAnimTarget _080ADB3C: .4byte gBattleAnimTarget
_080ADB40: .4byte gUnknown_83E5EFC _080ADB40: .4byte gUnknown_83E5EFC
_080ADB44: _080ADB44:
asm/ghost.s
+2 -2
View File
@@ -3929,7 +3929,7 @@ sub_80B7158: @ 80B7158
movs r2, 0x4 movs r2, 0x4
orrs r1, r2 orrs r1, r2
strb r1, [r3] strb r1, [r3]
ldr r2, _080B719C @ =gUnknown_2023D44 ldr r2, _080B719C @ =gBattlerSpriteIds
ldr r1, _080B71A0 @ =gBattleAnimAttacker ldr r1, _080B71A0 @ =gBattleAnimAttacker
ldrb r1, [r1] ldrb r1, [r1]
adds r1, r2 adds r1, r2
@@ -3958,7 +3958,7 @@ sub_80B7158: @ 80B7158
strh r1, [r0, 0x22] strh r1, [r0, 0x22]
bx lr bx lr
.align 2, 0 .align 2, 0
_080B719C: .4byte gUnknown_2023D44 _080B719C: .4byte gBattlerSpriteIds
_080B71A0: .4byte gBattleAnimAttacker _080B71A0: .4byte gBattleAnimAttacker
_080B71A4: .4byte gBattleAnimArgs _080B71A4: .4byte gBattleAnimArgs
_080B71A8: .4byte sub_80B71B0 _080B71A8: .4byte sub_80B71B0
asm/ground.s
+2 -2
View File
@@ -1268,7 +1268,7 @@ _080B951E:
adds r1, r4, 0 adds r1, r4, 0
adds r1, 0x8 adds r1, 0x8
adds r1, r0 adds r1, r0
ldr r0, _080B9554 @ =gUnknown_2023D44 ldr r0, _080B9554 @ =gBattlerSpriteIds
adds r0, r5, r0 adds r0, r5, r0
ldrb r0, [r0] ldrb r0, [r0]
strh r0, [r1] strh r0, [r1]
@@ -1283,7 +1283,7 @@ _080B9548:
bls _080B951E bls _080B951E
b _080B9574 b _080B9574
.align 2, 0 .align 2, 0
_080B9554: .4byte gUnknown_2023D44 _080B9554: .4byte gBattlerSpriteIds
_080B9558: _080B9558:
ldrb r0, [r6] ldrb r0, [r6]
bl GetAnimBankSpriteId bl GetAnimBankSpriteId
asm/ice.s
+4 -4
View File
@@ -2886,7 +2886,7 @@ _080B06F8: .4byte gTasks
unc_080B06FC: @ 80B06FC unc_080B06FC: @ 80B06FC
push {r4-r6,lr} push {r4-r6,lr}
adds r5, r0, 0 adds r5, r0, 0
ldr r0, _080B077C @ =gUnknown_2037EE4 ldr r0, _080B077C @ =gAnimDisableStructPtr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x11] ldrb r1, [r0, 0x11]
lsrs r0, r1, 4 lsrs r0, r1, 4
@@ -2945,7 +2945,7 @@ _080B0742:
pop {r0} pop {r0}
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B077C: .4byte gUnknown_2037EE4 _080B077C: .4byte gAnimDisableStructPtr
_080B0780: .4byte gBattleAnimArgs _080B0780: .4byte gBattleAnimArgs
_080B0784: .4byte gBattleAnimAttacker _080B0784: .4byte gBattleAnimAttacker
_080B0788: .4byte gBattleAnimTarget _080B0788: .4byte gBattleAnimTarget
@@ -3079,7 +3079,7 @@ sub_80B0870: @ 80B0870
ldrb r3, [r1] ldrb r3, [r1]
lsls r3, 1 lsls r3, 1
adds r3, r1 adds r3, r1
ldr r1, _080B089C @ =gUnknown_2037EE4 ldr r1, _080B089C @ =gAnimDisableStructPtr
ldr r1, [r1] ldr r1, [r1]
ldrb r1, [r1, 0x11] ldrb r1, [r1, 0x11]
lsrs r2, r1, 4 lsrs r2, r1, 4
@@ -3093,7 +3093,7 @@ sub_80B0870: @ 80B0870
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B0898: .4byte gBattleAnimArgs _080B0898: .4byte gBattleAnimArgs
_080B089C: .4byte gUnknown_2037EE4 _080B089C: .4byte gAnimDisableStructPtr
thumb_func_end sub_80B0870 thumb_func_end sub_80B0870
.align 2, 0 @ Don't pad with nop. .align 2, 0 @ Don't pad with nop.
asm/normal.s
+4 -4
View File
@@ -1405,7 +1405,7 @@ _080BA362:
bcs _080BA3B4 bcs _080BA3B4
ldr r2, _080BA3C4 @ =gSprites ldr r2, _080BA3C4 @ =gSprites
mov r12, r2 mov r12, r2
ldr r6, _080BA3C8 @ =gUnknown_2023D44 ldr r6, _080BA3C8 @ =gBattlerSpriteIds
movs r7, 0x3 movs r7, 0x3
negs r7, r7 negs r7, r7
_080BA392: _080BA392:
@@ -1436,14 +1436,14 @@ _080BA3BA:
.align 2, 0 .align 2, 0
_080BA3C0: .4byte gBattlersCount _080BA3C0: .4byte gBattlersCount
_080BA3C4: .4byte gSprites _080BA3C4: .4byte gSprites
_080BA3C8: .4byte gUnknown_2023D44 _080BA3C8: .4byte gBattlerSpriteIds
thumb_func_end sub_80BA320 thumb_func_end sub_80BA320
thumb_func_start sub_80BA3CC thumb_func_start sub_80BA3CC
sub_80BA3CC: @ 80BA3CC sub_80BA3CC: @ 80BA3CC
push {r4-r6,lr} push {r4-r6,lr}
ldr r6, _080BA440 @ =gSprites ldr r6, _080BA440 @ =gSprites
ldr r4, _080BA444 @ =gUnknown_2023D44 ldr r4, _080BA444 @ =gBattlerSpriteIds
ldr r5, _080BA448 @ =gBattleAnimAttacker ldr r5, _080BA448 @ =gBattleAnimAttacker
ldrb r0, [r5] ldrb r0, [r5]
adds r0, r4 adds r0, r4
@@ -1500,7 +1500,7 @@ sub_80BA3CC: @ 80BA3CC
b _080BA470 b _080BA470
.align 2, 0 .align 2, 0
_080BA440: .4byte gSprites _080BA440: .4byte gSprites
_080BA444: .4byte gUnknown_2023D44 _080BA444: .4byte gBattlerSpriteIds
_080BA448: .4byte gBattleAnimAttacker _080BA448: .4byte gBattleAnimAttacker
_080BA44C: .4byte gBattleAnimTarget _080BA44C: .4byte gBattleAnimTarget
_080BA450: .4byte gBattleAnimArgs _080BA450: .4byte gBattleAnimArgs
asm/pokeball.s
+12 -12
View File
@@ -432,7 +432,7 @@ sub_804AC94: @ 804AC94
strh r7, [r6, 0x38] strh r7, [r6, 0x38]
ldr r0, _0804ACF4 @ =sub_804AD00 ldr r0, _0804ACF4 @ =sub_804AD00
str r0, [r6, 0x1C] str r0, [r6, 0x1C]
ldr r5, _0804ACF8 @ =gUnknown_2023D44 ldr r5, _0804ACF8 @ =gBattlerSpriteIds
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
adds r0, r5 adds r0, r5
@@ -468,7 +468,7 @@ _0804ACEE:
bx r0 bx r0
.align 2, 0 .align 2, 0
_0804ACF4: .4byte sub_804AD00 _0804ACF4: .4byte sub_804AD00
_0804ACF8: .4byte gUnknown_2023D44 _0804ACF8: .4byte gBattlerSpriteIds
_0804ACFC: .4byte gSprites _0804ACFC: .4byte gSprites
thumb_func_end sub_804AC94 thumb_func_end sub_804AC94
@@ -487,7 +487,7 @@ sub_804AD00: @ 804AD00
bl PlaySE bl PlaySE
_0804AD18: _0804AD18:
ldr r6, _0804AD64 @ =gSprites ldr r6, _0804AD64 @ =gSprites
ldr r5, _0804AD68 @ =gUnknown_2023D44 ldr r5, _0804AD68 @ =gBattlerSpriteIds
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r4, r1] ldrsh r0, [r4, r1]
adds r0, r5 adds r0, r5
@@ -525,7 +525,7 @@ _0804AD18:
b _0804AD90 b _0804AD90
.align 2, 0 .align 2, 0
_0804AD64: .4byte gSprites _0804AD64: .4byte gSprites
_0804AD68: .4byte gUnknown_2023D44 _0804AD68: .4byte gBattlerSpriteIds
_0804AD6C: .4byte sub_804AD98 _0804AD6C: .4byte sub_804AD98
_0804AD70: _0804AD70:
ldrh r0, [r1, 0x30] ldrh r0, [r1, 0x30]
@@ -1363,7 +1363,7 @@ _0804B3F2:
strh r7, [r1, 0x10] strh r7, [r1, 0x10]
strh r2, [r1, 0x26] strh r2, [r1, 0x26]
_0804B420: _0804B420:
ldr r5, _0804B47C @ =gUnknown_2023D44 ldr r5, _0804B47C @ =gBattlerSpriteIds
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
adds r0, r5 adds r0, r5
@@ -1405,7 +1405,7 @@ _0804B420:
.align 2, 0 .align 2, 0
_0804B474: .4byte Task_PlayCryWhenReleasedFromBall _0804B474: .4byte Task_PlayCryWhenReleasedFromBall
_0804B478: .4byte gTasks _0804B478: .4byte gTasks
_0804B47C: .4byte gUnknown_2023D44 _0804B47C: .4byte gBattlerSpriteIds
_0804B480: .4byte gSprites _0804B480: .4byte gSprites
thumb_func_end sub_804B268 thumb_func_end sub_804B268
@@ -1437,7 +1437,7 @@ HandleBallAnimEnd: @ 804B4A4
lsls r0, 24 lsls r0, 24
lsrs r6, r0, 24 lsrs r6, r0, 24
ldr r4, _0804B508 @ =gSprites ldr r4, _0804B508 @ =gSprites
ldr r0, _0804B50C @ =gUnknown_2023D44 ldr r0, _0804B50C @ =gBattlerSpriteIds
adds r3, r6, r0 adds r3, r6, r0
ldrb r1, [r3] ldrb r1, [r3]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1482,7 +1482,7 @@ _0804B4E6:
b _0804B52C b _0804B52C
.align 2, 0 .align 2, 0
_0804B508: .4byte gSprites _0804B508: .4byte gSprites
_0804B50C: .4byte gUnknown_2023D44 _0804B50C: .4byte gBattlerSpriteIds
_0804B510: _0804B510:
ldr r2, _0804B5B4 @ =0xfffffee0 ldr r2, _0804B5B4 @ =0xfffffee0
adds r0, r2, 0 adds r0, r2, 0
@@ -1509,7 +1509,7 @@ _0804B52C:
cmp r7, 0 cmp r7, 0
beq _0804B5AE beq _0804B5AE
ldr r2, _0804B5B8 @ =gSprites ldr r2, _0804B5B8 @ =gSprites
ldr r0, _0804B5BC @ =gUnknown_2023D44 ldr r0, _0804B5BC @ =gBattlerSpriteIds
adds r0, r6, r0 adds r0, r6, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -1571,7 +1571,7 @@ _0804B5AE:
.align 2, 0 .align 2, 0
_0804B5B4: .4byte 0xfffffee0 _0804B5B4: .4byte 0xfffffee0
_0804B5B8: .4byte gSprites _0804B5B8: .4byte gSprites
_0804B5BC: .4byte gUnknown_2023D44 _0804B5BC: .4byte gBattlerSpriteIds
_0804B5C0: .4byte gUnknown_2024005 _0804B5C0: .4byte gUnknown_2024005
_0804B5C4: .4byte gUnknown_2024018 _0804B5C4: .4byte gUnknown_2024018
thumb_func_end HandleBallAnimEnd thumb_func_end HandleBallAnimEnd
@@ -1607,7 +1607,7 @@ _0804B600:
cmp r1, r0 cmp r1, r0
bne _0804B666 bne _0804B666
ldr r5, _0804B670 @ =gSprites ldr r5, _0804B670 @ =gSprites
ldr r4, _0804B674 @ =gUnknown_2023D44 ldr r4, _0804B674 @ =gBattlerSpriteIds
movs r1, 0x3A movs r1, 0x3A
ldrsh r0, [r6, r1] ldrsh r0, [r6, r1]
adds r0, r4 adds r0, r4
@@ -1658,7 +1658,7 @@ _0804B666:
.align 2, 0 .align 2, 0
_0804B66C: .4byte 0x0000013b _0804B66C: .4byte 0x0000013b
_0804B670: .4byte gSprites _0804B670: .4byte gSprites
_0804B674: .4byte gUnknown_2023D44 _0804B674: .4byte gBattlerSpriteIds
_0804B678: .4byte gMain _0804B678: .4byte gMain
_0804B67C: .4byte 0x00000439 _0804B67C: .4byte 0x00000439
_0804B680: .4byte gUnknown_2024018 _0804B680: .4byte gUnknown_2024018
asm/psychic.s
+3 -3
View File
@@ -286,7 +286,7 @@ sub_80B30B0: @ 80B30B0
cmp r0, 0 cmp r0, 0
beq _080B3118 beq _080B3118
ldr r2, _080B315C @ =gSprites ldr r2, _080B315C @ =gSprites
ldr r0, _080B3160 @ =gUnknown_2023D44 ldr r0, _080B3160 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -309,7 +309,7 @@ _080B3118:
cmp r0, 0 cmp r0, 0
beq _080B3146 beq _080B3146
ldr r2, _080B315C @ =gSprites ldr r2, _080B315C @ =gSprites
ldr r0, _080B3160 @ =gUnknown_2023D44 ldr r0, _080B3160 @ =gBattlerSpriteIds
adds r0, r4, r0 adds r0, r4, r0
ldrb r1, [r0] ldrb r1, [r0]
lsls r0, r1, 4 lsls r0, r1, 4
@@ -337,7 +337,7 @@ _080B3156:
bx r0 bx r0
.align 2, 0 .align 2, 0
_080B315C: .4byte gSprites _080B315C: .4byte gSprites
_080B3160: .4byte gUnknown_2023D44 _080B3160: .4byte gBattlerSpriteIds
_080B3164: .4byte sub_80B3168 _080B3164: .4byte sub_80B3168
thumb_func_end sub_80B30B0 thumb_func_end sub_80B30B0
asm/reshow_battle_screen.s
+7 -7
View File
@@ -678,7 +678,7 @@ _08077CD2:
adds r1, r4, 0 adds r1, r4, 0
mov r2, r8 mov r2, r8
bl CreateSprite bl CreateSprite
ldr r4, _08077D9C @ =gUnknown_2023D44 ldr r4, _08077D9C @ =gBattlerSpriteIds
adds r4, r7, r4 adds r4, r7, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _08077DA0 @ =gSprites ldr r5, _08077DA0 @ =gSprites
@@ -735,7 +735,7 @@ _08077CD2:
_08077D90: .4byte gBattlerPartyIndexes _08077D90: .4byte gBattlerPartyIndexes
_08077D94: .4byte gEnemyParty _08077D94: .4byte gEnemyParty
_08077D98: .4byte gMultiuseSpriteTemplate _08077D98: .4byte gMultiuseSpriteTemplate
_08077D9C: .4byte gUnknown_2023D44 _08077D9C: .4byte gBattlerSpriteIds
_08077DA0: .4byte gSprites _08077DA0: .4byte gSprites
_08077DA4: .4byte SpriteCallbackDummy _08077DA4: .4byte SpriteCallbackDummy
_08077DA8: .4byte gBattleMonForms _08077DA8: .4byte gBattleMonForms
@@ -820,7 +820,7 @@ _08077E54:
movs r1, 0x50 movs r1, 0x50
adds r2, r4, 0 adds r2, r4, 0
bl CreateSprite bl CreateSprite
ldr r3, _08077E9C @ =gUnknown_2023D44 ldr r3, _08077E9C @ =gBattlerSpriteIds
strb r0, [r3] strb r0, [r3]
ldr r4, _08077EA0 @ =gSprites ldr r4, _08077EA0 @ =gSprites
ldrb r0, [r3] ldrb r0, [r3]
@@ -851,7 +851,7 @@ _08077E54:
.align 2, 0 .align 2, 0
_08077E94: .4byte gMultiuseSpriteTemplate _08077E94: .4byte gMultiuseSpriteTemplate
_08077E98: .4byte gUnknown_8239F8C _08077E98: .4byte gUnknown_8239F8C
_08077E9C: .4byte gUnknown_2023D44 _08077E9C: .4byte gBattlerSpriteIds
_08077EA0: .4byte gSprites _08077EA0: .4byte gSprites
_08077EA4: .4byte SpriteCallbackDummy _08077EA4: .4byte SpriteCallbackDummy
_08077EA8: _08077EA8:
@@ -904,7 +904,7 @@ _08077EA8:
adds r1, r4, 0 adds r1, r4, 0
mov r2, r8 mov r2, r8
bl CreateSprite bl CreateSprite
ldr r4, _08077FD0 @ =gUnknown_2023D44 ldr r4, _08077FD0 @ =gBattlerSpriteIds
adds r4, r7, r4 adds r4, r7, r4
strb r0, [r4] strb r0, [r4]
ldr r5, _08077FD4 @ =gSprites ldr r5, _08077FD4 @ =gSprites
@@ -958,7 +958,7 @@ _08077EA8:
bl StartSpriteAnim bl StartSpriteAnim
_08077F84: _08077F84:
ldr r1, _08077FD4 @ =gSprites ldr r1, _08077FD4 @ =gSprites
ldr r0, _08077FD0 @ =gUnknown_2023D44 ldr r0, _08077FD0 @ =gBattlerSpriteIds
adds r0, r7, r0 adds r0, r7, r0
ldrb r0, [r0] ldrb r0, [r0]
lsls r2, r0, 4 lsls r2, r0, 4
@@ -993,7 +993,7 @@ _08077FB4:
_08077FC4: .4byte gBattlerPartyIndexes _08077FC4: .4byte gBattlerPartyIndexes
_08077FC8: .4byte gPlayerParty _08077FC8: .4byte gPlayerParty
_08077FCC: .4byte gMultiuseSpriteTemplate _08077FCC: .4byte gMultiuseSpriteTemplate
_08077FD0: .4byte gUnknown_2023D44 _08077FD0: .4byte gBattlerSpriteIds
_08077FD4: .4byte gSprites _08077FD4: .4byte gSprites
_08077FD8: .4byte SpriteCallbackDummy _08077FD8: .4byte SpriteCallbackDummy
_08077FDC: .4byte gBattleMonForms _08077FDC: .4byte gBattleMonForms
asm/rock.s
+2 -2
View File
@@ -1198,7 +1198,7 @@ _080B4FB4: .4byte gTasks
thumb_func_start sub_80B4FB8 thumb_func_start sub_80B4FB8
sub_80B4FB8: @ 80B4FB8 sub_80B4FB8: @ 80B4FB8
push {lr} push {lr}
ldr r0, _080B4FE0 @ =gUnknown_2037EE4 ldr r0, _080B4FE0 @ =gAnimDisableStructPtr
ldr r0, [r0] ldr r0, [r0]
ldrb r1, [r0, 0x11] ldrb r1, [r0, 0x11]
lsrs r0, r1, 4 lsrs r0, r1, 4
@@ -1219,7 +1219,7 @@ _080B4FDA:
pop {r1} pop {r1}
bx r1 bx r1
.align 2, 0 .align 2, 0
_080B4FE0: .4byte gUnknown_2037EE4 _080B4FE0: .4byte gAnimDisableStructPtr
thumb_func_end sub_80B4FB8 thumb_func_end sub_80B4FB8
thumb_func_start sub_80B4FE4 thumb_func_start sub_80B4FE4
sym_ewram.txt
+3 -3
View File
@@ -254,7 +254,7 @@ gUnknown_2023C30: @ 2023C30
gUnknown_2023C34: @ 2023C34 gUnknown_2023C34: @ 2023C34
.space 0x110 .space 0x110
gUnknown_2023D44: @ 2023D44 gBattlerSpriteIds: @ 2023D44
.space 0x4 .space 0x4
gUnknown_2023D48: @ 2023D48 gUnknown_2023D48: @ 2023D48
@@ -746,7 +746,7 @@ gUnknown_2037EE2: @ 2037EE2
gUnknown_2037EE3: @ 2037EE3 gUnknown_2037EE3: @ 2037EE3
.space 0x1 .space 0x1
gUnknown_2037EE4: @ 2037EE4 gAnimDisableStructPtr: @ 2037EE4
.space 0x4 .space 0x4
gUnknown_2037EE8: @ 2037EE8 gUnknown_2037EE8: @ 2037EE8
@@ -773,7 +773,7 @@ gUnknown_2037F12: @ 2037F12
gUnknown_2037F14: @ 2037F14 gUnknown_2037F14: @ 2037F14
.space 0x2 .space 0x2
gUnknown_2037F16: @ 2037F16 gAnimMoveTurn: @ 2037F16
.space 0x1 .space 0x1
gUnknown_2037F17: @ 2037F17 gUnknown_2037F17: @ 2037F17