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

battle_anim_utility_funcs; split battle_intro.s

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-02 04:08:59 +08:00
parent cb078ec3a2
commit aa89a0482d
31 changed files with 3178 additions and 5441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_2.s
+12 -12
View File
@@ -99,10 +99,10 @@ sub_800FE24: @ 800FE24
movs r0, 0x4A
movs r1, 0
bl SetGpuReg
ldr r1, _0800FF30 @ =gUnknown_2022984
ldr r1, _0800FF30 @ =gBattle_WIN0H
movs r0, 0xF0
strh r0, [r1]
ldr r0, _0800FF34 @ =gUnknown_2022986
ldr r0, _0800FF34 @ =gBattle_WIN0V
strh r4, [r0]
bl ScanlineEffect_Clear
ldr r0, _0800FF38 @ =gScanlineEffectRegBuffers
@@ -184,8 +184,8 @@ _0800FEA6:
.align 2, 0
_0800FF28: .4byte 0x05006000
_0800FF2C: .4byte 0x00005051
_0800FF30: .4byte gUnknown_2022984
_0800FF34: .4byte gUnknown_2022986
_0800FF30: .4byte gBattle_WIN0H
_0800FF34: .4byte gBattle_WIN0V
_0800FF38: .4byte gScanlineEffectRegBuffers
_0800FF3C: .4byte gUnknown_824EFE4
_0800FF40: .4byte 0x0000ff10
@@ -3157,11 +3157,11 @@ VBlankCB_Battle: @ 80116F4
ldrh r1, [r0]
movs r0, 0x1E
bl SetGpuReg
ldr r0, _080117A8 @ =gUnknown_2022984
ldr r0, _080117A8 @ =gBattle_WIN0H
ldrh r1, [r0]
movs r0, 0x40
bl SetGpuReg
ldr r0, _080117AC @ =gUnknown_2022986
ldr r0, _080117AC @ =gBattle_WIN0V
ldrh r1, [r0]
movs r0, 0x44
bl SetGpuReg
@@ -3188,8 +3188,8 @@ _08011798: .4byte gBattle_BG2_X
_0801179C: .4byte gBattle_BG2_Y
_080117A0: .4byte gBattle_BG3_X
_080117A4: .4byte gBattle_BG3_Y
_080117A8: .4byte gUnknown_2022984
_080117AC: .4byte gUnknown_2022986
_080117A8: .4byte gBattle_WIN0H
_080117AC: .4byte gBattle_WIN0V
_080117B0: .4byte gUnknown_2022988
_080117B4: .4byte gUnknown_202298A
thumb_func_end VBlankCB_Battle
@@ -3543,10 +3543,10 @@ sub_8011A1C: @ 8011A1C
movs r0, 0x4A
movs r1, 0
bl SetGpuReg
ldr r1, _08011B48 @ =gUnknown_2022984
ldr r1, _08011B48 @ =gBattle_WIN0H
movs r0, 0xF0
strh r0, [r1]
ldr r0, _08011B4C @ =gUnknown_2022986
ldr r0, _08011B4C @ =gBattle_WIN0V
strh r4, [r0]
bl ScanlineEffect_Clear
ldr r0, _08011B50 @ =gScanlineEffectRegBuffers
@@ -3643,8 +3643,8 @@ _08011A9C:
.align 2, 0
_08011B40: .4byte 0x05006000
_08011B44: .4byte 0x00005051
_08011B48: .4byte gUnknown_2022984
_08011B4C: .4byte gUnknown_2022986
_08011B48: .4byte gBattle_WIN0H
_08011B4C: .4byte gBattle_WIN0V
_08011B50: .4byte gScanlineEffectRegBuffers
_08011B54: .4byte 0x0000ff10
_08011B58: .4byte gBattle_BG0_X
asm/battle_anim.s
+28 -28
View File
@@ -16,7 +16,7 @@ ClearBattleAnimationVars: @ 80724C0
strb r1, [r0]
ldr r0, _08072558 @ =gAnimScriptActive
strb r1, [r0]
ldr r0, _0807255C @ =gUnknown_2037EE2
ldr r0, _0807255C @ =gAnimVisualTaskCount
strb r1, [r0]
ldr r0, _08072560 @ =gUnknown_2037EE3
strb r1, [r0]
@@ -86,7 +86,7 @@ _08072520:
.align 2, 0
_08072554: .4byte gUnknown_2037EE0
_08072558: .4byte gAnimScriptActive
_0807255C: .4byte gUnknown_2037EE2
_0807255C: .4byte gAnimVisualTaskCount
_08072560: .4byte gUnknown_2037EE3
_08072564: .4byte gAnimDisableStructPtr
_08072568: .4byte gAnimMoveDmg
@@ -276,10 +276,10 @@ _080726EE:
movs r2, 0x80
bl m4aMPlayVolumeControl
_08072706:
ldr r0, _08072730 @ =gUnknown_2022984
ldr r0, _08072730 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _08072734 @ =gUnknown_2022986
ldr r0, _08072734 @ =gBattle_WIN0V
strh r1, [r0]
ldr r0, _08072738 @ =gUnknown_2022988
strh r1, [r0]
@@ -296,8 +296,8 @@ _08072706:
.align 2, 0
_08072728: .4byte 0x0000ffff
_0807272C: .4byte gMPlayInfo_BGM
_08072730: .4byte gUnknown_2022984
_08072734: .4byte gUnknown_2022986
_08072730: .4byte gBattle_WIN0H
_08072734: .4byte gBattle_WIN0V
_08072738: .4byte gUnknown_2022988
_0807273C: .4byte gUnknown_202298A
thumb_func_end LaunchBattleAnimation
@@ -309,7 +309,7 @@ DestroyAnimSprite: @ 8072740
bl FreeSpriteOamMatrix
adds r0, r4, 0
bl DestroySprite
ldr r1, _0807275C @ =gUnknown_2037EE2
ldr r1, _0807275C @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -317,7 +317,7 @@ DestroyAnimSprite: @ 8072740
pop {r0}
bx r0
.align 2, 0
_0807275C: .4byte gUnknown_2037EE2
_0807275C: .4byte gAnimVisualTaskCount
thumb_func_end DestroyAnimSprite
thumb_func_start DestroyAnimVisualTask
@@ -326,14 +326,14 @@ DestroyAnimVisualTask: @ 8072760
lsls r0, 24
lsrs r0, 24
bl DestroyTask
ldr r1, _08072778 @ =gUnknown_2037EE2
ldr r1, _08072778 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
pop {r0}
bx r0
.align 2, 0
_08072778: .4byte gUnknown_2037EE2
_08072778: .4byte gAnimVisualTaskCount
thumb_func_end DestroyAnimVisualTask
thumb_func_start DestroyAnimSoundTask
@@ -666,7 +666,7 @@ _080729CC:
adds r0, r7, 0
adds r1, r4, 0
bl CreateSpriteAndAnimate
ldr r1, _08072A0C @ =gUnknown_2037EE2
ldr r1, _08072A0C @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -676,7 +676,7 @@ _080729CC:
.align 2, 0
_08072A04: .4byte gBattleAnimAttacker
_08072A08: .4byte gBattleAnimTarget
_08072A0C: .4byte gUnknown_2037EE2
_08072A0C: .4byte gAnimVisualTaskCount
thumb_func_end ScriptCmd_createsprite
thumb_func_start ScriptCmd_createvisualtask
@@ -729,7 +729,7 @@ _08072A60:
lsls r0, 24
lsrs r0, 24
bl _call_via_r6
ldr r1, _08072A88 @ =gUnknown_2037EE2
ldr r1, _08072A88 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -739,7 +739,7 @@ _08072A60:
.align 2, 0
_08072A80: .4byte gUnknown_2037ED4
_08072A84: .4byte gBattleAnimArgs
_08072A88: .4byte gUnknown_2037EE2
_08072A88: .4byte gAnimVisualTaskCount
thumb_func_end ScriptCmd_createvisualtask
thumb_func_start ScriptCmd_delay
@@ -778,7 +778,7 @@ _08072AC8: .4byte WaitAnimFrameCount
thumb_func_start sub_8072ACC
sub_8072ACC: @ 8072ACC
push {lr}
ldr r0, _08072AE4 @ =gUnknown_2037EE2
ldr r0, _08072AE4 @ =gAnimVisualTaskCount
ldrb r2, [r0]
cmp r2, 0
bne _08072AF0
@@ -790,7 +790,7 @@ sub_8072ACC: @ 8072ACC
strb r2, [r0]
b _08072AF6
.align 2, 0
_08072AE4: .4byte gUnknown_2037EE2
_08072AE4: .4byte gAnimVisualTaskCount
_08072AE8: .4byte gUnknown_2037ED4
_08072AEC: .4byte gUnknown_2037EE0
_08072AF0:
@@ -821,7 +821,7 @@ sub_8072B08: @ 8072B08
push {r7}
movs r0, 0
mov r8, r0
ldr r0, _08072B38 @ =gUnknown_2037EE2
ldr r0, _08072B38 @ =gAnimVisualTaskCount
ldrb r0, [r0]
cmp r0, 0
bne _08072B30
@@ -842,7 +842,7 @@ _08072B30:
strh r0, [r1]
b _08072B62
.align 2, 0
_08072B38: .4byte gUnknown_2037EE2
_08072B38: .4byte gAnimVisualTaskCount
_08072B3C: .4byte gUnknown_2037EE3
_08072B40: .4byte gUnknown_2037F14
_08072B44: .4byte gUnknown_2037F12
@@ -2869,8 +2869,8 @@ _08073AFC:
bx r1
thumb_func_end BattleAnimAdjustPanning
thumb_func_start sub_8073B08
sub_8073B08: @ 8073B08
thumb_func_start BattleAnimAdjustPanning2
BattleAnimAdjustPanning2: @ 8073B08
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -2914,7 +2914,7 @@ _08073B56:
pop {r4}
pop {r1}
bx r1
thumb_func_end sub_8073B08
thumb_func_end BattleAnimAdjustPanning2
thumb_func_start KeepPanInRange
KeepPanInRange: @ 8073B60
@@ -3301,14 +3301,14 @@ ScriptCmd_panse_27: @ 8073E10
ldrb r7, [r1, 0x5]
movs r0, 0x2
ldrsb r0, [r1, r0]
bl sub_8073B08
bl BattleAnimAdjustPanning2
adds r6, r0, 0
lsls r6, 24
lsrs r6, 24
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
bl sub_8073B08
bl BattleAnimAdjustPanning2
adds r5, r0, 0
lsls r5, 24
lsrs r5, 24
@@ -3317,7 +3317,7 @@ ScriptCmd_panse_27: @ 8073E10
asrs r1, 24
mov r8, r1
mov r0, r8
bl sub_8073B08
bl BattleAnimAdjustPanning2
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3873,7 +3873,7 @@ ScriptCmd_invisible: @ 80742A4
ldr r4, _080742D8 @ =gUnknown_2037ED4
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3906,7 +3906,7 @@ ScriptCmd_visible: @ 80742E0
ldr r4, _08074318 @ =gUnknown_2037ED4
ldr r0, [r4]
ldrb r0, [r0, 0x1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -3976,7 +3976,7 @@ _08074370:
lsrs r4, r0, 24
movs r0, 0x1
_0807437C:
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
@@ -4058,7 +4058,7 @@ _08074418:
lsrs r4, r0, 24
movs r0, 0x1
_08074424:
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
cmp r2, 0xFF
asm/battle_anim_effects_1.s
+8 -8
View File
@@ -1505,7 +1505,7 @@ sub_80A2E64: @ 80A2E64
ands r0, r1
strb r0, [r2]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
movs r0, 0x80
lsls r0, 1
strh r0, [r4, 0x2E]
@@ -1526,7 +1526,7 @@ sub_80A2EA0: @ 80A2EA0
push {r4,lr}
adds r4, r0, 0
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
movs r1, 0x32
ldrsh r0, [r4, r1]
cmp r0, 0
@@ -1587,7 +1587,7 @@ sub_80A2F0C: @ 80A2F0C
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
ldr r1, _080A2F38 @ =gSprites
@@ -1641,7 +1641,7 @@ sub_80A2F74: @ 80A2F74
lsls r4, 24
lsrs r4, 24
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
adds r6, r0, 0
@@ -1725,7 +1725,7 @@ sub_80A3004: @ 80A3004
cmp r5, 0
bne _080A3074
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -3924,7 +3924,7 @@ _080A4100:
adds r0, r7
strh r0, [r4, 0x22]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
_080A411A:
adds r0, r6, 0
bl sub_8076884
@@ -8506,7 +8506,7 @@ sub_80A63B4: @ 80A63B4
ldr r1, _080A6444 @ =gTasks
adds r6, r0, r1
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x8]
@@ -8598,7 +8598,7 @@ _080A6488:
cmp r5, 0x1
bhi _080A649A
movs r0, 0
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
asrs r0, 16
cmp r0, 0
asm/battle_anim_effects_2.s
+30 -30
View File
@@ -2252,7 +2252,7 @@ sub_80A7FB0: @ 80A7FB0
lsls r5, 24
lsrs r5, 24
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2312,7 +2312,7 @@ sub_80A8014: @ 80A8014
cmp r1, r0
bne _080A8064
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -2350,7 +2350,7 @@ sub_80A8074: @ 80A8074
ldr r0, _080A80C0 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -2550,7 +2550,7 @@ sub_80A8200: @ 80A8200
lsrs r1, 24
mov r9, r1
movs r0, 0
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
lsrs r0, 16
mov r8, r0
@@ -2720,7 +2720,7 @@ _080A835C: .4byte gTasks
_080A8360: .4byte gBattleAnimArgs
_080A8364:
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2902,7 +2902,7 @@ sub_80A84B4: @ 80A84B4
ldr r0, _080A84E4 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3090,7 +3090,7 @@ sub_80A8638: @ 80A8638
ldr r0, _080A866C @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3146,7 +3146,7 @@ sub_80A86A4: @ 80A86A4
ldr r0, _080A8718 @ =gTasks
adds r4, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r2, 0
@@ -4565,7 +4565,7 @@ sub_80A917C: @ 80A917C
ldr r0, _080A91AC @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4668,7 +4668,7 @@ _080A9250:
_080A9256:
strh r0, [r4, 0x24]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -4861,7 +4861,7 @@ sub_80A939C: @ 80A939C
movs r0, 0x2
strh r0, [r4, 0x24]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5517,9 +5517,9 @@ sub_80A98B0: @ 80A98B0
movs r6, 0x98
_080A98C4:
movs r5, 0
ldr r1, _080A9918 @ =gUnknown_2022984
ldr r1, _080A9918 @ =gBattle_WIN0H
strh r6, [r1]
ldr r4, _080A991C @ =gUnknown_2022986
ldr r4, _080A991C @ =gBattle_WIN0V
movs r0, 0xA0
strh r0, [r4]
ldrh r1, [r1]
@@ -5553,8 +5553,8 @@ _080A98C4:
pop {r0}
bx r0
.align 2, 0
_080A9918: .4byte gUnknown_2022984
_080A991C: .4byte gUnknown_2022986
_080A9918: .4byte gBattle_WIN0H
_080A991C: .4byte gBattle_WIN0V
_080A9920: .4byte 0x00003f1f
_080A9924: .4byte 0x00003f3f
_080A9928: .4byte gTasks
@@ -5583,7 +5583,7 @@ sub_80A9930: @ 80A9930
lsls r0, r2, 16
cmp r1, r0
blt _080A9970
ldr r0, _080A9968 @ =gUnknown_2022984
ldr r0, _080A9968 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080A996C @ =sub_80A9984
@@ -5591,10 +5591,10 @@ sub_80A9930: @ 80A9930
b _080A9978
.align 2, 0
_080A9964: .4byte gTasks
_080A9968: .4byte gUnknown_2022984
_080A9968: .4byte gBattle_WIN0H
_080A996C: .4byte sub_80A9984
_080A9970:
ldr r1, _080A9980 @ =gUnknown_2022984
ldr r1, _080A9980 @ =gBattle_WIN0H
lsls r0, r4, 8
orrs r2, r0
strh r2, [r1]
@@ -5603,7 +5603,7 @@ _080A9978:
pop {r0}
bx r0
.align 2, 0
_080A9980: .4byte gUnknown_2022984
_080A9980: .4byte gBattle_WIN0H
thumb_func_end sub_80A9930
thumb_func_start sub_80A9984
@@ -5649,9 +5649,9 @@ _080A99D4: .4byte 0x00007fff
_080A99D8:
cmp r0, 0x4
ble _080A9A0C
ldr r0, _080A9A14 @ =gUnknown_2022984
ldr r0, _080A9A14 @ =gBattle_WIN0H
strh r4, [r0]
ldr r0, _080A9A18 @ =gUnknown_2022986
ldr r0, _080A9A18 @ =gBattle_WIN0V
strh r4, [r0]
ldr r4, _080A9A1C @ =0x00003f3f
movs r0, 0x48
@@ -5674,8 +5674,8 @@ _080A9A0C:
pop {r0}
bx r0
.align 2, 0
_080A9A14: .4byte gUnknown_2022984
_080A9A18: .4byte gUnknown_2022986
_080A9A14: .4byte gBattle_WIN0H
_080A9A18: .4byte gBattle_WIN0V
_080A9A1C: .4byte 0x00003f3f
thumb_func_end sub_80A9984
@@ -5686,7 +5686,7 @@ sub_80A9A20: @ 80A9A20
lsrs r0, 24
adds r6, r0, 0
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A9A70 @ =gTasks
@@ -5702,7 +5702,7 @@ sub_80A9A20: @ 80A9A20
cmp r0, 0x1
bne _080A9A7C
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -5755,7 +5755,7 @@ sub_80A9AB0: @ 80A9AB0
lsrs r0, 24
adds r6, r0, 0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r4, r0, 24
ldr r1, _080A9B00 @ =gTasks
@@ -5771,7 +5771,7 @@ sub_80A9AB0: @ 80A9AB0
cmp r0, 0x1
bne _080A9B0C
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -6088,7 +6088,7 @@ _080A9D2A:
ldr r1, _080A9DB0 @ =gFile_graphics_battle_anims_backgrounds_attract_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080A9DB4 @ =gFile_graphics_battle_anims_backgrounds_attract_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -6376,7 +6376,7 @@ _080A9FC6:
ldr r1, _080AA014 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080AA018 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -7428,7 +7428,7 @@ sub_80AA7C8: @ 80AA7C8
lsrs r5, 24
ldr r0, _080AA7FC @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/battle_anim_effects_3.s
+49 -49
View File
@@ -572,7 +572,7 @@ sub_80DE6F0: @ 80DE6F0
adds r1, r2
ldr r0, _080DE710 @ =sub_80DE718
str r0, [r1]
ldr r1, _080DE714 @ =gUnknown_2037EE2
ldr r1, _080DE714 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -580,7 +580,7 @@ sub_80DE6F0: @ 80DE6F0
.align 2, 0
_080DE70C: .4byte gTasks
_080DE710: .4byte sub_80DE718
_080DE714: .4byte gUnknown_2037EE2
_080DE714: .4byte gAnimVisualTaskCount
thumb_func_end sub_80DE6F0
thumb_func_start sub_80DE718
@@ -674,7 +674,7 @@ sub_80DE7B4: @ 80DE7B4
adds r1, r2
ldr r0, _080DE7D4 @ =sub_80DE7DC
str r0, [r1]
ldr r1, _080DE7D8 @ =gUnknown_2037EE2
ldr r1, _080DE7D8 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -682,7 +682,7 @@ sub_80DE7B4: @ 80DE7B4
.align 2, 0
_080DE7D0: .4byte gTasks
_080DE7D4: .4byte sub_80DE7DC
_080DE7D8: .4byte gUnknown_2037EE2
_080DE7D8: .4byte gAnimVisualTaskCount
thumb_func_end sub_80DE7B4
thumb_func_start sub_80DE7DC
@@ -1127,10 +1127,10 @@ sub_80DEB20: @ 80DEB20
lsls r1, 8
movs r0, 0
bl SetGpuRegBits
ldr r0, _080DEB80 @ =gUnknown_2022984
ldr r0, _080DEB80 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r4, _080DEB84 @ =gUnknown_2022986
ldr r4, _080DEB84 @ =gBattle_WIN0V
strh r1, [r4]
movs r0, 0x40
movs r1, 0
@@ -1161,8 +1161,8 @@ sub_80DEB20: @ 80DEB20
bx r0
.align 2, 0
_080DEB7C: .4byte 0x00001f3f
_080DEB80: .4byte gUnknown_2022984
_080DEB84: .4byte gUnknown_2022986
_080DEB80: .4byte gBattle_WIN0H
_080DEB84: .4byte gBattle_WIN0V
_080DEB88: .4byte sub_80DEB8C
thumb_func_end sub_80DEB20
@@ -1488,11 +1488,11 @@ sub_80DEDD8: @ 80DEDD8
ldr r1, _080DEE20 @ =gUnknown_202298A
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080DEE24 @ =gUnknown_2022984
ldr r0, _080DEE24 @ =gBattle_WIN0H
ldrh r1, [r0]
movs r0, 0x42
bl SetGpuReg
ldr r0, _080DEE28 @ =gUnknown_2022986
ldr r0, _080DEE28 @ =gBattle_WIN0V
ldrh r1, [r0]
movs r0, 0x46
bl SetGpuReg
@@ -1502,8 +1502,8 @@ _080DEE14: .4byte 0x00001f3f
_080DEE18: .4byte gUnknown_2022988
_080DEE1C: .4byte 0x000098f0
_080DEE20: .4byte gUnknown_202298A
_080DEE24: .4byte gUnknown_2022984
_080DEE28: .4byte gUnknown_2022986
_080DEE24: .4byte gBattle_WIN0H
_080DEE28: .4byte gBattle_WIN0V
_080DEE2C:
ldr r1, _080DEE68 @ =0x00001f3f
movs r0, 0x48
@@ -2021,7 +2021,7 @@ sub_80DF1DC: @ 80DF1DC
strh r0, [r4, 0x12]
strh r5, [r4, 0x14]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -2437,7 +2437,7 @@ sub_80DF524: @ 80DF524
_080DF544: .4byte gTasks
_080DF548:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2469,7 +2469,7 @@ sub_80DF580: @ 80DF580
push {r4-r6,lr}
adds r5, r0, 0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r6, r0, 24
movs r1, 0x2E
@@ -2857,7 +2857,7 @@ sub_80DF848: @ 80DF848
cmp r0, 0
bne _080DF888
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -2901,7 +2901,7 @@ sub_80DF8A0: @ 80DF8A0
cmp r0, 0
bne _080DF8E0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3002,7 +3002,7 @@ sub_80DF964: @ 80DF964
cmp r0, 0
bne _080DF9A4
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -3417,7 +3417,7 @@ _080DFCCE:
ldr r1, _080DFD20 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080DFD24 @ =gFile_graphics_battle_anims_masks_morning_sun_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -4059,7 +4059,7 @@ _080E01FC:
ldr r1, _080E0254 @ =gFile_graphics_battle_anims_masks_morning_sun_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080E0258 @ =gFile_graphics_battle_anims_masks_morning_sun_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -4371,7 +4371,7 @@ sub_80E0488: @ 80E0488
cmp r0, 0
bne _080E04C8
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -4523,7 +4523,7 @@ _080E059C:
subs r0, 0x1
strh r0, [r4, 0x14]
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -4874,7 +4874,7 @@ sub_80E0850: @ 80E0850
strh r0, [r4, 0x24]
ldr r0, _080E089C @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -5237,7 +5237,7 @@ _080E0B3E:
strh r0, [r2, 0x1E]
mov r1, r8
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
ldr r1, _080E0B7C @ =gTasks
@@ -5535,10 +5535,10 @@ sub_80E0D74: @ 80E0D74
lsls r1, 8
movs r0, 0
bl SetGpuRegBits
ldr r0, _080E0DDC @ =gUnknown_2022984
ldr r0, _080E0DDC @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r4, _080E0DE0 @ =gUnknown_2022986
ldr r4, _080E0DE0 @ =gBattle_WIN0V
strh r1, [r4]
movs r0, 0x40
movs r1, 0
@@ -5572,8 +5572,8 @@ sub_80E0D74: @ 80E0D74
bx r0
.align 2, 0
_080E0DD8: .4byte 0x00001f3f
_080E0DDC: .4byte gUnknown_2022984
_080E0DE0: .4byte gUnknown_2022986
_080E0DDC: .4byte gBattle_WIN0H
_080E0DE0: .4byte gBattle_WIN0V
_080E0DE4: .4byte gBattleAnimArgs
_080E0DE8: .4byte sub_80E0DEC
thumb_func_end sub_80E0D74
@@ -5825,7 +5825,7 @@ sub_80E0FB8: @ 80E0FB8
lsrs r0, 24
str r0, [sp, 0x18]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r0, _080E1040 @ =gBattleAnimAttacker
ldrb r0, [r0]
bl GetBattlerSide
@@ -6276,7 +6276,7 @@ _080E136C:
strh r0, [r4, 0x24]
ldr r0, _080E13A8 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -6743,7 +6743,7 @@ sub_80E1704: @ 80E1704
strh r0, [r4, 0x8]
ldr r0, _080E1740 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7218,7 +7218,7 @@ _080E1AAA:
bgt _080E1ACA
adds r0, r5, 0
bl DestroyTask
ldr r1, _080E1AD4 @ =gUnknown_2037EE2
ldr r1, _080E1AD4 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -7229,7 +7229,7 @@ _080E1ACA:
pop {r0}
bx r0
.align 2, 0
_080E1AD4: .4byte gUnknown_2037EE2
_080E1AD4: .4byte gAnimVisualTaskCount
thumb_func_end sub_80E1990
thumb_func_start sub_80E1AD8
@@ -7619,7 +7619,7 @@ _080E1DA2:
strh r0, [r5, 0x14]
ldr r0, _080E1DF4 @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -7892,7 +7892,7 @@ sub_80E1FC4: @ 80E1FC4
ldrh r0, [r1, 0x2]
strh r0, [r4, 0xA]
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080E2014 @ =gSprites
@@ -9091,7 +9091,7 @@ _080E28F8:
ldrh r0, [r2, 0x2]
strh r0, [r4, 0x8]
ldrb r0, [r2]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -9613,7 +9613,7 @@ sub_80E2CE4: @ 80E2CE4
ldr r0, _080E2D34 @ =gTasks
adds r6, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
@@ -10360,7 +10360,7 @@ sub_80E3294: @ 80E3294
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r5, r0, 24
adds r2, r5, 0
@@ -10471,7 +10471,7 @@ sub_80E3374: @ 80E3374
lsls r0, 24
lsrs r6, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
ldr r1, _080E33A0 @ =gTasks
@@ -10856,7 +10856,7 @@ sub_80E3664: @ 80E3664
lsls r0, 24
lsrs r7, r0, 24
movs r0, 0x1
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
lsrs r1, r0, 16
str r1, [sp]
@@ -10864,7 +10864,7 @@ sub_80E3664: @ 80E3664
cmp r6, 0
blt _080E36A6
movs r0, 0x1
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
lsrs r1, r0, 16
mov r9, r1
@@ -11251,7 +11251,7 @@ _080E3964:
.4byte _080E3D90
_080E3978:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E39C4 @ =gTasks
@@ -11392,7 +11392,7 @@ _080E3AA0:
ldrh r5, [r1, 0x2]
_080E3AA2:
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080E3AC8 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11460,7 +11460,7 @@ _080E3B30:
ldrh r5, [r1, 0x2]
_080E3B32:
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080E3BD0 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -11682,7 +11682,7 @@ _080E3D04: .4byte 0x0000ffff
_080E3D08: .4byte gTasks
_080E3D0C:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E3D58 @ =gTasks
@@ -11746,7 +11746,7 @@ _080E3D82:
_080E3D8C: .4byte gTasks
_080E3D90:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r7, r0, 24
ldr r1, _080E3E04 @ =gTasks
@@ -11917,7 +11917,7 @@ _080E3E96:
cmp r0, 0x1
bne _080E3FB8
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080E3F24 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -12235,7 +12235,7 @@ sub_80E4160: @ 80E4160
ldr r0, _080E41C8 @ =gTasks
adds r4, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -12757,7 +12757,7 @@ sub_80E4540: @ 80E4540
strh r0, [r4, 0x8]
ldr r0, _080E457C @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
asm/battle_anim_mons.s
+13 -13
View File
@@ -703,8 +703,8 @@ _080749CC:
bx r1
thumb_func_end sub_807492C
thumb_func_start GetAnimBankSpriteId
GetAnimBankSpriteId: @ 80749D4
thumb_func_start GetAnimBattlerSpriteId
GetAnimBattlerSpriteId: @ 80749D4
push {r4,r5,lr}
lsls r0, 24
lsrs r0, 24
@@ -779,7 +779,7 @@ _08074A5E:
bx r1
.align 2, 0
_08074A64: .4byte gBattlerSpriteIds
thumb_func_end GetAnimBankSpriteId
thumb_func_end GetAnimBattlerSpriteId
thumb_func_start StoreSpriteCallbackInData6
StoreSpriteCallbackInData6: @ 8074A68
@@ -2091,8 +2091,8 @@ sub_8075358: @ 8075358
_080753B0: .4byte 0x05000800
thumb_func_end sub_8075358
thumb_func_start sub_80753B4
sub_80753B4: @ 80753B4
thumb_func_start AnimLoadCompressedBgGfx
AnimLoadCompressedBgGfx: @ 80753B4
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -2129,7 +2129,7 @@ sub_80753B4: @ 80753B4
.align 2, 0
_080753FC: .4byte gUnknown_2022BB8
_08075400: .4byte 0x05000800
thumb_func_end sub_80753B4
thumb_func_end AnimLoadCompressedBgGfx
thumb_func_start sub_8075404
sub_8075404: @ 8075404
@@ -3717,12 +3717,12 @@ _08075FB4: .4byte StartAnimLinearTranslation
_08075FB8: .4byte DestroyAnimSprite
thumb_func_end sub_8075F0C
thumb_func_start duplicate_obj_of_side_rel2move_in_transparent_mode
duplicate_obj_of_side_rel2move_in_transparent_mode: @ 8075FBC
thumb_func_start CloneBattlerSpriteWithBlend
CloneBattlerSpriteWithBlend: @ 8075FBC
push {r4-r6,lr}
lsls r0, 24
lsrs r0, 24
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r1, r0, 24
cmp r1, 0xFF
@@ -3778,7 +3778,7 @@ _0807602A:
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end duplicate_obj_of_side_rel2move_in_transparent_mode
thumb_func_end CloneBattlerSpriteWithBlend
thumb_func_start obj_delete_but_dont_free_vram
obj_delete_but_dont_free_vram: @ 8076030
@@ -3954,7 +3954,7 @@ sub_807616C: @ 807616C
lsrs r4, r0, 24
ldr r0, _0807618C @ =gBattleAnimArgs
ldrb r0, [r0]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r3, r0, 24
cmp r3, 0xFF
@@ -5894,7 +5894,7 @@ sub_8077030: @ 8077030
ldr r0, _080770C4 @ =gTasks
adds r5, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
@@ -6107,7 +6107,7 @@ sub_80771E4: @ 80771E4
lsrs r1, 24
mov r8, r1
movs r0, 0
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
lsrs r7, r0, 16
asrs r0, 16
asm/battle_anim_special.s
+9 -9
View File
@@ -18,10 +18,10 @@ sub_80EEC0C: @ 80EEC0C
str r0, [sp, 0x10]
ldr r0, _080EEDB4 @ =gBattleAnimAttacker
ldrb r4, [r0]
ldr r0, _080EEDB8 @ =gUnknown_2022984
ldr r0, _080EEDB8 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080EEDBC @ =gUnknown_2022986
ldr r0, _080EEDBC @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _080EEDC0 @ =0x00003f3f
movs r0, 0x48
@@ -161,7 +161,7 @@ sub_80EEC0C: @ 80EEC0C
ldr r1, _080EEDDC @ =gFile_graphics_battle_anims_masks_unknown_D2EC24_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080EEDE0 @ =gFile_graphics_battle_anims_masks_cure_bubbles_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -204,8 +204,8 @@ sub_80EEC0C: @ 80EEC0C
bx r0
.align 2, 0
_080EEDB4: .4byte gBattleAnimAttacker
_080EEDB8: .4byte gUnknown_2022984
_080EEDBC: .4byte gUnknown_2022986
_080EEDB8: .4byte gBattle_WIN0H
_080EEDBC: .4byte gBattle_WIN0V
_080EEDC0: .4byte 0x00003f3f
_080EEDC4: .4byte 0x00003f3d
_080EEDC8: .4byte 0x00003f42
@@ -336,9 +336,9 @@ _080EEE9C:
bne _080EEFA8
movs r0, 0
bl sub_8073128
ldr r0, _080EEFB4 @ =gUnknown_2022984
ldr r0, _080EEFB4 @ =gBattle_WIN0H
strh r4, [r0]
ldr r0, _080EEFB8 @ =gUnknown_2022986
ldr r0, _080EEFB8 @ =gBattle_WIN0V
strh r4, [r0]
ldr r4, _080EEFBC @ =0x00003f3f
movs r0, 0x48
@@ -439,8 +439,8 @@ _080EEFA8:
pop {r0}
bx r0
.align 2, 0
_080EEFB4: .4byte gUnknown_2022984
_080EEFB8: .4byte gUnknown_2022986
_080EEFB4: .4byte gBattle_WIN0H
_080EEFB8: .4byte gBattle_WIN0V
_080EEFBC: .4byte 0x00003f3f
_080EEFC0: .4byte gSprites
_080EEFC4: .4byte gHealthboxSpriteIds
asm/battle_anim_utility_funcs.s
-5133
View File
File diff suppressed because it is too large Load Diff
asm/battle_intro.s
+1869
View File
File diff suppressed because it is too large Load Diff
asm/dark.s
+33 -33
View File
@@ -788,13 +788,13 @@ _080B7ED4:
ldr r1, _080B7F48 @ =0x00003f3f
movs r0, 0x48
bl SetGpuReg
ldr r2, _080B7F4C @ =gUnknown_2022984
ldr r2, _080B7F4C @ =gBattle_WIN0H
ldrh r0, [r5, 0x24]
lsls r0, 8
ldrh r1, [r5, 0x26]
orrs r0, r1
strh r0, [r2]
ldr r1, _080B7F50 @ =gUnknown_2022986
ldr r1, _080B7F50 @ =gBattle_WIN0V
movs r0, 0xA0
strh r0, [r1]
ldr r0, _080B7F54 @ =sub_80B7F58
@@ -811,8 +811,8 @@ _080B7F3C: .4byte gBattle_BG1_X
_080B7F40: .4byte 0xa2600001
_080B7F44: .4byte gScanlineEffectRegBuffers
_080B7F48: .4byte 0x00003f3f
_080B7F4C: .4byte gUnknown_2022984
_080B7F50: .4byte gUnknown_2022986
_080B7F4C: .4byte gBattle_WIN0H
_080B7F50: .4byte gBattle_WIN0V
_080B7F54: .4byte sub_80B7F58
thumb_func_end sub_80B7DA4
@@ -929,7 +929,7 @@ _080B8014:
blt _080B8036
strh r2, [r4, 0x24]
_080B8036:
ldr r3, _080B804C @ =gUnknown_2022984
ldr r3, _080B804C @ =gBattle_WIN0H
ldrh r2, [r4, 0x24]
lsls r0, r2, 8
ldrh r1, [r4, 0x26]
@@ -941,7 +941,7 @@ _080B8036:
bne _080B806A
b _080B8056
.align 2, 0
_080B804C: .4byte gUnknown_2022984
_080B804C: .4byte gBattle_WIN0H
_080B8050:
ldr r1, _080B8060 @ =gScanlineEffect
movs r0, 0x3
@@ -1000,10 +1000,10 @@ _080B80B4:
lsrs r0, 24
cmp r0, 0x1
bne _080B80F0
ldr r0, _080B80E4 @ =gUnknown_2022984
ldr r0, _080B80E4 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080B80E8 @ =gUnknown_2022986
ldr r0, _080B80E8 @ =gBattle_WIN0V
strh r1, [r0]
ldr r4, _080B80EC @ =0x00003f3f
movs r0, 0x48
@@ -1016,8 +1016,8 @@ _080B80B4:
bl DestroyAnimVisualTask
b _080B829E
.align 2, 0
_080B80E4: .4byte gUnknown_2022984
_080B80E8: .4byte gUnknown_2022986
_080B80E4: .4byte gBattle_WIN0H
_080B80E8: .4byte gBattle_WIN0V
_080B80EC: .4byte 0x00003f3f
_080B80F0:
ldr r0, _080B8110 @ =gBattleAnimTarget
@@ -1208,13 +1208,13 @@ _080B8270:
ldr r1, _080B82AC @ =0x00003f3f
movs r0, 0x48
bl SetGpuReg
ldr r2, _080B82B0 @ =gUnknown_2022984
ldr r2, _080B82B0 @ =gBattle_WIN0H
ldrh r0, [r5, 0x24]
lsls r0, 8
ldrh r1, [r5, 0x26]
orrs r0, r1
strh r0, [r2]
ldr r1, _080B82B4 @ =gUnknown_2022986
ldr r1, _080B82B4 @ =gBattle_WIN0V
movs r0, 0xA0
strh r0, [r1]
movs r0, 0
@@ -1234,8 +1234,8 @@ _080B829E:
.align 2, 0
_080B82A8: .4byte 0x00003f3b
_080B82AC: .4byte 0x00003f3f
_080B82B0: .4byte gUnknown_2022984
_080B82B4: .4byte gUnknown_2022986
_080B82B0: .4byte gBattle_WIN0H
_080B82B4: .4byte gBattle_WIN0V
_080B82B8: .4byte 0x0000080c
_080B82BC: .4byte sub_80B82C0
thumb_func_end sub_80B8070
@@ -1314,7 +1314,7 @@ _080B8348:
movs r0, 0x1
strh r0, [r4, 0xA]
_080B834C:
ldr r2, _080B8390 @ =gUnknown_2022984
ldr r2, _080B8390 @ =gBattle_WIN0H
ldrh r0, [r4, 0x24]
lsls r0, 8
ldrh r1, [r4, 0x26]
@@ -1348,7 +1348,7 @@ _080B836E:
strh r0, [r4, 0xA]
b _080B83FC
.align 2, 0
_080B8390: .4byte gUnknown_2022984
_080B8390: .4byte gBattle_WIN0H
_080B8394:
ldrh r0, [r4, 0xA]
adds r0, 0x1
@@ -1412,10 +1412,10 @@ _080B83FC:
.align 2, 0
_080B8404: .4byte gScanlineEffect
_080B8408:
ldr r0, _080B8430 @ =gUnknown_2022984
ldr r0, _080B8430 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080B8434 @ =gUnknown_2022986
ldr r0, _080B8434 @ =gBattle_WIN0V
strh r1, [r0]
ldr r4, _080B8438 @ =0x00003f3f
movs r0, 0x48
@@ -1431,8 +1431,8 @@ _080B842A:
pop {r0}
bx r0
.align 2, 0
_080B8430: .4byte gUnknown_2022984
_080B8434: .4byte gUnknown_2022986
_080B8430: .4byte gBattle_WIN0H
_080B8434: .4byte gBattle_WIN0V
_080B8438: .4byte 0x00003f3f
thumb_func_end sub_80B82C0
@@ -1615,7 +1615,7 @@ sub_80B856C: @ 80B856C
_080B8582:
lsls r0, r4, 24
lsrs r0, 24
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
cmp r0, 0xFF
@@ -1799,9 +1799,9 @@ sub_80B86EC: @ 80B86EC
lsls r0, 24
lsrs r7, r0, 24
movs r6, 0
ldr r0, _080B87EC @ =gUnknown_2022984
ldr r0, _080B87EC @ =gBattle_WIN0H
strh r6, [r0]
ldr r0, _080B87F0 @ =gUnknown_2022986
ldr r0, _080B87F0 @ =gBattle_WIN0V
strh r6, [r0]
ldr r1, _080B87F4 @ =0x00003f3f
movs r0, 0x48
@@ -1909,8 +1909,8 @@ _080B87CA:
ldr r1, _080B8814 @ =gEnemyParty
b _080B8828
.align 2, 0
_080B87EC: .4byte gUnknown_2022984
_080B87F0: .4byte gUnknown_2022986
_080B87EC: .4byte gBattle_WIN0H
_080B87F0: .4byte gBattle_WIN0V
_080B87F4: .4byte 0x00003f3f
_080B87F8: .4byte 0x00003f3d
_080B87FC: .4byte 0x00003f42
@@ -1936,7 +1936,7 @@ _080B8828:
lsls r0, 16
lsrs r5, r0, 16
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -1958,7 +1958,7 @@ _080B8828:
ldr r1, _080B88C8 @ =gFile_graphics_battle_anims_masks_metal_shine_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080B88CC @ =gFile_graphics_battle_anims_masks_metal_shine_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -2075,7 +2075,7 @@ _080B894E:
cmp r0, 0x2
bne _080B89FC
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r5, _080B89F0 @ =gSprites
@@ -2144,9 +2144,9 @@ _080B89F8: .4byte gBattleAnimAttacker
_080B89FC:
cmp r0, 0x3
bne _080B8A5E
ldr r0, _080B8A68 @ =gUnknown_2022984
ldr r0, _080B8A68 @ =gBattle_WIN0H
strh r5, [r0]
ldr r0, _080B8A6C @ =gUnknown_2022986
ldr r0, _080B8A6C @ =gBattle_WIN0V
strh r5, [r0]
ldr r4, _080B8A70 @ =0x00003f3f
movs r0, 0x48
@@ -2189,8 +2189,8 @@ _080B8A5E:
pop {r0}
bx r0
.align 2, 0
_080B8A68: .4byte gUnknown_2022984
_080B8A6C: .4byte gUnknown_2022986
_080B8A68: .4byte gBattle_WIN0H
_080B8A6C: .4byte gBattle_WIN0V
_080B8A70: .4byte 0x00003f3f
thumb_func_end sub_80B8920
@@ -2226,7 +2226,7 @@ _080B8A9C:
.4byte _080B8AD4
_080B8ABC:
ldrb r0, [r2]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r2, r0, 24
b _080B8ADA
asm/electric.s
+4 -4
View File
@@ -1142,7 +1142,7 @@ sub_80AE470: @ 80AE470
ands r0, r5
orrs r0, r1
strh r0, [r6, 0x4]
ldr r1, _080AE4EC @ =gUnknown_2037EE2
ldr r1, _080AE4EC @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -1160,7 +1160,7 @@ _080AE4DC: .4byte gUnknown_83E60B8
_080AE4E0: .4byte gSprites
_080AE4E4: .4byte 0x000003ff
_080AE4E8: .4byte 0xfffffc00
_080AE4EC: .4byte gUnknown_2037EE2
_080AE4EC: .4byte gAnimVisualTaskCount
_080AE4F0: .4byte sub_80AE4F4
thumb_func_end sub_80AE470
@@ -1559,7 +1559,7 @@ sub_80AE7DC: @ 80AE7DC
lsrs r0, 24
strh r0, [r5, 0x22]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x3A]
@@ -1672,7 +1672,7 @@ _080AE8D2:
b _080AEA04
_080AE8D4:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r6, 0
asm/fire.s
+3 -3
View File
@@ -753,7 +753,7 @@ sub_80ACEA4: @ 80ACEA4
ldr r0, _080ACF04 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r5, 0
@@ -2005,12 +2005,12 @@ _080AD826:
adds r0, 0x1
strh r0, [r4, 0x22]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
movs r0, 0x3
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
asm/flying.s
+11 -11
View File
@@ -408,7 +408,7 @@ sub_80B1BB0: @ 80B1BB0
ldr r0, _080B1BF0 @ =sub_80B1BF8
str r0, [r4, 0x1C]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B1BF4 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -571,7 +571,7 @@ _080B1CE8:
ble _080B1D30
_080B1D0A:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B1D38 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -624,7 +624,7 @@ sub_80B1D3C: @ 80B1D3C
_080B1D6E:
adds r0, r4, 0
bl DestroySprite
ldr r1, _080B1D84 @ =gUnknown_2037EE2
ldr r1, _080B1D84 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -633,7 +633,7 @@ _080B1D7C:
pop {r0}
bx r0
.align 2, 0
_080B1D84: .4byte gUnknown_2037EE2
_080B1D84: .4byte gAnimVisualTaskCount
thumb_func_end sub_80B1D3C
thumb_func_start sub_80B1D88
@@ -2101,7 +2101,7 @@ sub_80B2868: @ 80B2868
ands r0, r1
cmp r0, 0
bne _080B28E2
ldr r1, _080B2904 @ =gUnknown_2037EE2
ldr r1, _080B2904 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -2159,7 +2159,7 @@ _080B28F6:
bx r0
.align 2, 0
_080B2900: .4byte gTasks
_080B2904: .4byte gUnknown_2037EE2
_080B2904: .4byte gAnimVisualTaskCount
_080B2908: .4byte gBattleAnimArgs
_080B290C: .4byte gUnknown_83E7C98
_080B2910: .4byte gBattleAnimTarget
@@ -2181,7 +2181,7 @@ _080B2926:
movs r1, 0x1
bl sub_8075160
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B2954 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2273,7 +2273,7 @@ _080B29C0:
cmp r0, r1
bge _080B29FE
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B2A04 @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2311,7 +2311,7 @@ sub_80B2A08: @ 80B2A08
ldr r0, _080B2A48 @ =sub_80B2A50
str r0, [r4, 0x1C]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B2A4C @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2900,7 +2900,7 @@ sub_80B2E64: @ 80B2E64
cmp r0, 0
bne _080B2E9C
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B2E98 @ =gSprites
@@ -2918,7 +2918,7 @@ _080B2E94: .4byte gBattleAnimArgs
_080B2E98: .4byte gSprites
_080B2E9C:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B2EC8 @ =gSprites
asm/ghost.s
+28 -28
View File
@@ -352,7 +352,7 @@ sub_80B54E8: @ 80B54E8
movs r0, 0x52
bl SetGpuReg
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
@@ -470,7 +470,7 @@ sub_80B55C8: @ 80B55C8
_080B55EC: .4byte gTasks
_080B55F0:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r1, r0, 24
ldrh r0, [r4, 0x8]
@@ -841,7 +841,7 @@ sub_80B58AC: @ 80B58AC
ldr r1, _080B58D8 @ =gTasks
adds r5, r0, r1
movs r0, 0x1
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
movs r6, 0
movs r1, 0
strh r0, [r5, 0x8]
@@ -1159,7 +1159,7 @@ _080B5B2C:
cmp r0, 0xF
beq _080B5B5A
movs r0, 0x1
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
strh r0, [r5, 0x8]
lsls r0, 16
cmp r0, 0
@@ -1238,7 +1238,7 @@ _080B5B68:
movs r0, 0x10
strh r0, [r5, 0xE]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r5, 0x22]
@@ -1516,7 +1516,7 @@ _080B5E0A:
movs r0, 0x3
strb r0, [r1, 0x15]
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x24]
@@ -2230,10 +2230,10 @@ sub_80B63B4: @ 80B63B4
push {r4-r7,lr}
lsls r0, 24
lsrs r7, r0, 24
ldr r0, _080B6400 @ =gUnknown_2022984
ldr r0, _080B6400 @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080B6404 @ =gUnknown_2022986
ldr r0, _080B6404 @ =gBattle_WIN0V
strh r1, [r0]
ldr r1, _080B6408 @ =0x00003f3f
movs r0, 0x48
@@ -2261,21 +2261,21 @@ _080B63FC:
movs r6, 0x28
b _080B6416
.align 2, 0
_080B6400: .4byte gUnknown_2022984
_080B6404: .4byte gUnknown_2022986
_080B6400: .4byte gBattle_WIN0H
_080B6404: .4byte gBattle_WIN0V
_080B6408: .4byte 0x00003f3f
_080B640C: .4byte 0x00003f1f
_080B6410: .4byte gBattleAnimAttacker
_080B6414:
movs r6, 0xC8
_080B6416:
ldr r1, _080B6454 @ =gUnknown_2022984
ldr r1, _080B6454 @ =gBattle_WIN0H
lsls r3, r6, 16
asrs r2, r3, 16
lsls r0, r2, 8
orrs r0, r2
strh r0, [r1]
ldr r1, _080B6458 @ =gUnknown_2022986
ldr r1, _080B6458 @ =gBattle_WIN0V
movs r5, 0x28
ldr r0, _080B645C @ =0x00002828
strh r0, [r1]
@@ -2300,8 +2300,8 @@ _080B6416:
pop {r0}
bx r0
.align 2, 0
_080B6454: .4byte gUnknown_2022984
_080B6458: .4byte gUnknown_2022986
_080B6454: .4byte gBattle_WIN0H
_080B6458: .4byte gBattle_WIN0V
_080B645C: .4byte 0x00002828
_080B6460: .4byte gTasks
_080B6464: .4byte sub_80B6468
@@ -2457,12 +2457,12 @@ _080B6594:
ldr r0, _080B65E4 @ =sub_80B65F0
str r0, [r4]
_080B65C2:
ldr r1, _080B65E8 @ =gUnknown_2022984
ldr r1, _080B65E8 @ =gBattle_WIN0H
mov r2, r9
lsls r0, r2, 8
orrs r7, r0
strh r7, [r1]
ldr r1, _080B65EC @ =gUnknown_2022986
ldr r1, _080B65EC @ =gBattle_WIN0V
lsls r0, r6, 8
orrs r5, r0
strh r5, [r1]
@@ -2476,8 +2476,8 @@ _080B65C2:
bx r0
.align 2, 0
_080B65E4: .4byte sub_80B65F0
_080B65E8: .4byte gUnknown_2022984
_080B65EC: .4byte gUnknown_2022986
_080B65E8: .4byte gBattle_WIN0H
_080B65EC: .4byte gBattle_WIN0V
thumb_func_end sub_80B6468
thumb_func_start sub_80B65F0
@@ -2493,9 +2493,9 @@ sub_80B65F0: @ 80B65F0
lsrs r1, r0, 24
cmp r1, 0
bne _080B6636
ldr r0, _080B6640 @ =gUnknown_2022984
ldr r0, _080B6640 @ =gBattle_WIN0H
strh r1, [r0]
ldr r0, _080B6644 @ =gUnknown_2022986
ldr r0, _080B6644 @ =gBattle_WIN0V
strh r1, [r0]
ldr r4, _080B6648 @ =0x00003f3f
movs r0, 0x48
@@ -2518,8 +2518,8 @@ _080B6636:
bx r0
.align 2, 0
_080B663C: .4byte gPaletteFade
_080B6640: .4byte gUnknown_2022984
_080B6644: .4byte gUnknown_2022986
_080B6640: .4byte gBattle_WIN0H
_080B6644: .4byte gBattle_WIN0V
_080B6648: .4byte 0x00003f3f
thumb_func_end sub_80B65F0
@@ -2711,10 +2711,10 @@ sub_80B67A0: @ 80B67A0
movs r0, 0x52
movs r1, 0
bl SetGpuReg
ldr r0, _080B67CC @ =gUnknown_2022984
ldr r0, _080B67CC @ =gBattle_WIN0H
movs r1, 0
strh r1, [r0]
ldr r0, _080B67D0 @ =gUnknown_2022986
ldr r0, _080B67D0 @ =gBattle_WIN0V
strh r1, [r0]
adds r0, r4, 0
bl DestroyAnimSprite
@@ -2722,8 +2722,8 @@ sub_80B67A0: @ 80B67A0
pop {r0}
bx r0
.align 2, 0
_080B67CC: .4byte gUnknown_2022984
_080B67D0: .4byte gUnknown_2022986
_080B67CC: .4byte gBattle_WIN0H
_080B67D0: .4byte gBattle_WIN0V
thumb_func_end sub_80B67A0
thumb_func_start sub_80B67D4
@@ -3315,7 +3315,7 @@ _080B6C44:
movs r0, 0x10
strh r0, [r6, 0xE]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x10]
@@ -3437,7 +3437,7 @@ _080B6D28:
ldr r1, _080B6D84 @ =gFile_graphics_battle_anims_backgrounds_scary_face_sheet
add r2, sp, 0xC
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080B6D88 @ =gFile_graphics_battle_anims_backgrounds_scary_face_palette
add r1, sp, 0xC
ldrb r1, [r1, 0x8]
asm/ground.s
+5 -5
View File
@@ -473,7 +473,7 @@ _080B8F00:
.4byte _080B9064
_080B8F14:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -668,7 +668,7 @@ sub_80B908C: @ 80B908C
lsls r0, 24
lsrs r5, r0, 24
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
ldr r2, _080B90CC @ =gSprites
@@ -766,7 +766,7 @@ sub_80B912C: @ 80B912C
_080B914C: .4byte gTasks
_080B9150:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -846,7 +846,7 @@ _080B91DC:
.4byte _080B92AC
_080B91F0:
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1C]
@@ -1286,7 +1286,7 @@ _080B9548:
_080B9554: .4byte gBattlerSpriteIds
_080B9558:
ldrb r0, [r6]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x1A]
asm/ice.s
+3 -3
View File
@@ -2015,7 +2015,7 @@ _080B0008:
cmp r0, 0
bne _080B0064
movs r0, 0x1
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
ldr r2, _080B00CC @ =gSprites
lsls r0, 24
lsrs r0, 24
@@ -2420,7 +2420,7 @@ _080B0344:
_080B0372:
adds r0, r4, 0
bl DestroySprite
ldr r1, _080B0388 @ =gUnknown_2037EE2
ldr r1, _080B0388 @ =gAnimVisualTaskCount
ldrb r0, [r1]
subs r0, 0x1
strb r0, [r1]
@@ -2429,7 +2429,7 @@ _080B0380:
pop {r0}
bx r0
.align 2, 0
_080B0388: .4byte gUnknown_2037EE2
_080B0388: .4byte gAnimVisualTaskCount
thumb_func_end sub_80B0148
thumb_func_start sub_80B038C
asm/normal.s
+9 -9
View File
@@ -121,7 +121,7 @@ sub_80B99D4: @ 80B99D4
ldr r4, _080B9A0C @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r4, r1]
bl sub_80B9A14
bl UnpackSelectedBattleAnimPalettes
movs r1, 0x2
ldrsb r1, [r4, r1]
ldrb r2, [r4, 0x4]
@@ -146,8 +146,8 @@ _080B9A0C: .4byte gBattleAnimArgs
_080B9A10: .4byte sub_80B9A5C
thumb_func_end sub_80B99D4
thumb_func_start sub_80B9A14
sub_80B9A14: @ 80B9A14
thumb_func_start UnpackSelectedBattleAnimPalettes
UnpackSelectedBattleAnimPalettes: @ 80B9A14
push {r4-r6,lr}
mov r6, r8
push {r6}
@@ -183,7 +183,7 @@ sub_80B9A14: @ 80B9A14
pop {r4-r6}
pop {r1}
bx r1
thumb_func_end sub_80B9A14
thumb_func_end UnpackSelectedBattleAnimPalettes
thumb_func_start sub_80B9A5C
sub_80B9A5C: @ 80B9A5C
@@ -226,7 +226,7 @@ sub_80B9A7C: @ 80B9A7C
strh r0, [r5, 0x3C]
movs r1, 0x3C
ldrsh r0, [r5, r1]
bl sub_80B9A14
bl UnpackSelectedBattleAnimPalettes
ldrb r1, [r4, 0x8]
ldrh r2, [r4, 0x6]
bl BlendPalettes
@@ -278,7 +278,7 @@ _080B9B04: .4byte sub_80B9B5C
_080B9B08:
movs r2, 0x3C
ldrsh r0, [r4, r2]
bl sub_80B9A14
bl UnpackSelectedBattleAnimPalettes
adds r3, r0, 0
ldrh r1, [r4, 0x30]
movs r0, 0x80
@@ -331,7 +331,7 @@ sub_80B9B5C: @ 80B9B5C
bne _080B9B82
movs r1, 0x3C
ldrsh r0, [r4, r1]
bl sub_80B9A14
bl UnpackSelectedBattleAnimPalettes
movs r1, 0
movs r2, 0
bl BlendPalettes
@@ -444,7 +444,7 @@ sub_80B9C2C: @ 80B9C2C
adds r4, r1
movs r1, 0x8
ldrsh r0, [r4, r1]
bl sub_80B9A14
bl UnpackSelectedBattleAnimPalettes
movs r1, 0xA
ldrsb r1, [r4, r1]
ldrh r2, [r4, 0x12]
@@ -1827,7 +1827,7 @@ sub_80BA6C8: @ 80BA6C8
adds r4, r0, 0
ldr r5, _080BA728 @ =gBattleAnimArgs
ldrb r0, [r5]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x2E]
asm/psychic.s
+4 -4
View File
@@ -696,7 +696,7 @@ sub_80B3418: @ 80B3418
ldr r0, _080B3448 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
adds r1, r0, 0
lsls r1, 24
lsrs r1, 24
@@ -750,7 +750,7 @@ sub_80B3480: @ 80B3480
ldr r0, _080B34CC @ =gTasks
adds r4, r1, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
movs r1, 0
@@ -1804,7 +1804,7 @@ _080B3CAC: .4byte gTasks
_080B3CB0:
ldr r1, _080B3CD4 @ =gBattleAnimArgs
ldrb r0, [r1]
bl duplicate_obj_of_side_rel2move_in_transparent_mode
bl CloneBattlerSpriteWithBlend
lsls r0, 16
lsrs r1, r0, 16
mov r9, r1
@@ -1871,7 +1871,7 @@ _080B3CD8:
bl CalcCenterToCornerVec
ldr r1, _080B3D70 @ =gBattleAnimArgs
ldrb r0, [r1]
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r7, 0x22]
asm/rock.s
+2 -2
View File
@@ -292,7 +292,7 @@ _080B4854:
ldr r1, _080B48F4 @ =gFile_graphics_battle_anims_backgrounds_sandstorm_brew_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080B48F8 @ =gFile_graphics_battle_anims_sprites_261_palette
mov r1, sp
ldrb r1, [r1, 0x8]
@@ -825,7 +825,7 @@ _080B4C7A:
strh r0, [r6, 0x24]
strh r5, [r6, 0xA]
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r6, 0x26]
asm/water.s
+5 -5
View File
@@ -1084,7 +1084,7 @@ _080AB42E:
ldr r1, _080AB45C @ =gFile_graphics_battle_anims_backgrounds_water_sheet
mov r2, sp
ldrh r2, [r2, 0xA]
bl sub_80753B4
bl AnimLoadCompressedBgGfx
ldr r0, _080AB460 @ =gBattleAnimArgs
movs r1, 0
ldrsh r0, [r0, r1]
@@ -1991,7 +1991,7 @@ sub_80ABB28: @ 80ABB28
ldr r0, _080ABB78 @ =gTasks
adds r4, r0
movs r0, 0
bl GetAnimBankSpriteId
bl GetAnimBattlerSpriteId
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0x26]
@@ -2727,7 +2727,7 @@ _080AC0AE:
ldr r1, [r0]
adds r0, r2, 0
bl _call_via_r1
ldr r1, _080AC144 @ =gUnknown_2037EE2
ldr r1, _080AC144 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -2748,7 +2748,7 @@ _080AC0F8:
ldr r1, [r0]
adds r0, r2, 0
bl _call_via_r1
ldr r1, _080AC144 @ =gUnknown_2037EE2
ldr r1, _080AC144 @ =gAnimVisualTaskCount
ldrb r0, [r1]
adds r0, 0x1
strb r0, [r1]
@@ -2769,7 +2769,7 @@ _080AC128:
.align 2, 0
_080AC13C: .4byte gBattleAnimArgs
_080AC140: .4byte sub_80B94B4
_080AC144: .4byte gUnknown_2037EE2
_080AC144: .4byte gAnimVisualTaskCount
_080AC148:
movs r2, 0x1A
ldrsh r0, [r4, r2]