summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
Diffstat (limited to 'battle')
-rw-r--r--battle/ai/scoring.asm8
-rw-r--r--battle/core.asm10
-rw-r--r--battle/effect_command_pointers.asm8
-rw-r--r--battle/effect_commands.asm80
-rw-r--r--battle/effects/curse.asm4
5 files changed, 54 insertions, 56 deletions
diff --git a/battle/ai/scoring.asm b/battle/ai/scoring.asm
index 64da1a982..258ee2e16 100644
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
- callab BattleCommand62_DamageCalcWithStats
- callab BattleCommand07_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalcWithStats
+ callab BattleCommand_CalcDamageTypeMultiplier
pop hl
ld a, [CurDamage + 1]
ld c, a
@@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7
.asm_39400
callab EnemyAttackDamage
- callab BattleCommand62_DamageCalcWithStats
- callab BattleCommand07_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalcWithStats
+ callab BattleCommand_CalcDamageTypeMultiplier
ret
.ConstantDamageEffects
diff --git a/battle/core.asm b/battle/core.asm
index e83f924d8..82c4f02ea 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -645,7 +645,7 @@ Function3c434: ; 3c434
ld [wd235], a
inc a ; POUND
ld [FXAnimIDLo], a
- call Function3e4bc
+ call MoveSelectionScreen
push af
call Call_LoadTempTileMapToTileMap
call UpdateBattleHuds
@@ -5584,7 +5584,7 @@ CheckAmuletCoin: ; 3e4a8
ret
; 3e4bc
-Function3e4bc: ; 3e4bc
+MoveSelectionScreen: ; 3e4bc
call IsMobileBattle
jr nz, .asm_3e4c8
callba Function100b9f
@@ -5784,7 +5784,7 @@ Function3e4bc: ; 3e4bc
.asm_3e613
call StdBattleTextBox
call Call_LoadTempTileMapToTileMap
- jp Function3e4bc
+ jp MoveSelectionScreen
; 3e61c
.string_3e61c ; 3e61c
@@ -5869,7 +5869,7 @@ endr
.asm_3e69e
xor a
ld [wd0e3], a
- jp Function3e4bc
+ jp MoveSelectionScreen
.asm_3e6a5
push hl
@@ -5896,7 +5896,7 @@ endr
.asm_3e6bf
ld a, [wcfa9]
ld [wd0e3], a
- jp Function3e4bc
+ jp MoveSelectionScreen
; 3e6c8
MoveInfoBox: ; 3e6c8
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm
index 56fa0c5a3..800b1ccd6 100644
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand04 ; 34555
dw BattleCommand05 ; 34631
dw BattleCommand06 ; 352dc
- dw BattleCommand07_CalcDamageTypeMultiplier ; 346d2
+ dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
dw BattleCommand08 ; 34cfd
dw BattleCommand09 ; 34d32
dw BattleCommand0a ; 34eee
@@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand5f ; 377ce
dw BattleCommand60 ; 3784b
dw BattleCommand61 ; 37874
- dw BattleCommand62_DamageCalcWithStats ; 35612
+ dw BattleCommand_DamageCalcWithStats ; 35612 - 62
dw BattleCommand63 ; 3790e
dw BattleCommand64 ; 37939
dw BattleCommand65 ; 37972
@@ -148,7 +148,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand90 ; 34ecc
dw BattleCommand91 ; 34fdb
dw BattleCommand92 ; 34fd1
- dw BattleCommand93 ; 34ffd
+ dw BattleCommand_SwitchTurn ; 34ffd - 93
dw BattleCommand94 ; 36a82
dw BattleCommand95 ; 37c1a
dw BattleCommand96 ; 37c55
@@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5
- dw BattleCommanda9_IfAttackMissedResetDamage ; 355d5
+ dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
dw BattleCommandaa ; 37e80
dw BattleCommandab ; 34f57
dw BattleCommandac ; 3658f
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 86eb87bee..2f2807e27 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -385,9 +385,9 @@ CantMove: ; 341f0
Function34216: ; 34216
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call CantMove
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3421f
@@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f
ld hl, HurtItselfText
call StdBattleTextBox
call Function355dd
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
ld [wcfca], a
@@ -652,7 +652,7 @@ HitConfusion: ; 343a5
ld [CriticalHit], a
call Function355dd
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
call BattleCommand0a
xor a
@@ -1336,7 +1336,7 @@ BattleCommand4f: ; 346cd
; 346d2
-BattleCommand07_CalcDamageTypeMultiplier: ; 346d2
+BattleCommand_CalcDamageTypeMultiplier: ; 346d2
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -2872,8 +2872,7 @@ BattleCommand91_92: ; 34feb
; 34ffd
-SwitchTurn: ; 34ffd
-BattleCommand93: ; 34ffd
+BattleCommand_SwitchTurn: ; 34ffd
; switchturn
ld a, [hBattleTurn]
@@ -3246,7 +3245,7 @@ BattleCommand11: ; 351c0
predef Functionc6e0
call RefreshBattleHuds
- call SwitchTurn
+ call BattleCommand_SwitchTurn
xor a
ld [wcfca], a
ld [FXAnimIDHi], a
@@ -3254,7 +3253,7 @@ BattleCommand11: ; 351c0
ld [wc689], a
ld a, $c2
call Function37e44
- call SwitchTurn
+ call BattleCommand_SwitchTurn
jr .asm_3524d ; 3522f $1c
@@ -3305,10 +3304,10 @@ BattleCommand12: ; 35250
ret z
ld [de], a
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, RageBuildingText
call StdBattleTextBox
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3527b
@@ -3953,10 +3952,9 @@ Function355bd: ; 355bd
call GetPartyLocation
pop bc
ret
-; 355d5
-BattleCommanda9_IfAttackMissedResetDamage: ; 355d5
+BattleCommand_IfAttackMissedResetDamage: ; 355d5
; clearmissdamage
ld a, [AttackMissed]
and a
@@ -4004,7 +4002,7 @@ endr
; 35612
-BattleCommand62_DamageCalcWithStats: ; 35612
+BattleCommand_DamageCalcWithStats: ; 35612
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@@ -4412,7 +4410,7 @@ BattleCommand3f: ; 35726
call EnemyAttackDamage
.notEnemysTurn
- call BattleCommand62_DamageCalcWithStats
+ call BattleCommand_DamageCalcWithStats
pop hl
ld [hl], 1
ret
@@ -4754,7 +4752,7 @@ BattleCommand44: ; 359e6
cp CURSE_T
jr z, .asm_35a50
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
.asm_35a13
call BattleRandom
@@ -4783,7 +4781,7 @@ BattleCommand44: ; 359e6
ld a, [wd265]
cp $a
jr nc, .asm_35a13
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld a, [hl]
ld [wd265], a
@@ -5457,13 +5455,13 @@ Function35de0: ; 35de0
ld hl, SubFadedText
call StdBattleTextBox
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call BattleCommanda7
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
call z, Function37ec7
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVarAddr
@@ -6539,15 +6537,15 @@ Function3641a: ; 3641a
and a
jr z, .Player
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call Function365d7
- call SwitchTurn
+ call BattleCommand_SwitchTurn
jr .end
.Player
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call Function365fd
- call SwitchTurn
+ call BattleCommand_SwitchTurn
.end
ld a, 1
and a
@@ -6828,7 +6826,7 @@ Function365d7: ; 365d7
ld hl, BadgeStatBoosts
call CallBattleCore
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6836,7 +6834,7 @@ Function365d7: ; 365d7
ld hl, Function3ec76
call CallBattleCore
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 365fd
@@ -6848,7 +6846,7 @@ Function365fd: ; 365fd
ld a, $5
call Function3661d
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ec39
call CallBattleCore
@@ -6856,7 +6854,7 @@ Function365fd: ; 365fd
ld hl, Function3ec76
call CallBattleCore
- jp SwitchTurn
+ jp BattleCommand_SwitchTurn
; 3661d
@@ -7056,10 +7054,10 @@ BattleCommand3e: ; 3671a
ld [de], a
jr nz, .asm_3674c ; 36730 $1a
res 1, [hl]
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call Function37962
push af
- call SwitchTurn
+ call BattleCommand_SwitchTurn
pop af
jr nz, .asm_3674c ; 3673f $b
set 7, [hl]
@@ -8823,10 +8821,10 @@ BattleCommand2c: ; 3713e
call CallBattleCore
.asm_371a9
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ccef
call CallBattleCore
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call UpdateUserInParty
call RefreshBattleHuds
ld hl, RegainedHealthText
@@ -9500,7 +9498,7 @@ BattleCommand61: ; 37874
push de
.asm_3787d
- call BattleCommand07_CalcDamageTypeMultiplier
+ call BattleCommand_CalcDamageTypeMultiplier
ld a, [InLinkBattle]
cp $3
@@ -9544,7 +9542,7 @@ BattleCommand61: ; 37874
ld a, $3
ld [wc689], a
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, AICheckPlayerMaxHP
ld a, [hBattleTurn]
and a
@@ -9557,18 +9555,18 @@ BattleCommand61: ; 37874
ld hl, GetQuarterMaxHP
call CallBattleCore
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, Function3ccef
call CallBattleCore
- call SwitchTurn
+ call BattleCommand_SwitchTurn
ld hl, RegainedHealthText
call StdBattleTextBox
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call UpdateOpponentInParty
jr .asm_37904 ; 378f1 $11
.asm_378f3
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call Function37ed5
jr nc, .asm_37904 ; 378f9 $9
call AnimateFailedMove
@@ -10094,11 +10092,11 @@ endr
rst FarCall
call AnimateCurrentMove
- call SwitchTurn
+ call BattleCommand_SwitchTurn
callab Function3ccef
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call UpdateUserInParty
; 'regained health!'
@@ -10596,11 +10594,11 @@ Function37e54: ; 37e54
push hl
push de
push bc
- call SwitchTurn
+ call BattleCommand_SwitchTurn
callab PlayBattleAnim
- call SwitchTurn
+ call BattleCommand_SwitchTurn
pop bc
pop de
pop hl
diff --git a/battle/effects/curse.asm b/battle/effects/curse.asm
index 65376a4aa..06706aba1 100644
--- a/battle/effects/curse.asm
+++ b/battle/effects/curse.asm
@@ -44,10 +44,10 @@ BattleCommand54: ; 37588
call AnimateCurrentMove
ld a, $2
call Function36532
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call BattleCommand8d
call ResetMiss
- call SwitchTurn
+ call BattleCommand_SwitchTurn
call BattleCommand70
call BattleCommand8c
call ResetMiss
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-09 03:54:25 +0000