battle_script_commands data decomp

This commit is contained in:
jiangzhengwenjz
2019-08-23 15:54:19 +08:00
parent 23b2a0cc9f
commit 3459fbb9a3
13 changed files with 1178 additions and 298 deletions
+2 -2
View File
@@ -12250,14 +12250,14 @@ _08016048:
cmp r0, 0x1F
bne _08016096
adds r0, r2, 0
bl BankGetTurnOrder
bl GetBattlerTurnOrderNum
lsls r0, 24
lsrs r0, 24
ldr r3, [sp]
cmp r0, r3
bcs _08016096
ldrb r0, [r4]
bl BankGetTurnOrder
bl GetBattlerTurnOrderNum
lsls r0, 24
lsrs r0, 24
str r0, [sp]
File diff suppressed because it is too large Load Diff
+8 -8
View File
@@ -2286,7 +2286,7 @@ _080CF176:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
bl HandleBattleWindow
ldr r0, _080CF1B4 @ =gUnknown_83FE791
movs r1, 0xE
bl BattlePutTextOnWindow
@@ -2301,7 +2301,7 @@ _080CF176:
strh r0, [r1, 0x14]
ldr r0, _080CF1B8 @ =gBattleCommunication
strb r2, [r0, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
b _080CF528
.align 2, 0
_080CF1A8: .4byte gUnknown_83FDF3C
@@ -2322,10 +2322,10 @@ _080CF1BC:
beq _080CF1E2
movs r0, 0x5
bl PlaySE
bl sub_802DCF8
bl BattleDestroyYesNoCursorAt
movs r0, 0
strb r0, [r4, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
_080CF1E2:
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2339,10 +2339,10 @@ _080CF1E2:
bne _080CF208
movs r0, 0x5
bl PlaySE
bl sub_802DCF8
bl BattleDestroyYesNoCursorAt
movs r0, 0x1
strb r0, [r4, 0x1]
bl sub_802DCB8
bl BattleCreateYesNoCursorAt
_080CF208:
ldr r0, _080CF244 @ =gMain
ldrh r1, [r0, 0x2E]
@@ -2356,7 +2356,7 @@ _080CF208:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r0, _080CF248 @ =gBattleCommunication
@@ -2409,7 +2409,7 @@ _080CF284:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
bl sub_802DB7C
bl HandleBattleWindow
movs r0, 0x5
bl PlaySE
ldr r1, _080CF2AC @ =gTasks
+1 -1
View File
@@ -538,7 +538,7 @@
.byte \bank_or_side
.endm
.macro atk62 bank_or_side
.macro atk62_hidepartystatussummary bank_or_side
.byte 0x62
.byte \bank_or_side
.endm