dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

player battle controller is done

Browse Source
This commit is contained in:
DizzyEggg
2017-10-22 18:43:15 +02:00
parent 813b1bfd4a
commit df4e32a307
32 changed files with 1298 additions and 2553 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_7.s
+17 -17
View File
@@ -67,8 +67,8 @@ _0805D192:
.pool
thumb_func_end FreeBattleSpritesData
thumb_func_start sub_805D19C
sub_805D19C: @ 805D19C
thumb_func_start ChooseMoveAndTargetInBattlePalace
ChooseMoveAndTargetInBattlePalace: @ 805D19C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -448,7 +448,7 @@ _0805D496:
pop {r1}
bx r1
.pool
thumb_func_end sub_805D19C
thumb_func_end ChooseMoveAndTargetInBattlePalace
thumb_func_start sub_805D4A8
sub_805D4A8: @ 805D4A8
@@ -834,8 +834,8 @@ _0805D800:
.pool
thumb_func_end sub_805D7EC
thumb_func_start move_anim_start_t2_for_situation
move_anim_start_t2_for_situation: @ 805D808
thumb_func_start DoStatusAnimation
DoStatusAnimation: @ 805D808
push {r4-r6,lr}
adds r4, r1, 0
lsls r0, 24
@@ -962,10 +962,10 @@ _0805D902:
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end move_anim_start_t2_for_situation
thumb_func_end DoStatusAnimation
thumb_func_start move_anim_start_t3
move_anim_start_t3: @ 805D908
thumb_func_start DoBattleAnimationFromTable
DoBattleAnimationFromTable: @ 805D908
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -1070,7 +1070,7 @@ _0805D9CC:
ldr r0, =gUnknown_082C9320
adds r1, r5, 0
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_0803415C
movs r1, 0xA
bl CreateTask
@@ -1105,7 +1105,7 @@ _0805DA1E:
pop {r1}
bx r1
.pool
thumb_func_end move_anim_start_t3
thumb_func_end DoBattleAnimationFromTable
thumb_func_start task0A_0803415C
task0A_0803415C: @ 805DA48
@@ -1172,8 +1172,8 @@ _0805DABE:
bx r1
thumb_func_end sub_805DAA0
thumb_func_start move_anim_start_t4
move_anim_start_t4: @ 805DAC4
thumb_func_start DoSpecialBattleAnimation
DoSpecialBattleAnimation: @ 805DAC4
push {r4,lr}
adds r4, r0, 0
lsls r4, 24
@@ -1187,7 +1187,7 @@ move_anim_start_t4: @ 805DAC4
ldr r0, =gUnknown_082C937C
adds r1, r3, 0
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_08034248
movs r1, 0xA
bl CreateTask
@@ -1216,7 +1216,7 @@ move_anim_start_t4: @ 805DAC4
pop {r0}
bx r0
.pool
thumb_func_end move_anim_start_t4
thumb_func_end DoSpecialBattleAnimation
thumb_func_start task0A_08034248
task0A_08034248: @ 805DB34
@@ -2229,8 +2229,8 @@ _0805E3EA:
.pool
thumb_func_end sub_805E394
thumb_func_start sub_805E408
sub_805E408: @ 805E408
thumb_func_start SetBattleSpriteInvisibilityBitToSpriteInvisibility
SetBattleSpriteInvisibilityBitToSpriteInvisibility: @ 805E408
lsls r0, 24
lsrs r0, 24
ldr r1, =gBattleSpritesDataPtr
@@ -2258,7 +2258,7 @@ sub_805E408: @ 805E408
strb r0, [r3]
bx lr
.pool
thumb_func_end sub_805E408
thumb_func_end SetBattleSpriteInvisibilityBitToSpriteInvisibility
thumb_func_start sub_805E448
sub_805E448: @ 805E448
asm/rom_80A5C6C.s → asm/battle_anim_80A5C6C.s
View File
asm/battle_anim_80A9C70.s
+1 -1
View File
@@ -869,7 +869,7 @@ move_anim_start_t2: @ 80AA364
strb r4, [r0]
ldr r0, =gUnknown_082C92FC
movs r2, 0
bl DoBattleAnim
bl LaunchBattleAnimation
ldr r0, =task0A_80788BC
movs r1, 0xA
bl CreateTask
asm/battle_anim_80FE840.s
+3 -3
View File
@@ -50443,8 +50443,8 @@ _081181CA:
bx r1
thumb_func_end sub_8118140
thumb_func_start battle_intro_launch
battle_intro_launch: @ 81181D4
thumb_func_start HandleIntroSlide
HandleIntroSlide: @ 81181D4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
@@ -50521,7 +50521,7 @@ _08118258:
pop {r0}
bx r0
.pool
thumb_func_end battle_intro_launch
thumb_func_end HandleIntroSlide
thumb_func_start sub_811828C
sub_811828C: @ 811828C
asm/battle_controller_linkopponent.s
+12 -12
View File
@@ -1163,7 +1163,7 @@ sub_8064D60: @ 8064D60
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08064DA0:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -1312,7 +1312,7 @@ sub_8064E50: @ 8064E50
ldrb r0, [r0]
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -3970,7 +3970,7 @@ _080666E4:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_080666FE:
ldr r0, [r6]
ldrb r1, [r5]
@@ -3995,7 +3995,7 @@ _08066712:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x2
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4595,7 +4595,7 @@ LinkOpponentHandleFaintAnimation: @ 8066C40
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08066C74:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4890,7 +4890,7 @@ _08066ED2:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08066EF4:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4948,7 +4948,7 @@ _08066F32:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -5285,7 +5285,7 @@ LinkOpponentHandleStatusAnimation: @ 8067214
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5481,7 +5481,7 @@ _080673B0:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5615,7 +5615,7 @@ LinkOpponentHandleIntroSlide: @ 80674D4
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -6092,7 +6092,7 @@ LinkOpponentHandleSpriteInvisibility: @ 80678D0
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_08067916:
bl LinkOpponentBufferExecCompleted
pop {r4}
@@ -6129,7 +6129,7 @@ LinkOpponentHandleBattleAnimation: @ 8067930
adds r0, r2, 0
adds r1, r2, 0
adds r3, r6, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _08067980
asm/battle_controller_linkpartner.s
+12 -12
View File
@@ -736,7 +736,7 @@ sub_814B4E0: @ 814B4E0
cmp r1, r0
bne _0814B532
adds r0, r3, 0
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r0, =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
@@ -751,7 +751,7 @@ sub_814B4E0: @ 814B4E0
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0814B526:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -3554,7 +3554,7 @@ _0814CECC:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0814CEE6:
ldr r0, [r6]
ldrb r1, [r5]
@@ -3579,7 +3579,7 @@ _0814CEFA:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -3893,7 +3893,7 @@ sub_814D19C: @ 814D19C
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0814D1D0:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4216,7 +4216,7 @@ _0814D46E:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0814D490:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4274,7 +4274,7 @@ _0814D4CE:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -4611,7 +4611,7 @@ sub_814D7B0: @ 814D7B0
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4807,7 +4807,7 @@ _0814D94C:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4942,7 +4942,7 @@ dp01t_2E_4_battle_intro: @ 814DA74
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -5503,7 +5503,7 @@ sub_814DF40: @ 814DF40
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_0814DF86:
bl LinkPartnerBufferExecCompleted
pop {r4}
@@ -5540,7 +5540,7 @@ sub_814DFA0: @ 814DFA0
adds r0, r2, 0
adds r1, r2, 0
adds r3, r6, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _0814DFF0
asm/battle_controller_opponent.s
+20 -20
View File
@@ -1256,7 +1256,7 @@ sub_805FC10: @ 805FC10
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0805FC50:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -1405,7 +1405,7 @@ sub_805FD00: @ 805FD00
ldrb r0, [r0]
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4131,7 +4131,7 @@ _0806162C:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08061646:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4156,7 +4156,7 @@ _0806165A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x2
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4746,7 +4746,7 @@ OpponentHandleFaintAnimation: @ 8061B9C
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08061BD0:
ldr r0, [r6]
ldrb r1, [r5]
@@ -5029,7 +5029,7 @@ _08061E12:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08061E34:
ldr r0, [r7]
ldrb r1, [r6]
@@ -5087,7 +5087,7 @@ _08061E72:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -5218,14 +5218,14 @@ OpponentHandleChooseMove: @ 8061FB8
ands r0, r2
cmp r0, 0
beq _08061FE4
bl sub_805D19C
bl ChooseMoveAndTargetInBattlePalace
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
movs r0, 0x1
movs r1, 0xA
_08061FD6:
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
_08061FDA:
bl OpponentBufferExecCompleted
b _08062156
@@ -5329,7 +5329,7 @@ _0806209C:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _08061FDA
.pool
_080620C4:
@@ -5360,7 +5360,7 @@ _080620C6:
movs r0, 0x1
movs r1, 0xA
adds r2, r4, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _08062152
.pool
_08062108:
@@ -5383,7 +5383,7 @@ _08062108:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _08062152
.pool
_0806213C:
@@ -5395,7 +5395,7 @@ _0806213C:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
_08062152:
bl OpponentBufferExecCompleted
_08062156:
@@ -5417,7 +5417,7 @@ OpponentHandleOpenBag: @ 806215C
adds r0, 0xC0
ldrb r1, [r0]
movs r0, 0x1
bl EmitCmd35
bl EmitOneReturnValue
bl OpponentBufferExecCompleted
pop {r0}
bx r0
@@ -5532,7 +5532,7 @@ _0806225A:
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitCmd34
bl EmitChosenMonReturnValue
bl OpponentBufferExecCompleted
pop {r4-r7}
pop {r0}
@@ -5734,7 +5734,7 @@ OpponentHandleStatusAnimation: @ 8062408
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5930,7 +5930,7 @@ _080625A4:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -6064,7 +6064,7 @@ OpponentHandleIntroSlide: @ 80626C8
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -6546,7 +6546,7 @@ OpponentHandleSpriteInvisibility: @ 8062AD0
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_08062B16:
bl OpponentBufferExecCompleted
pop {r4}
@@ -6582,7 +6582,7 @@ OpponentHandleBattleAnimation: @ 8062B30
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _08062B7C
asm/battle_controller_player.s
-1822
View File
File diff suppressed because it is too large Load Diff
asm/battle_controller_player_partner.s
+17 -17
View File
@@ -645,7 +645,7 @@ _081BB2E2:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
strb r5, [r4]
bl IsDoubleBattle
lsls r0, 24
@@ -918,7 +918,7 @@ _081BB514:
lsrs r2, 16
movs r0, 0x1
movs r1, 0xB
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
strb r5, [r4]
ldr r0, =sub_81BB628
str r0, [r6]
@@ -981,7 +981,7 @@ _081BB65C:
adds r1, r4, 0
adds r2, r4, 0
movs r3, 0
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, =gTasks
lsls r1, r5, 2
adds r1, r5
@@ -1311,7 +1311,7 @@ sub_81BB92C: @ 81BB92C
cmp r1, r0
bne _081BB97E
adds r0, r3, 0
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r0, =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
@@ -1326,7 +1326,7 @@ sub_81BB92C: @ 81BB92C
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_081BB972:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -4129,7 +4129,7 @@ _081BD318:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_081BD332:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4154,7 +4154,7 @@ _081BD346:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4517,7 +4517,7 @@ sub_81BD674: @ 81BD674
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_081BD6A8:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4828,7 +4828,7 @@ _081BD92A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_081BD94C:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4886,7 +4886,7 @@ _081BD98A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -5068,7 +5068,7 @@ _081BDB3C:
orrs r2, r5
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl PlayerPartnerBufferExecCompleted
pop {r4-r6}
pop {r0}
@@ -5138,7 +5138,7 @@ _081BDBD0:
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitCmd34
bl EmitChosenMonReturnValue
bl PlayerPartnerBufferExecCompleted
pop {r4-r6}
pop {r0}
@@ -5398,7 +5398,7 @@ sub_81BDE14: @ 81BDE14
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5594,7 +5594,7 @@ _081BDFB0:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5729,7 +5729,7 @@ dp01t_2E_3_battle_intro: @ 81BE0D8
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -6236,7 +6236,7 @@ sub_81BE53C: @ 81BE53C
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_081BE582:
bl PlayerPartnerBufferExecCompleted
pop {r4}
@@ -6272,7 +6272,7 @@ sub_81BE59C: @ 81BE59C
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _081BE5E8
asm/battle_controller_recorded_opponent.s
+17 -17
View File
@@ -1161,7 +1161,7 @@ sub_8186EA4: @ 8186EA4
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08186EE4:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -1310,7 +1310,7 @@ sub_8186F94: @ 8186F94
ldrb r0, [r0]
bl SetHealthboxSpriteVisible
ldrb r0, [r5]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -3968,7 +3968,7 @@ _08188828:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08188842:
ldr r0, [r6]
ldrb r1, [r5]
@@ -3993,7 +3993,7 @@ _08188856:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x2
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4301,7 +4301,7 @@ sub_8188AF8: @ 8188AF8
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08188B2C:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4584,7 +4584,7 @@ _08188D6E:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_08188D90:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4642,7 +4642,7 @@ _08188DCE:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -4754,7 +4754,7 @@ sub_8188EF0: @ 8188EF0
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl RecordedOpponentBufferExecCompleted
pop {r0}
bx r0
@@ -4779,13 +4779,13 @@ sub_8188F20: @ 8188F20
ands r0, r1
cmp r0, 0
beq _08188F48
bl sub_805D19C
bl ChooseMoveAndTargetInBattlePalace
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _08188F6C
.pool
_08188F48:
@@ -4803,7 +4803,7 @@ _08188F48:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
_08188F6C:
bl RecordedOpponentBufferExecCompleted
pop {r4,r5}
@@ -4839,7 +4839,7 @@ sub_8188F88: @ 8188F88
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0
bl EmitCmd34
bl EmitChosenMonReturnValue
bl RecordedOpponentBufferExecCompleted
pop {r4}
pop {r0}
@@ -5041,7 +5041,7 @@ sub_8189144: @ 8189144
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5237,7 +5237,7 @@ _081892E0:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5371,7 +5371,7 @@ sub_8189404: @ 8189404
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -5848,7 +5848,7 @@ sub_8189800: @ 8189800
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_08189846:
bl RecordedOpponentBufferExecCompleted
pop {r4}
@@ -5884,7 +5884,7 @@ sub_8189860: @ 8189860
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _081898AC
asm/battle_controller_recorded_player.s
+18 -18
View File
@@ -1112,7 +1112,7 @@ sub_818A2B4: @ 818A2B4
cmp r1, r0
bne _0818A306
adds r0, r3, 0
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
ldr r0, =gBattleSpritesDataPtr
ldr r0, [r0]
ldrb r2, [r4]
@@ -1127,7 +1127,7 @@ sub_818A2B4: @ 818A2B4
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0818A2FA:
ldr r0, =gBattleBankFunc
ldrb r1, [r4]
@@ -3930,7 +3930,7 @@ _0818BCA0:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0818BCBA:
ldr r0, [r6]
ldrb r1, [r5]
@@ -3955,7 +3955,7 @@ _0818BCCE:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -4373,7 +4373,7 @@ sub_818C064: @ 818C064
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0818C098:
ldr r0, [r6]
ldrb r1, [r5]
@@ -4684,7 +4684,7 @@ _0818C31A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0818C33C:
ldr r0, [r7]
ldrb r1, [r6]
@@ -4742,7 +4742,7 @@ _0818C37A:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, [r7]
ldrb r1, [r6]
ldr r0, [r0]
@@ -4861,7 +4861,7 @@ sub_818C49C: @ 818C49C
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl RecordedPlayerBufferExecCompleted
_0818C4C6:
pop {r0}
@@ -4897,7 +4897,7 @@ _0818C508:
lsrs r1, 24
movs r0, 0x1
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl RecordedPlayerBufferExecCompleted
_0818C522:
pop {r0}
@@ -4923,13 +4923,13 @@ sub_818C538: @ 818C538
ands r0, r1
cmp r0, 0
beq _0818C560
bl sub_805D19C
bl ChooseMoveAndTargetInBattlePalace
adds r2, r0, 0
lsls r2, 16
lsrs r2, 16
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _0818C584
.pool
_0818C560:
@@ -4947,7 +4947,7 @@ _0818C560:
orrs r2, r4
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
_0818C584:
bl RecordedPlayerBufferExecCompleted
pop {r4,r5}
@@ -4983,7 +4983,7 @@ sub_818C5A0: @ 818C5A0
ldrb r1, [r0]
movs r0, 0x1
movs r2, 0
bl EmitCmd34
bl EmitChosenMonReturnValue
bl RecordedPlayerBufferExecCompleted
pop {r4}
pop {r0}
@@ -5192,7 +5192,7 @@ sub_818C76C: @ 818C76C
ldrb r2, [r3]
lsls r2, 24
orrs r1, r2
bl move_anim_start_t2_for_situation
bl DoStatusAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -5388,7 +5388,7 @@ _0818C908:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -5523,7 +5523,7 @@ dp01t_2E_2_battle_intro: @ 818CA30
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -6032,7 +6032,7 @@ sub_818CE98: @ 818CE98
orrs r0, r1
strb r0, [r2]
ldrb r0, [r4]
bl sub_805E408
bl SetBattleSpriteInvisibilityBitToSpriteInvisibility
_0818CEDE:
bl RecordedPlayerBufferExecCompleted
pop {r4}
@@ -6068,7 +6068,7 @@ sub_818CEF8: @ 818CEF8
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _0818CF44
asm/battle_controller_safari.s
+7 -7
View File
@@ -103,13 +103,13 @@ _0815942A:
movs r1, 0x7
_0815942E:
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
b _08159440
_08159436:
movs r0, 0x1
movs r1, 0x8
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
_08159440:
bl SafariBufferExecCompleted
b _0815954E
@@ -399,7 +399,7 @@ sub_8159698: @ 8159698
ldr r0, =gScriptItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitCmd35
bl EmitOneReturnValue
bl SafariBufferExecCompleted
_081596BE:
pop {r0}
@@ -707,7 +707,7 @@ sub_8159910: @ 8159910
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -746,7 +746,7 @@ sub_8159964: @ 8159964
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -1227,7 +1227,7 @@ dp01t_2E_6_battle_intro: @ 8159D5C
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -1329,7 +1329,7 @@ sub_8159E1C: @ 8159E1C
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _08159E5C
asm/battle_controller_wally.s
+13 -13
View File
@@ -121,7 +121,7 @@ _081684CE:
movs r1, 0x9
_081684E4:
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl WallyBufferExecCompleted
ldr r1, [r4]
adds r1, 0x94
@@ -176,7 +176,7 @@ _08168540:
movs r0, 0x1
movs r1, 0x1
movs r2, 0
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl WallyBufferExecCompleted
_08168564:
pop {r4,r5}
@@ -279,7 +279,7 @@ sub_8168610: @ 8168610
ldr r0, =gScriptItemId
ldrh r1, [r0]
movs r0, 0x1
bl EmitCmd35
bl EmitOneReturnValue
bl WallyBufferExecCompleted
_08168636:
pop {r0}
@@ -2952,7 +2952,7 @@ WallyHandleReturnMonToBall: @ 8169E44
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x1
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r0, =gBattleBankFunc
ldrb r1, [r6]
lsls r1, 2
@@ -3207,7 +3207,7 @@ WallyHandleCmd12: @ 816A084
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -3246,7 +3246,7 @@ WallyHandleBallThrow: @ 816A0D8
adds r0, r4, 0
adds r1, r4, 0
movs r3, 0x4
bl move_anim_start_t4
bl DoSpecialBattleAnimation
ldr r1, =gBattleBankFunc
ldrb r0, [r5]
lsls r0, 2
@@ -3452,7 +3452,7 @@ _0816A2C6:
adds r1, r3, 0
adds r2, r3, 0
movs r3, 0x5
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0816A2E2:
ldr r0, [r7]
ldrb r1, [r6]
@@ -3507,7 +3507,7 @@ _0816A320:
adds r0, r2, 0
adds r1, r2, 0
movs r3, 0x6
bl move_anim_start_t4
bl DoSpecialBattleAnimation
_0816A354:
ldr r0, [r7]
ldrb r1, [r6]
@@ -3700,7 +3700,7 @@ _0816A504:
beq _0816A550
b _0816A574
_0816A50A:
bl sub_805C210
bl InitMoveSelectionsVarsAndStrings
ldr r1, [r4]
adds r1, 0x95
ldrb r0, [r1]
@@ -3745,7 +3745,7 @@ _0816A550:
lsls r2, 1
movs r0, 0x1
movs r1, 0xA
bl EmitChoiceReturnValue
bl EmitTwoReturnValues
bl WallyBufferExecCompleted
_0816A574:
pop {r4}
@@ -4062,7 +4062,7 @@ _0816A7C8:
movs r1, 0
strh r1, [r0, 0x30]
ldrb r0, [r4]
bl sub_80769F4
bl DoHitAnimHealthboxEffect
ldr r1, =gBattleBankFunc
ldrb r0, [r4]
lsls r0, 2
@@ -4184,7 +4184,7 @@ WallyHandleIntroSlide: @ 816A8D8
adds r1, 0x1
adds r0, r1
ldrb r0, [r0]
bl battle_intro_launch
bl HandleIntroSlide
ldr r2, =gUnknown_020243FC
ldrh r0, [r2]
movs r1, 0x1
@@ -4672,7 +4672,7 @@ WallyHandleBattleAnimation: @ 816AD20
str r4, [sp]
adds r0, r2, 0
adds r1, r2, 0
bl move_anim_start_t3
bl DoBattleAnimationFromTable
lsls r0, 24
cmp r0, 0
beq _0816AD60
asm/battle_link_817C95C.s
+5 -98
View File
@@ -110,7 +110,7 @@ _0817CA4C:
ldr r1, =gStringInfo
ldr r1, [r1]
ldrh r1, [r1]
bl sub_817F33C
bl GetBankMoveSlotId
lsls r0, 24
lsrs r0, 24
mov r10, r0
@@ -2572,7 +2572,7 @@ _0817E122:
mov r1, r10
ldrb r0, [r1]
adds r1, r7, 0
bl sub_817F33C
bl GetBankMoveSlotId
lsls r0, 24
lsrs r6, r0, 24
cmp r6, 0x3
@@ -4793,8 +4793,8 @@ _0817F324:
.pool
thumb_func_end sub_817F2A8
thumb_func_start sub_817F33C
sub_817F33C: @ 817F33C
thumb_func_start GetBankMoveSlotId
GetBankMoveSlotId: @ 817F33C
push {r4-r7,lr}
lsls r0, 24
lsrs r5, r0, 24
@@ -4835,7 +4835,7 @@ _0817F388:
pop {r4-r7}
pop {r1}
bx r1
thumb_func_end sub_817F33C
thumb_func_end GetBankMoveSlotId
thumb_func_start sub_817F394
sub_817F394: @ 817F394
@@ -4888,97 +4888,4 @@ _0817F3E6:
bx r0
thumb_func_end sub_817F394
thumb_func_start nullsub_69
nullsub_69: @ 817F3EC
bx lr
thumb_func_end nullsub_69
thumb_func_start sub_817F3F0
sub_817F3F0: @ 817F3F0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
mov r9, r0
mov r8, r1
adds r5, r2, 0
adds r4, r3, 0
lsls r5, 16
negs r5, r5
lsls r4, 16
negs r4, r4
lsrs r4, 16
mov r0, r8
lsls r0, 16
asrs r0, 16
mov r8, r0
asrs r5, 16
adds r1, r5, 0
bl Cos
adds r6, r0, 0
lsls r4, 16
asrs r4, 16
mov r0, r8
adds r1, r4, 0
bl Sin
subs r6, r0
lsls r6, 16
lsrs r6, 16
mov r0, r8
adds r1, r4, 0
bl Cos
adds r2, r0, 0
mov r0, r8
adds r1, r5, 0
str r2, [sp]
bl Sin
ldr r2, [sp]
adds r2, r0
negs r5, r5
negs r4, r4
lsls r6, 16
asrs r6, 16
lsls r5, 16
asrs r5, 16
adds r6, r5
mov r0, r9
strh r6, [r0, 0x24]
lsls r2, 16
asrs r2, 16
lsls r4, 16
asrs r4, 16
adds r2, r4
strh r2, [r0, 0x26]
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_817F3F0
thumb_func_start GetSpeciesBackAnimId
GetSpeciesBackAnimId: @ 817F474
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_0860A8C8
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0817F48C
movs r0, 0
b _0817F492
.pool
_0817F48C:
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
_0817F492:
pop {r1}
bx r1
thumb_func_end GetSpeciesBackAnimId
.align 2, 0 @ Don't pad with nop.
asm/pokeball.s
+3 -3
View File
@@ -2685,8 +2685,8 @@ _080769EA:
.pool
thumb_func_end sub_80769CC
thumb_func_start sub_80769F4
sub_80769F4: @ 80769F4
thumb_func_start DoHitAnimHealthboxEffect
DoHitAnimHealthboxEffect: @ 80769F4
push {r4,r5,lr}
adds r4, r0, 0
lsls r4, 24
@@ -2714,7 +2714,7 @@ sub_80769F4: @ 80769F4
pop {r0}
bx r0
.pool
thumb_func_end sub_80769F4
thumb_func_end DoHitAnimHealthboxEffect
thumb_func_start oamc_804BEB4
oamc_804BEB4: @ 8076A38
asm/pokemon_animation.s
+94
View File
@@ -4,6 +4,100 @@
.syntax unified
.text
thumb_func_start nullsub_69
nullsub_69: @ 817F3EC
bx lr
thumb_func_end nullsub_69
thumb_func_start sub_817F3F0
sub_817F3F0: @ 817F3F0
push {r4-r6,lr}
mov r6, r9
mov r5, r8
push {r5,r6}
sub sp, 0x4
mov r9, r0
mov r8, r1
adds r5, r2, 0
adds r4, r3, 0
lsls r5, 16
negs r5, r5
lsls r4, 16
negs r4, r4
lsrs r4, 16
mov r0, r8
lsls r0, 16
asrs r0, 16
mov r8, r0
asrs r5, 16
adds r1, r5, 0
bl Cos
adds r6, r0, 0
lsls r4, 16
asrs r4, 16
mov r0, r8
adds r1, r4, 0
bl Sin
subs r6, r0
lsls r6, 16
lsrs r6, 16
mov r0, r8
adds r1, r4, 0
bl Cos
adds r2, r0, 0
mov r0, r8
adds r1, r5, 0
str r2, [sp]
bl Sin
ldr r2, [sp]
adds r2, r0
negs r5, r5
negs r4, r4
lsls r6, 16
asrs r6, 16
lsls r5, 16
asrs r5, 16
adds r6, r5
mov r0, r9
strh r6, [r0, 0x24]
lsls r2, 16
asrs r2, 16
lsls r4, 16
asrs r4, 16
adds r2, r4
strh r2, [r0, 0x26]
add sp, 0x4
pop {r3,r4}
mov r8, r3
mov r9, r4
pop {r4-r6}
pop {r0}
bx r0
thumb_func_end sub_817F3F0
thumb_func_start GetSpeciesBackAnimId
GetSpeciesBackAnimId: @ 817F474
push {lr}
lsls r0, 16
lsrs r0, 16
ldr r1, =gUnknown_0860A8C8
adds r0, r1
ldrb r0, [r0]
cmp r0, 0
bne _0817F48C
movs r0, 0
b _0817F492
.pool
_0817F48C:
subs r0, 0x1
lsls r0, 24
lsrs r0, 24
_0817F492:
pop {r1}
bx r1
thumb_func_end GetSpeciesBackAnimId
thumb_func_start sub_817F498
sub_817F498: @ 817F498