summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_2.s28
-rw-r--r--asm/battle_3.s32
-rw-r--r--asm/battle_9.s12
3 files changed, 36 insertions, 36 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s
index ed4140583..4e8d16c7e 100644
--- a/asm/battle_2.s
+++ b/asm/battle_2.s
@@ -573,7 +573,7 @@ _080127E0:
str r0, [sp]
movs r0, 0
movs r2, 0x6
- bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
+ bl EmitChoosePokemon
b _0801289E
.align 2, 0
_08012808: .4byte gActiveBank
@@ -624,7 +624,7 @@ _08012854:
movs r1, 0
_0801286C:
movs r3, 0
- bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
+ bl EmitChoosePokemon
b _0801289E
.align 2, 0
_08012874: .4byte gActionForBanks
@@ -643,7 +643,7 @@ _08012884:
movs r1, 0
movs r2, 0x6
movs r3, 0
- bl dp01_build_cmdbuf_x16_a_b_c_ptr_d_e_f
+ bl EmitChoosePokemon
_0801289E:
ldr r0, _080128A8 @ =gActiveBank
ldrb r0, [r0]
@@ -2789,7 +2789,7 @@ _08013A04:
beq _08013A0E
b _08013B42
_08013A0E:
- bl sub_80325B8
+ bl BattleMusicStop
ldr r1, _08013A3C @ =gBattlescriptCurrInstr
ldr r0, _08013A40 @ =gUnknown_081D8DBE
str r0, [r1]
@@ -3936,14 +3936,14 @@ _080143B6:
cmp r0, 0x1F
bne _08014404
adds r0, r2, 0
- bl sub_801E3B4
+ bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
ldr r1, [sp]
cmp r0, r1
bcs _08014404
ldrb r0, [r4]
- bl sub_801E3B4
+ bl BankGetTurnOrder
lsls r0, 24
lsrs r0, 24
str r0, [sp]
@@ -4261,7 +4261,7 @@ _0801469A:
strb r0, [r5]
_080146AC:
ldr r4, _080146E0 @ =gBattlescriptCurrInstr
- ldr r3, _080146E4 @ =gUnknown_081D6BBC
+ ldr r3, _080146E4 @ =gBattleScriptsEffectsTable
ldr r2, _080146E8 @ =gBattleMoves
ldr r0, _080146EC @ =gCurrentMove
ldrh r1, [r0]
@@ -4288,7 +4288,7 @@ _080146CC:
bx r0
.align 2, 0
_080146E0: .4byte gBattlescriptCurrInstr
-_080146E4: .4byte gUnknown_081D6BBC
+_080146E4: .4byte gBattleScriptsEffectsTable
_080146E8: .4byte gBattleMoves
_080146EC: .4byte gCurrentMove
_080146F0: .4byte gFightStateTracker
@@ -5528,8 +5528,8 @@ _08015148: .4byte 0x00016112
_0801514C: .4byte 0x00017130
thumb_func_end bsC_8016D70
- thumb_func_start sub_8015150
-sub_8015150: @ 8015150
+ thumb_func_start GetBattleBank
+GetBattleBank: @ 8015150
push {lr}
lsls r0, 24
lsrs r0, 24
@@ -5592,10 +5592,10 @@ _080151C8:
bx r1
.align 2, 0
_080151D0: .4byte gBank1
- thumb_func_end sub_8015150
+ thumb_func_end GetBattleBank
- thumb_func_start sub_80151D4
-sub_80151D4: @ 80151D4
+ thumb_func_start PressurePPLose
+PressurePPLose: @ 80151D4
push {r4-r7,lr}
sub sp, 0x4
lsls r0, 24
@@ -5695,7 +5695,7 @@ _08015286:
_08015290: .4byte gDisableStructs
_08015294: .4byte gBitTable
_08015298: .4byte gActiveBank
- thumb_func_end sub_80151D4
+ thumb_func_end PressurePPLose
thumb_func_start sub_801529C
sub_801529C: @ 801529C
diff --git a/asm/battle_3.s b/asm/battle_3.s
index 8f3097c3d..7fc14545c 100644
--- a/asm/battle_3.s
+++ b/asm/battle_3.s
@@ -1819,7 +1819,7 @@ _080166D8:
ldrb r1, [r6]
movs r0, 0x1
movs r2, 0
- bl sub_801A02C
+ bl ItemBattleEffects
lsls r0, 24
cmp r0, 0
beq _080166F2
@@ -1840,7 +1840,7 @@ _08016704:
ldrb r1, [r6]
movs r0, 0x1
movs r2, 0x1
- bl sub_801A02C
+ bl ItemBattleEffects
lsls r0, 24
cmp r0, 0
beq _0801671E
@@ -2576,7 +2576,7 @@ _08016CE0:
strb r0, [r1, 0x3]
movs r0, 0x1
movs r1, 0
- bl sub_801E3EC
+ bl SetMoveEffect
ldrb r0, [r6]
muls r0, r7
adds r0, r5
@@ -3731,7 +3731,7 @@ _08017668:
movs r0, 0x1
movs r1, 0
movs r2, 0x1
- bl sub_801A02C
+ bl ItemBattleEffects
lsls r0, 24
lsrs r0, 24
cmp r0, 0
@@ -3823,8 +3823,8 @@ _08017710: .4byte gUnknown_02024AD0
_08017714: .4byte 0xff7fffff
thumb_func_end b_clear_atk_up_if_hit_flag_unless_enraged
- thumb_func_start sub_8017718
-sub_8017718: @ 8017718
+ thumb_func_start CantUseMove
+CantUseMove: @ 8017718
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -4866,7 +4866,7 @@ _08018008: .4byte 0x02000000
_0801800C: .4byte 0x000160e7
_08018010: .4byte gActiveBank
_08018014: .4byte gUnknown_02024ACC
- thumb_func_end sub_8017718
+ thumb_func_end CantUseMove
thumb_func_start sub_8018018
sub_8018018: @ 8018018
@@ -8668,8 +8668,8 @@ _0801A024: .4byte gBattleMainFunc
_0801A028: .4byte sub_8013FBC
thumb_func_end b_push_move_exec
- thumb_func_start sub_801A02C
-sub_801A02C: @ 801A02C
+ thumb_func_start ItemBattleEffects
+ItemBattleEffects: @ 801A02C
push {r4-r7,lr}
mov r7, r10
mov r6, r9
@@ -10938,7 +10938,7 @@ _0801B2BC:
bl b_movescr_stack_push_cursor
movs r0, 0
movs r1, 0
- bl sub_801E3EC
+ bl SetMoveEffect
bl b_movescr_stack_pop_cursor
b _0801B3CA
.align 2, 0
@@ -11049,7 +11049,7 @@ _0801B3FC: .4byte 0x02000000
_0801B400: .4byte 0x00016003
_0801B404: .4byte gBattlescriptCurrInstr
_0801B408: .4byte gUnknown_081D9AA7
- thumb_func_end sub_801A02C
+ thumb_func_end ItemBattleEffects
thumb_func_start unref_sub_801B40C
unref_sub_801B40C: @ 801B40C
@@ -11636,8 +11636,8 @@ _0801B920: .4byte 0x02000000
_0801B924: .4byte 0x00016010
thumb_func_end sub_801B5C0
- thumb_func_start sub_801B928
-sub_801B928: @ 801B928
+ thumb_func_start IsPokeDisobedient
+IsPokeDisobedient: @ 801B928
push {r4-r7,lr}
mov r7, r9
mov r6, r8
@@ -11828,7 +11828,7 @@ _0801BA9E:
ands r5, r4
cmp r5, 0
bne _0801BA9E
- ldr r4, _0801BB18 @ =gUnknown_02024BEA
+ ldr r4, _0801BB18 @ =gRandomMove
ldr r3, _0801BB04 @ =gBattleMons
ldr r0, _0801BB10 @ =gCurrMovePos
ldrb r0, [r0]
@@ -11870,7 +11870,7 @@ _0801BB08: .4byte gBankAttacker
_0801BB0C: .4byte gBitTable
_0801BB10: .4byte gCurrMovePos
_0801BB14: .4byte gUnknown_02024BE5
-_0801BB18: .4byte gUnknown_02024BEA
+_0801BB18: .4byte gRandomMove
_0801BB1C: .4byte gBattleCommunication
_0801BB20: .4byte gDynamicBasePower
_0801BB24: .4byte 0x02000000
@@ -12012,6 +12012,6 @@ _0801BC40: .4byte gBankTarget
_0801BC44: .4byte gBattlescriptCurrInstr
_0801BC48: .4byte gUnknown_081D99A0
_0801BC4C: .4byte gHitMarker
- thumb_func_end sub_801B928
+ thumb_func_end IsPokeDisobedient
.align 2, 0 @ Don't pad with nop.
diff --git a/asm/battle_9.s b/asm/battle_9.s
index fffb56dc9..1c5431afc 100644
--- a/asm/battle_9.s
+++ b/asm/battle_9.s
@@ -136,7 +136,7 @@ _080360D8:
ldrh r1, [r4]
mov r3, r8
ldrb r2, [r3]
- bl ai_rate_move
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -211,7 +211,7 @@ _0803617C:
beq _080361BC
ldrh r1, [r5]
ldrb r2, [r7]
- bl ai_rate_move
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -693,7 +693,7 @@ _08036550:
ldrh r1, [r5]
mov r3, r9
ldrb r2, [r3]
- bl ai_rate_move
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -770,7 +770,7 @@ _080365F2:
ldrh r1, [r5]
mov r3, r9
ldrb r2, [r3]
- bl ai_rate_move
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
@@ -1061,7 +1061,7 @@ _08036850:
adds r0, r1
ldrh r0, [r0]
adds r1, r4, 0
- bl ai_rate_move
+ bl AI_TypeCalc
ldr r1, [sp]
ands r1, r0
cmp r1, 0
@@ -1096,7 +1096,7 @@ _0803688E:
beq _080368CA
ldrh r1, [r5]
ldrb r2, [r7]
- bl ai_rate_move
+ bl AI_TypeCalc
lsls r0, 24
lsrs r1, r0, 24
movs r0, 0x2
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 08:50:21 +0000