battle 4 up to SetMoveEffect

This commit is contained in:
DizzyEggg
2017-09-20 12:56:45 +02:00
parent b4875d82d5
commit 28da80e19a
10 changed files with 410 additions and 1034 deletions
+3 -3
View File
@@ -6510,7 +6510,7 @@ _0803A0AE:
ldr r0, [r0, 0xC]
adds r0, 0x20
strb r2, [r0]
ldr r5, =gUnknown_0202432C
ldr r5, =gPauseCounterBattle
ldr r6, =gBattleMoveDamage
ldr r7, =gUnknown_020243FC
ldr r0, =gUnknown_03005D54
@@ -14058,14 +14058,14 @@ _0803E480:
cmp r0, 0x1F
bne _0803E4CE
adds r0, r2, 0
bl sub_8048728
bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
ldr r3, [sp]
cmp r0, r3
bcs _0803E4CE
ldrb r0, [r4]
bl sub_8048728
bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
str r0, [sp]
+6 -998
View File
File diff suppressed because it is too large Load Diff
+6 -6
View File
@@ -2687,8 +2687,8 @@ _08033C88:
.pool
thumb_func_end dp01_build_cmdbuf_x10_TODO
thumb_func_start dp01_build_cmdbuf_x11_TODO
dp01_build_cmdbuf_x11_TODO: @ 8033CFC
thumb_func_start EmitPrintStringPlayerOnly
EmitPrintStringPlayerOnly: @ 8033CFC
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -2784,7 +2784,7 @@ _08033D7C:
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x11_TODO
thumb_func_end EmitPrintStringPlayerOnly
thumb_func_start dp01_build_cmdbuf_x12_a_bb
dp01_build_cmdbuf_x12_a_bb: @ 8033DE4
@@ -3467,8 +3467,8 @@ dp01_build_cmdbuf_x2A_2A_2A_2A: @ 80342B4
.pool
thumb_func_end dp01_build_cmdbuf_x2A_2A_2A_2A
thumb_func_start dp01_build_cmdbuf_x2B_aa_0
dp01_build_cmdbuf_x2B_aa_0: @ 80342D4
thumb_func_start EmitEffectivenessSound
EmitEffectivenessSound: @ 80342D4
push {r4,lr}
lsls r0, 24
lsrs r0, 24
@@ -3489,7 +3489,7 @@ dp01_build_cmdbuf_x2B_aa_0: @ 80342D4
pop {r0}
bx r0
.pool
thumb_func_end dp01_build_cmdbuf_x2B_aa_0
thumb_func_end EmitEffectivenessSound
thumb_func_start sub_8034300
sub_8034300: @ 8034300