ref: 46e66077a5a4d8d716ac3437e291c958df7809b4
parent: f0830f084f74a9187dd71b64ad77db400d541f2d
author: PikalaxALT <[email protected]>
date: Fri Nov 6 09:45:10 EST 2015
BattleCommand labels copied from macros
--- a/battle/ai/scoring.asm
+++ b/battle/ai/scoring.asm
@@ -1783,8 +1783,8 @@
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
- callab BattleCommand_DamageCalcWithStats
- callab BattleCommand_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalc
+ callab BattleCommand_Stab
pop hl
ld a, [CurDamage + 1]
ld c, a
@@ -3375,13 +3375,13 @@
ld hl, .ConstantDamageEffects
call IsInArray
jr nc, .asm_39400
- callab BattleCommand3f
+ callab BattleCommand_ConstantDamage
ret
.asm_39400
callab EnemyAttackDamage
- callab BattleCommand_DamageCalcWithStats
- callab BattleCommand_CalcDamageTypeMultiplier
+ callab BattleCommand_DamageCalc
+ callab BattleCommand_Stab
ret
.ConstantDamageEffects
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -417,7 +417,7 @@
ld [hl], a
ld [AttackMissed], a
ld [EffectFailed], a
- callba BattleCommand77
+ callba BattleCommand_AttackUp2
pop af
pop hl
ld [hl], a
@@ -424,7 +424,7 @@
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox
- callab BattleCommand8c
+ callab BattleCommand_StatMessageUser
pop af
bit SUBSTATUS_CONFUSED, a
ret nz
@@ -4238,7 +4238,7 @@
call WaitBGMap
xor a
ld [hBGMapMode], a
- call Function3f43d
+ call GetMonBackpic
xor a
ld [$ffad], a
ld [wd0d2], a
@@ -4748,7 +4748,7 @@
ld a, [hli]
ld h, [hl]
ld l, a
- ld a, BANK(BattleCommand70)
+ ld a, BANK(BattleCommand_AttackUp)
rst FarCall
pop bc
pop de
@@ -4761,7 +4761,7 @@
call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox
- callab BattleCommand8c
+ callab BattleCommand_StatMessageUser
ret
.asm_3def9
@@ -4771,13 +4771,13 @@
; 3defc
.data_3defc
- dbw HELD_ATTACK_UP, BattleCommand70
- dbw HELD_DEFENSE_UP, BattleCommand71
- dbw HELD_SPEED_UP, BattleCommand72
- dbw HELD_SP_ATTACK_UP, BattleCommand73
- dbw HELD_SP_DEFENSE_UP, BattleCommand74
- dbw HELD_ACCURACY_UP, BattleCommand75
- dbw HELD_EVASION_UP, BattleCommand76
+ dbw HELD_ATTACK_UP, BattleCommand_AttackUp
+ dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp
+ dbw HELD_SPEED_UP, BattleCommand_SpeedUp
+ dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp
+ dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
+ dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp
+ dbw HELD_EVASION_UP, BattleCommand_EvasionUp
db $ff
; 3df12
@@ -5251,7 +5251,7 @@
call ClearPalettes
call DelayFrame
call Function3ed9f
- call Function3f43d
+ call GetMonBackpic
call Function3f47c
call ExitMenu
call WaitBGMap
@@ -5284,7 +5284,7 @@
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .asm_3e25d
- call Function3f43d
+ call GetMonBackpic
.asm_3e25d
call Function3f47c
@@ -8356,7 +8356,7 @@
ret
; 3f43d
-Function3f43d: ; 3f43d
+GetMonBackpic: ; 3f43d
ld a, [PlayerSubStatus4]
bit SUBSTATUS_SUBSTITUTE, a
ld hl, BattleAnimCmd_DD
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -1,180 +1,183 @@
+
+
+
dw 0 ; padding
BattleCommandPointers: ; 3fd28
- dw BattleCommand01 ; 34084
- dw BattleCommand02 ; 343db
- dw BattleCommand03 ; 34541
- dw BattleCommand04 ; 34555
- dw BattleCommand05 ; 34631
- dw BattleCommand06 ; 352dc
- dw BattleCommand_CalcDamageTypeMultiplier ; 346d2 - 07
- dw BattleCommand08 ; 34cfd
- dw BattleCommand09 ; 34d32
+ dw BattleCommand_CheckTurn ; 34084
+ dw BattleCommand_CheckObedience ; 343db
+ dw BattleCommand_UsedMoveText ; 34541
+ dw BattleCommand_DoTurn ; 34555
+ dw BattleCommand_Critical ; 34631
+ dw BattleCommand_DamageStats ; 352dc
+ dw BattleCommand_Stab ; 346d2 - 07
+ dw BattleCommand_DamageVariation ; 34cfd
+ dw BattleCommand_CheckHit ; 34d32
dw BattleCommand0a ; 34eee
dw BattleCommand0b ; 34f60
dw BattleCommand0c ; 35004
- dw BattleCommand0d ; 35023
- dw BattleCommand0e ; 3505e
- dw BattleCommand0f ; 35175
- dw BattleCommand10 ; 351ad
- dw BattleCommand11 ; 351c0
- dw BattleCommand12 ; 35250
- dw BattleCommand13 ; 35eee
- dw BattleCommand14 ; 35e5c
- dw BattleCommand15 ; 35fff
- dw BattleCommand16 ; 36008
- dw BattleCommand17 ; 3608c
- dw BattleCommand18 ; 36102
- dw BattleCommand19 ; 36165
- dw BattleCommand1a ; 37380
- dw BattleCommand1b ; 373c9
- dw BattleCommand1c ; 361e4
- dw BattleCommand1d ; 362e3
- dw BattleCommand1e ; 3705c
- dw BattleCommand1f ; 3707f
- dw BattleCommand20 ; 3710e
- dw BattleCommand21 ; 36671
- dw BattleCommand22 ; 366e5
- dw BattleCommand23 ; 3680f
- dw BattleCommand24 ; 369b6
- dw BattleCommand25 ; 36aa0
- dw BattleCommand26 ; 36af3
- dw BattleCommand27 ; 36cb2
- dw BattleCommand28 ; 36c7e
- dw BattleCommand29 ; 36c98
- dw BattleCommand2a ; 36d3b
- dw BattleCommand2b ; 36d1d
- dw BattleCommand2c ; 3713e
- dw BattleCommand2d ; 371cd
- dw BattleCommand2e ; 372fc
- dw BattleCommand2f ; 35f2c
- dw BattleCommand30 ; 36dc7
- dw BattleCommand31 ; 36e7c
- dw BattleCommand32 ; 36f0b
- dw BattleCommand33 ; 36f46
- dw BattleCommand34 ; 37418
- dw BattleCommand35 ; 36f9d
- dw BattleCommand36 ; 36fe1
- dw BattleCommand37 ; 36fed
- dw BattleCommand38 ; 37e85
- dw BattleCommand39 ; 36b4d
- dw BattleCommand3a ; 36b3a
- dw BattleCommand3b ; 36c2d
+ dw BattleCommand_ResultText ; 35023
+ dw BattleCommand_CheckFaint ; 3505e
+ dw BattleCommand_CriticalText ; 35175
+ dw BattleCommand_SuperEffectiveText ; 351ad
+ dw BattleCommand_CheckDestinyBond ; 351c0
+ dw BattleCommand_BuildOpponentRage ; 35250
+ dw BattleCommand_PoisonTarget ; 35eee
+ dw BattleCommand_SleepTarget ; 35e5c
+ dw BattleCommand_DrainTarget ; 35fff
+ dw BattleCommand_EatDream ; 36008
+ dw BattleCommand_BurnTarget ; 3608c
+ dw BattleCommand_FreezeTarget ; 36102
+ dw BattleCommand_ParalyzeTarget ; 36165
+ dw BattleCommand_SelfDestruct ; 37380
+ dw BattleCommand_MirrorMove ; 373c9
+ dw BattleCommand_StatUp ; 361e4
+ dw BattleCommand_StatDown ; 362e3
+ dw BattleCommand_PayDay ; 3705c
+ dw BattleCommand_Conversion ; 3707f
+ dw BattleCommand_ResetStats ; 3710e
+ dw BattleCommand_StoreEnergy ; 36671
+ dw BattleCommand_UnleashEnergy ; 366e5
+ dw BattleCommand_ForceSwitch ; 3680f
+ dw BattleCommand_EndLoop ; 369b6
+ dw BattleCommand_FlinchTarget ; 36aa0
+ dw BattleCommand_OHKO ; 36af3
+ dw BattleCommand_Recoil ; 36cb2
+ dw BattleCommand_Mist ; 36c7e
+ dw BattleCommand_FocusEnergy ; 36c98
+ dw BattleCommand_Confuse ; 36d3b
+ dw BattleCommand_ConfuseTarget ; 36d1d
+ dw BattleCommand_Heal ; 3713e
+ dw BattleCommand_Transform ; 371cd
+ dw BattleCommand_Screen ; 372fc
+ dw BattleCommand_Poison ; 35f2c
+ dw BattleCommand_Paralyze ; 36dc7
+ dw BattleCommand_Substitute ; 36e7c
+ dw BattleCommand_RechargeNextTurn ; 36f0b
+ dw BattleCommand_Mimic ; 36f46
+ dw BattleCommand_Metronome ; 37418
+ dw BattleCommand_LeechSeed ; 36f9d
+ dw BattleCommand_Splash ; 36fe1
+ dw BattleCommand_Disable ; 36fed
+ dw BattleCommand_ClearText ; 37e85
+ dw BattleCommand_Charge ; 36b4d
+ dw BattleCommand_CheckCharge ; 36b3a
+ dw BattleCommand_TrapTarget ; 36c2d
dw BattleCommand3c ; 36c2c
- dw BattleCommand3d ; 36751
- dw BattleCommand3e ; 3671a
- dw BattleCommand3f ; 35726
- dw BattleCommand40 ; 35813
- dw BattleCommand41 ; 35864
- dw BattleCommand42 ; 35926
- dw BattleCommand43 ; 359d0
- dw BattleCommand44 ; 359e6
- dw BattleCommand45 ; 35a53
- dw BattleCommand46 ; 35a74
- dw BattleCommand47 ; 35b16
- dw BattleCommand48 ; 35b33
- dw BattleCommand49 ; 35bff
- dw BattleCommand4a ; 35c0f
- dw BattleCommand4b ; 35c94
- dw BattleCommand4c ; 35cc9
- dw BattleCommand4d ; 36ac9
- dw BattleCommand4e ; 346b2
- dw BattleCommand4f ; 346cd
- dw BattleCommand50 ; 37492
- dw BattleCommand51 ; 37517
- dw BattleCommand52 ; 37536
- dw BattleCommand53 ; 37563
- dw BattleCommand54 ; 37588
- dw BattleCommand55 ; 37618
- dw BattleCommand56 ; 37683
- dw BattleCommand57 ; 376a0
- dw BattleCommand58 ; 376c2
- dw BattleCommand59 ; 376f8
- dw BattleCommand5a ; 3766f
- dw BattleCommand5b ; 37718
- dw BattleCommand5c ; 37734
+ dw BattleCommand_Rampage ; 36751
+ dw BattleCommand_CheckRampage ; 3671a
+ dw BattleCommand_ConstantDamage ; 35726
+ dw BattleCommand_Counter ; 35813
+ dw BattleCommand_Encore ; 35864
+ dw BattleCommand_PainSplit ; 35926
+ dw BattleCommand_Snore ; 359d0
+ dw BattleCommand_Conversion2 ; 359e6
+ dw BattleCommand_LockOn ; 35a53
+ dw BattleCommand_Sketch ; 35a74
+ dw BattleCommand_DefrostOpponent ; 35b16
+ dw BattleCommand_SleepTalk ; 35b33
+ dw BattleCommand_DestinyBond ; 35bff
+ dw BattleCommand_Spite ; 35c0f
+ dw BattleCommand_FalseSwipe ; 35c94
+ dw BattleCommand_HealBell ; 35cc9
+ dw BattleCommand_KingsRock ; 36ac9
+ dw BattleCommand_TripleKick ; 346b2
+ dw BattleCommand_KickCounter ; 346cd
+ dw BattleCommand_Thief ; 37492
+ dw BattleCommand_ArenaTrap ; 37517
+ dw BattleCommand_Nightmare ; 37536
+ dw BattleCommand_Defrost ; 37563
+ dw BattleCommand_Curse ; 37588
+ dw BattleCommand_Protect ; 37618
+ dw BattleCommand_Spikes ; 37683
+ dw BattleCommand_Foresight ; 376a0
+ dw BattleCommand_PerishSong ; 376c2
+ dw BattleCommand_StartSandstorm ; 376f8
+ dw BattleCommand_Endure ; 3766f
+ dw BattleCommand_CheckCurl ; 37718
+ dw BattleCommand_RolloutPower ; 37734
dw BattleCommand5d ; 37791
- dw BattleCommand5e ; 37792
- dw BattleCommand5f ; 377ce
- dw BattleCommand60 ; 3784b
- dw BattleCommand61 ; 37874
- dw BattleCommand_DamageCalcWithStats ; 35612 - 62
- dw BattleCommand63 ; 3790e
- dw BattleCommand64 ; 37939
- dw BattleCommand65 ; 37972
- dw BattleCommand66 ; 37991
- dw BattleCommand67 ; 379c9
- dw BattleCommand68 ; 37b1d
- dw BattleCommand69 ; 37b39
- dw BattleCommand6a ; 37b74
- dw BattleCommand6b ; 37b78
- dw BattleCommand6c ; 37b7c
- dw BattleCommand6d ; 37be8
- dw BattleCommand6e ; 37bf4
- dw BattleCommand6f ; 37c07
- dw BattleCommand70 ; 361ac
- dw BattleCommand71 ; 361b0
- dw BattleCommand72 ; 361b4
- dw BattleCommand73 ; 361b8
- dw BattleCommand74 ; 361bc
- dw BattleCommand75 ; 361c0
- dw BattleCommand76 ; 361c4
- dw BattleCommand77 ; 361c8
- dw BattleCommand78 ; 361cc
- dw BattleCommand79 ; 361d0
- dw BattleCommand7a ; 361d4
- dw BattleCommand7b ; 361d8
- dw BattleCommand7c ; 361dc
- dw BattleCommand7d ; 361e0
- dw BattleCommand7e ; 362ad
- dw BattleCommand7f ; 362b1
- dw BattleCommand80 ; 362b5
- dw BattleCommand81 ; 362b9
- dw BattleCommand82 ; 362bd
- dw BattleCommand83 ; 362c1
- dw BattleCommand84 ; 362c5
- dw BattleCommand85 ; 362c9
- dw BattleCommand86 ; 362cd
- dw BattleCommand87 ; 362d1
- dw BattleCommand88 ; 362d5
- dw BattleCommand89 ; 362d9
- dw BattleCommand8a ; 362dd
- dw BattleCommand8b ; 362e1
- dw BattleCommand8c ; 363b8
- dw BattleCommand8d ; 363e9
- dw BattleCommand8e ; 3644c
- dw BattleCommand8f ; 3646a
- dw BattleCommand90 ; 34ecc
+ dw BattleCommand_FuryCutter ; 37792
+ dw BattleCommand_Attract ; 377ce
+ dw BattleCommand_HappinessPower ; 3784b
+ dw BattleCommand_Present ; 37874
+ dw BattleCommand_DamageCalc ; 35612 - 62
+ dw BattleCommand_FrustrationPower ; 3790e
+ dw BattleCommand_Safeguard ; 37939
+ dw BattleCommand_CheckSafeguard ; 37972
+ dw BattleCommand_GetMagnitude ; 37991
+ dw BattleCommand_BatonPass ; 379c9
+ dw BattleCommand_Pursuit ; 37b1d
+ dw BattleCommand_ClearHazards ; 37b39
+ dw BattleCommand_HealMorn ; 37b74
+ dw BattleCommand_HealDay ; 37b78
+ dw BattleCommand_HealNite ; 37b7c
+ dw BattleCommand_HiddenPower ; 37be8
+ dw BattleCommand_StartRain ; 37bf4
+ dw BattleCommand_StartSun ; 37c07
+ dw BattleCommand_AttackUp ; 361ac
+ dw BattleCommand_DefenseUp ; 361b0
+ dw BattleCommand_SpeedUp ; 361b4
+ dw BattleCommand_SpecialAttackUp ; 361b8
+ dw BattleCommand_SpecialDefenseUp ; 361bc
+ dw BattleCommand_AccuracyUp ; 361c0
+ dw BattleCommand_EvasionUp ; 361c4
+ dw BattleCommand_AttackUp2 ; 361c8
+ dw BattleCommand_DefenseUp2 ; 361cc
+ dw BattleCommand_SpeedUp2 ; 361d0
+ dw BattleCommand_SpecialAttackUp2 ; 361d4
+ dw BattleCommand_SpecialDefenseUp2 ; 361d8
+ dw BattleCommand_AccuracyUp2 ; 361dc
+ dw BattleCommand_EvasionUp2 ; 361e0
+ dw BattleCommand_AttackDown ; 362ad
+ dw BattleCommand_DefenseDown ; 362b1
+ dw BattleCommand_SpeedDown ; 362b5
+ dw BattleCommand_SpecialAttackDown ; 362b9
+ dw BattleCommand_SpecialDefenseDown ; 362bd
+ dw BattleCommand_AccuracyDown ; 362c1
+ dw BattleCommand_EvasionDown ; 362c5
+ dw BattleCommand_AttackDown2 ; 362c9
+ dw BattleCommand_DefenseDown2 ; 362cd
+ dw BattleCommand_SpeedDown2 ; 362d1
+ dw BattleCommand_SpecialAttackDown2 ; 362d5
+ dw BattleCommand_SpecialDefenseDown2 ; 362d9
+ dw BattleCommand_AccuracyDown2 ; 362dd
+ dw BattleCommand_EvasionDown2 ; 362e1
+ dw BattleCommand_StatMessageUser ; 363b8
+ dw BattleCommand_StatMessageTarget ; 363e9
+ dw BattleCommand_StatUpFailText ; 3644c
+ dw BattleCommand_StatDownFailText ; 3646a
+ dw BattleCommand_EffectChance ; 34ecc
dw BattleCommand91 ; 34fdb
dw BattleCommand92 ; 34fd1
dw BattleCommand_SwitchTurn ; 34ffd - 93
- dw BattleCommand94 ; 36a82
- dw BattleCommand95 ; 37c1a
- dw BattleCommand96 ; 37c55
- dw BattleCommand97 ; 36f1d
- dw BattleCommand98 ; 36f25
- dw BattleCommand99 ; 36f2f
- dw BattleCommand9a ; 37c95
- dw BattleCommand9b ; 37d0d
- dw BattleCommand9c ; 37d34
- dw BattleCommand9d ; 37ce6
- dw BattleCommand9e ; 37d02
- dw BattleCommand9f ; 37d94
- dw BattleCommanda0 ; 36778
- dw BattleCommanda1 ; 35461
- dw BattleCommanda2 ; 3527b
+ dw BattleCommand_FakeOut ; 36a82
+ dw BattleCommand_BellyDrum ; 37c1a
+ dw BattleCommand_PsychUp ; 37c55
+ dw BattleCommand_Rage ; 36f1d
+ dw BattleCommand_DoubleFlyingDamage ; 36f25
+ dw BattleCommand_DoubleUndergroundDamage ; 36f2f
+ dw BattleCommand_MirrorCoat ; 37c95
+ dw BattleCommand_CheckFutureSight ; 37d0d
+ dw BattleCommand_FutureSight ; 37d34
+ dw BattleCommand_DoubleMinimizeDamage ; 37ce6
+ dw BattleCommand_SkipSunCharge ; 37d02
+ dw BattleCommand_ThunderAccuracy ; 37d94
+ dw BattleCommand_Teleport ; 36778
+ dw BattleCommand_BeatUp ; 35461
+ dw BattleCommand_RageDamage ; 3527b
dw BattleCommanda3 ; 34833
- dw BattleCommanda4 ; 36500
+ dw BattleCommand_AllStatsUp ; 36500
dw BattleCommanda5 ; 35165
dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5
- dw BattleCommand_IfAttackMissedResetDamage ; 355d5 - a9
- dw BattleCommandaa ; 37e80
- dw BattleCommandab ; 34f57
- dw BattleCommandac ; 3658f
- dw BattleCommandad ; 351a5
- dw BattleCommandae ; 35197
- dw BattleCommandaf ; 365a7
+ dw BattleCommand_ClearMissDamage ; 355d5 - a9
+ dw BattleCommand_MoveDelay ; 37e80
+ dw BattleCommand_HitTarget ; 34f57
+ dw BattleCommand_TriStatusChance ; 3658f
+ dw BattleCommand_SuperEffectiveLoopText ; 351a5
+ dw BattleCommand_StartLoop ; 35197
+ dw BattleCommand_Curl ; 365a7
; 3fe86
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -17,9 +17,9 @@
jr z, DoTurn
ld a, [wBattleAction]
- cp $e
+ cp BATTLEACTION_E
jr z, DoTurn
- cp NUM_MOVES
+ cp BATTLEACTION_SWITCH1
ret nc
; fallthrough
@@ -119,7 +119,7 @@
CheckTurn:
-BattleCommand01: ; 34084
+BattleCommand_CheckTurn: ; 34084
; checkturn
; Repurposed as hardcoded turn handling. Useless as a command.
@@ -539,7 +539,7 @@
ld hl, HurtItselfText
call StdBattleTextBox
call Function355dd
- call BattleCommand_DamageCalcWithStats
+ call BattleCommand_DamageCalc
call BattleCommand0a
xor a
ld [wcfca], a
@@ -652,7 +652,7 @@
ld [CriticalHit], a
call Function355dd
- call BattleCommand_DamageCalcWithStats
+ call BattleCommand_DamageCalc
call BattleCommand0a
xor a
@@ -675,7 +675,7 @@
; 343db
-BattleCommand02: ; 343db
+BattleCommand_CheckObedience: ; 343db
; checkobedience
; Enemy can't disobey
@@ -1006,7 +1006,7 @@
; 34541
-BattleCommand03: ; 34541
+BattleCommand_UsedMoveText: ; 34541
; usedmovetext
callba DisplayUsedMoveText
ret
@@ -1026,7 +1026,7 @@
; 34555
-BattleCommand04: ; 34555
+BattleCommand_DoTurn: ; 34555
call Function34548
ret nz
@@ -1098,10 +1098,10 @@
ld a, [hBattleTurn]
and a
ld a, [CurMoveNum]
- jr z, .asm_345b8
+ jr z, .okay
ld a, [CurEnemyMoveNum]
-.asm_345b8
+.okay
ld c, a
ld b, 0
add hl, bc
@@ -1120,20 +1120,20 @@
add hl, bc
ld a, [hl]
cp MIMIC
- jr z, .asm_345dc
- ld hl, wc735
+ jr z, .mimic
+ ld hl, wCaughtMonMoves
add hl, bc
ld a, [hl]
cp MIMIC
ret z
-.asm_345dc
- ld hl, wc739
+.mimic
+ ld hl, wCaughtMonPP
call .asm_345ad
ret
.asm_345e3
- call BattleCommandaa
+ call BattleCommand_MoveDelay
; get move effect
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@@ -1197,7 +1197,7 @@
; 34631
-BattleCommand05: ; 34631
+BattleCommand_Critical: ; 34631
; critical
; Determine whether this attack's hit will be critical.
@@ -1297,7 +1297,7 @@
; 346b2
-BattleCommand4e: ; 346b2
+BattleCommand_TripleKick: ; 346b2
; triplekick
ld a, [wc689]
@@ -1327,7 +1327,7 @@
; 346cd
-BattleCommand4f: ; 346cd
+BattleCommand_KickCounter: ; 346cd
; kickcounter
ld hl, wc689
@@ -1336,7 +1336,7 @@
; 346d2
-BattleCommand_CalcDamageTypeMultiplier: ; 346d2
+BattleCommand_Stab: ; 346d2
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@@ -2285,7 +2285,7 @@
; 34cfd
-BattleCommand08: ; 34cfd
+BattleCommand_DamageVariation: ; 34cfd
; damagevariation
; Modify the damage spread between 85% and 100%.
@@ -2340,7 +2340,7 @@
; 34d32
-BattleCommand09: ; 34d32
+BattleCommand_CheckHit: ; 34d32
; checkhit
call .DreamEater
@@ -2662,7 +2662,7 @@
; 34ecc
-BattleCommand90: ; 34ecc
+BattleCommand_EffectChance: ; 34ecc
; effectchance
xor a
@@ -2738,7 +2738,7 @@
.asm_34f36
call BattleCommanda7
- jp BattleCommandaa
+ jp BattleCommand_MoveDelay
.Rampage
ld a, BATTLE_VARS_MOVE_EFFECT
@@ -2761,7 +2761,7 @@
; 34f57
-BattleCommandab: ; 34f57
+BattleCommand_HitTarget: ; 34f57
; hittarget
call BattleCommand0a
call BattleCommand0b
@@ -2772,7 +2772,7 @@
BattleCommand0b: ; 34f60
ld a, [AttackMissed]
and a
- jp nz, BattleCommandaa
+ jp nz, BattleCommand_MoveDelay
ld a, [hBattleTurn]
and a
@@ -2840,7 +2840,7 @@
BattleCommand92: ; 34fd1
ld a, [AttackMissed]
and a
- jp nz, BattleCommandaa
+ jp nz, BattleCommand_MoveDelay
xor a
jr BattleCommand91_92
@@ -2850,7 +2850,7 @@
BattleCommand91: ; 34fdb
ld a, [AttackMissed]
and a
- jp nz, BattleCommandaa
+ jp nz, BattleCommand_MoveDelay
ld a, [hBattleTurn]
and a
@@ -2905,7 +2905,7 @@
; 35023
-BattleCommand0d: ; 35023
+BattleCommand_ResultText: ; 35023
; resulttext
ld a, [AttackMissed]
and a
@@ -2946,7 +2946,7 @@
; 3505e
-BattleCommand0e: ; 3505e
+BattleCommand_CheckFaint: ; 3505e
; checkfaint
ld a, BATTLE_VARS_SUBSTATUS1_OPP
@@ -2953,7 +2953,7 @@
call GetBattleVar
bit SUBSTATUS_ENDURE, a
jr z, .asm_35072
- call BattleCommand4b
+ call BattleCommand_FalseSwipe
ld b, $0
jr nc, .asm_3508b
ld b, $1
@@ -2968,7 +2968,7 @@
call BattleRandom
cp c
jr nc, .asm_3508b
- call BattleCommand4b
+ call BattleCommand_FalseSwipe
ld b, $0
jr nc, .asm_3508b
ld b, $2
@@ -3117,7 +3117,7 @@
; 35175
-BattleCommand0f: ; 35175
+BattleCommand_CriticalText: ; 35175
; criticaltext
; Prints the message for critical hits or one-hit KOs.
@@ -3150,7 +3150,7 @@
; 35197
-BattleCommandae: ; 35197
+BattleCommand_StartLoop: ; 35197
; startloop
ld hl, PlayerRolloutCount
@@ -3165,7 +3165,7 @@
; 351a5
-BattleCommandad: ; 351a5
+BattleCommand_SuperEffectiveLoopText: ; 351a5
; supereffectivelooptext
ld a, BATTLE_VARS_SUBSTATUS3
@@ -3177,7 +3177,7 @@
; 351ad
-BattleCommand10: ; 351ad
+BattleCommand_SuperEffectiveText: ; 351ad
; supereffectivetext
ld a, [TypeModifier]
@@ -3192,7 +3192,7 @@
; 351c0
-BattleCommand11: ; 351c0
+BattleCommand_CheckDestinyBond: ; 351c0
; checkdestinybond
; Faint the user if it fainted an opponent using Destiny Bond.
@@ -3281,7 +3281,7 @@
; 35250
-BattleCommand12: ; 35250
+BattleCommand_BuildOpponentRage: ; 35250
; buildopponentrage
jp .start
@@ -3313,7 +3313,7 @@
; 3527b
-BattleCommanda2: ; 3527b
+BattleCommand_RageDamage: ; 3527b
; ragedamage
ld a, [CurDamage]
@@ -3395,7 +3395,7 @@
; 352dc
-BattleCommand06: ; 352dc
+BattleCommand_DamageStats: ; 352dc
; damagestats
ld a, [hBattleTurn]
@@ -3744,7 +3744,7 @@
; 35461
-BattleCommanda1: ; 35461
+BattleCommand_BeatUp: ; 35461
; beatup
call ResetDamage
@@ -3956,7 +3956,7 @@
ret
-BattleCommand_IfAttackMissedResetDamage: ; 355d5
+BattleCommand_ClearMissDamage: ; 355d5
; clearmissdamage
ld a, [AttackMissed]
and a
@@ -4004,7 +4004,7 @@
; 35612
-BattleCommand_DamageCalcWithStats: ; 35612
+BattleCommand_DamageCalc: ; 35612
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@@ -4262,7 +4262,7 @@
; 35726
-BattleCommand3f: ; 35726
+BattleCommand_ConstantDamage: ; 35726
; constantdamage
ld hl, BattleMonLevel
@@ -4412,7 +4412,7 @@
call EnemyAttackDamage
.notEnemysTurn
- call BattleCommand_DamageCalcWithStats
+ call BattleCommand_DamageCalc
pop hl
ld [hl], 1
ret
@@ -4428,7 +4428,7 @@
; 35813
-BattleCommand40: ; 35813
+BattleCommand_Counter: ; 35813
; counter
ld a, 1
@@ -4489,7 +4489,7 @@
; 35864
-BattleCommand41: ; 35864
+BattleCommand_Encore: ; 35864
; encore
ld hl, EnemyMonMoves
@@ -4613,7 +4613,7 @@
; 35926
-BattleCommand42: ; 35926
+BattleCommand_PainSplit: ; 35926
; painsplit
ld a, [AttackMissed]
@@ -4715,7 +4715,7 @@
; 359d0
-BattleCommand43: ; 359d0
+BattleCommand_Snore: ; 359d0
; snore
ld a, BATTLE_VARS_STATUS
call GetBattleVar
@@ -4729,7 +4729,7 @@
; 359e6
-BattleCommand44: ; 359e6
+BattleCommand_Conversion2: ; 359e6
; conversion2
ld a, [AttackMissed]
@@ -4796,7 +4796,7 @@
; 35a53
-BattleCommand45: ; 35a53
+BattleCommand_LockOn: ; 35a53
; lockon
call CheckSubstituteOpp
@@ -4820,7 +4820,7 @@
; 35a74
-BattleCommand46: ; 35a74
+BattleCommand_Sketch: ; 35a74
; sketch
call Function372d8
@@ -4927,7 +4927,7 @@
; 35b16
-BattleCommand47: ; 35b16
+BattleCommand_DefrostOpponent: ; 35b16
; defrostopponent
; Thaw the opponent if frozen, and
; raise the user's Attack one stage.
@@ -4946,7 +4946,7 @@
ld a, EFFECT_ATTACK_UP
ld [hl], a
- call BattleCommand1c
+ call BattleCommand_StatUp
pop af
pop hl
@@ -4955,7 +4955,7 @@
; 35b33
-BattleCommand48: ; 35b33
+BattleCommand_SleepTalk: ; 35b33
; sleeptalk
call Function372d8
@@ -5100,7 +5100,7 @@
; 35bff
-BattleCommand49: ; 35bff
+BattleCommand_DestinyBond: ; 35bff
; destinybond
ld a, BATTLE_VARS_SUBSTATUS5
@@ -5112,7 +5112,7 @@
; 35c0f
-BattleCommand4a: ; 35c0f
+BattleCommand_Spite: ; 35c0f
; spite
ld a, [AttackMissed]
@@ -5200,7 +5200,7 @@
; 35c94
-BattleCommand4b: ; 35c94
+BattleCommand_FalseSwipe: ; 35c94
; falseswipe
ld hl, EnemyMonHP
@@ -5244,7 +5244,7 @@
; 35cc9
-BattleCommand4c: ; 35cc9
+BattleCommand_HealBell: ; 35cc9
; healbell
ld a, BATTLE_VARS_SUBSTATUS1
@@ -5505,7 +5505,7 @@
; 35e5c
-BattleCommand14: ; 35e5c
+BattleCommand_SleepTarget: ; 35e5c
; sleeptarget
call GetOpponentItem
@@ -5608,7 +5608,7 @@
; 35eee
-BattleCommand13: ; 35eee
+BattleCommand_PoisonTarget: ; 35eee
; poisontarget
call CheckSubstituteOpp
@@ -5644,7 +5644,7 @@
; 35f2c
-BattleCommand2f: ; 35f2c
+BattleCommand_Poison: ; 35f2c
; poison
ld hl, DoesntAffectText
@@ -5782,7 +5782,7 @@
; 35fff
-BattleCommand15: ; 35fff
+BattleCommand_DrainTarget: ; 35fff
; draintarget
call Function36011
ld hl, SuckedHealthText
@@ -5790,7 +5790,7 @@
; 36008
-BattleCommand16: ; 36008
+BattleCommand_EatDream: ; 36008
; eatdream
call Function36011
ld hl, DreamEatenText
@@ -5880,7 +5880,7 @@
; 3608c
-BattleCommand17: ; 3608c
+BattleCommand_BurnTarget: ; 3608c
; burntarget
xor a
@@ -5950,7 +5950,7 @@
; 36102
-BattleCommand18: ; 36102
+BattleCommand_FreezeTarget: ; 36102
; freezetarget
xor a
@@ -6004,7 +6004,7 @@
; 36165
-BattleCommand19: ; 36165
+BattleCommand_ParalyzeTarget: ; 36165
; paralyzetarget
xor a
@@ -6042,63 +6042,63 @@
; 361ac
-BattleCommand70: ; 361ac
+BattleCommand_AttackUp: ; 361ac
; attackup
ld b, $0
- jr BattleCommand1c
-BattleCommand71: ; 361b0
+ jr BattleCommand_StatUp
+BattleCommand_DefenseUp: ; 361b0
; defenseup
ld b, $1
- jr BattleCommand1c
-BattleCommand72: ; 361b4
+ jr BattleCommand_StatUp
+BattleCommand_SpeedUp: ; 361b4
; speedup
ld b, $2
- jr BattleCommand1c
-BattleCommand73: ; 361b8
+ jr BattleCommand_StatUp
+BattleCommand_SpecialAttackUp: ; 361b8
; specialattackup
ld b, $3
- jr BattleCommand1c
-BattleCommand74: ; 361bc
+ jr BattleCommand_StatUp
+BattleCommand_SpecialDefenseUp: ; 361bc
; specialdefenseup
ld b, $4
- jr BattleCommand1c
-BattleCommand75: ; 361c0
+ jr BattleCommand_StatUp
+BattleCommand_AccuracyUp: ; 361c0
; accuracyup
ld b, $5
- jr BattleCommand1c
-BattleCommand76: ; 361c4
+ jr BattleCommand_StatUp
+BattleCommand_EvasionUp: ; 361c4
; evasionup
ld b, $6
- jr BattleCommand1c
-BattleCommand77: ; 361c8
+ jr BattleCommand_StatUp
+BattleCommand_AttackUp2: ; 361c8
; attackup2
ld b, $10
- jr BattleCommand1c
-BattleCommand78: ; 361cc
+ jr BattleCommand_StatUp
+BattleCommand_DefenseUp2: ; 361cc
; defenseup2
ld b, $11
- jr BattleCommand1c
-BattleCommand79: ; 361d0
+ jr BattleCommand_StatUp
+BattleCommand_SpeedUp2: ; 361d0
; speedup2
ld b, $12
- jr BattleCommand1c
-BattleCommand7a: ; 361d4
+ jr BattleCommand_StatUp
+BattleCommand_SpecialAttackUp2: ; 361d4
; specialattackup2
ld b, $13
- jr BattleCommand1c
-BattleCommand7b: ; 361d8
+ jr BattleCommand_StatUp
+BattleCommand_SpecialDefenseUp2: ; 361d8
; specialdefenseup2
ld b, $14
- jr BattleCommand1c
-BattleCommand7c: ; 361dc
+ jr BattleCommand_StatUp
+BattleCommand_AccuracyUp2: ; 361dc
; accuracyup2
ld b, $15
- jr BattleCommand1c
-BattleCommand7d: ; 361e0
+ jr BattleCommand_StatUp
+BattleCommand_EvasionUp2: ; 361e0
; evasionup2
ld b, $16
- jr BattleCommand1c
-BattleCommand1c: ; 361e4
+ jr BattleCommand_StatUp
+BattleCommand_StatUp: ; 361e4
; statup
call CheckIfStatCanBeRaised
ld a, [FailedMessage]
@@ -6232,67 +6232,67 @@
ld [$ffd4], a
call CallBattleCore
call WaitBGMap
- jp BattleCommandaa
+ jp BattleCommand_MoveDelay
; 362ad
-BattleCommand7e: ; 362ad
+BattleCommand_AttackDown: ; 362ad
; attackdown
ld a, ATTACK
- jr BattleCommand1d
-BattleCommand7f: ; 362b1
+ jr BattleCommand_StatDown
+BattleCommand_DefenseDown: ; 362b1
; defensedown
ld a, DEFENSE
- jr BattleCommand1d
-BattleCommand80: ; 362b5
+ jr BattleCommand_StatDown
+BattleCommand_SpeedDown: ; 362b5
; speeddown
ld a, SPEED
- jr BattleCommand1d
-BattleCommand81: ; 362b9
+ jr BattleCommand_StatDown
+BattleCommand_SpecialAttackDown: ; 362b9
; specialattackdown
ld a, SP_ATTACK
- jr BattleCommand1d
-BattleCommand82: ; 362bd
+ jr BattleCommand_StatDown
+BattleCommand_SpecialDefenseDown: ; 362bd
; specialdefensedown
ld a, SP_DEFENSE
- jr BattleCommand1d
-BattleCommand83: ; 362c1
+ jr BattleCommand_StatDown
+BattleCommand_AccuracyDown: ; 362c1
; accuracydown
ld a, ACCURACY
- jr BattleCommand1d
-BattleCommand84: ; 362c5
+ jr BattleCommand_StatDown
+BattleCommand_EvasionDown: ; 362c5
; evasiondown
ld a, EVASION
- jr BattleCommand1d
-BattleCommand85: ; 362c9
+ jr BattleCommand_StatDown
+BattleCommand_AttackDown2: ; 362c9
; attackdown2
ld a, $10 | ATTACK
- jr BattleCommand1d
-BattleCommand86: ; 362cd
+ jr BattleCommand_StatDown
+BattleCommand_DefenseDown2: ; 362cd
; defensedown2
ld a, $10 | DEFENSE
- jr BattleCommand1d
-BattleCommand87: ; 362d1
+ jr BattleCommand_StatDown
+BattleCommand_SpeedDown2: ; 362d1
; speeddown2
ld a, $10 | SPEED
- jr BattleCommand1d
-BattleCommand88: ; 362d5
+ jr BattleCommand_StatDown
+BattleCommand_SpecialAttackDown2: ; 362d5
; specialattackdown2
ld a, $10 | SP_ATTACK
- jr BattleCommand1d
-BattleCommand89: ; 362d9
+ jr BattleCommand_StatDown
+BattleCommand_SpecialDefenseDown2: ; 362d9
; specialdefensedown2
ld a, $10 | SP_DEFENSE
- jr BattleCommand1d
-BattleCommand8a: ; 362dd
+ jr BattleCommand_StatDown
+BattleCommand_AccuracyDown2: ; 362dd
; accuracydown2
ld a, $10 | ACCURACY
- jr BattleCommand1d
-BattleCommand8b: ; 362e1
+ jr BattleCommand_StatDown
+BattleCommand_EvasionDown2: ; 362e1
; evasiondown2
ld a, $10 | EVASION
-BattleCommand1d: ; 362e3
+BattleCommand_StatDown: ; 362e3
; statdown
ld [LoweredStat], a
@@ -6443,7 +6443,7 @@
; 363b8
-BattleCommand8c: ; 363b8
+BattleCommand_StatMessageUser: ; 363b8
ld a, [FailedMessage]
and a
ret nz
@@ -6477,7 +6477,7 @@
; 363e9
-BattleCommand8d: ; 363e9
+BattleCommand_StatMessageTarget: ; 363e9
ld a, [FailedMessage]
and a
ret nz
@@ -6555,13 +6555,13 @@
; 3644c
-BattleCommand8e: ; 3644c
+BattleCommand_StatUpFailText: ; 3644c
; statupfailtext
ld a, [FailedMessage]
and a
ret z
push af
- call BattleCommandaa
+ call BattleCommand_MoveDelay
pop af
dec a
jp z, TryPrintButItFailed
@@ -6575,13 +6575,13 @@
; 3646a
-BattleCommand8f: ; 3646a
+BattleCommand_StatDownFailText: ; 3646a
; statdownfailtext
ld a, [FailedMessage]
and a
ret z
push af
- call BattleCommandaa
+ call BattleCommand_MoveDelay
pop af
dec a
jp z, TryPrintButItFailed
@@ -6647,33 +6647,33 @@
; 36500
-BattleCommanda4: ; 36500
+BattleCommand_AllStatsUp: ; 36500
; allstatsup
; Attack
call ResetMiss
- call BattleCommand70
- call BattleCommand8c
+ call BattleCommand_AttackUp
+ call BattleCommand_StatMessageUser
; Defense
call ResetMiss
- call BattleCommand71
- call BattleCommand8c
+ call BattleCommand_DefenseUp
+ call BattleCommand_StatMessageUser
; Speed
call ResetMiss
- call BattleCommand72
- call BattleCommand8c
+ call BattleCommand_SpeedUp
+ call BattleCommand_StatMessageUser
; Special Attack
call ResetMiss
- call BattleCommand73
- call BattleCommand8c
+ call BattleCommand_SpecialAttackUp
+ call BattleCommand_StatMessageUser
; Special Defense
call ResetMiss
- call BattleCommand74
- jp BattleCommand8c
+ call BattleCommand_SpecialDefenseUp
+ jp BattleCommand_StatMessageUser
; 3652d
@@ -6757,10 +6757,10 @@
; 3658f
-BattleCommandac: ; 3658f
+BattleCommand_TriStatusChance: ; 3658f
; tristatuschance
- call BattleCommand90
+ call BattleCommand_EffectChance
; 1/3 chance of each status
.loop
@@ -6774,13 +6774,13 @@
rst JumpTable
ret
.ptrs
- dw BattleCommand19 ; paralyze
- dw BattleCommand18 ; freeze
- dw BattleCommand17 ; burn
+ dw BattleCommand_ParalyzeTarget ; paralyze
+ dw BattleCommand_FreezeTarget ; freeze
+ dw BattleCommand_BurnTarget ; burn
; 365a7
-BattleCommandaf: ; 365a7
+BattleCommand_Curl: ; 365a7
; curl
ld a, BATTLE_VARS_SUBSTATUS2
call GetBattleVarAddr
@@ -6790,7 +6790,7 @@
BattleCommanda6: ; 365af
- ld hl, Function3f43d
+ ld hl, GetMonBackpic
ld a, [hBattleTurn]
and a
jr z, .asm_365ba ; 365b5 $3
@@ -6932,7 +6932,7 @@
; 36671
-BattleCommand21: ; 36671
+BattleCommand_StoreEnergy: ; 36671
; storeenergy
ld a, BATTLE_VARS_SUBSTATUS3
@@ -7005,7 +7005,7 @@
; 366e5
-BattleCommand22: ; 366e5
+BattleCommand_UnleashEnergy: ; 366e5
; unleashenergy
ld de, PlayerDamageTaken
@@ -7038,7 +7038,7 @@
; 3671a
-BattleCommand3e: ; 3671a
+BattleCommand_CheckRampage: ; 3671a
; checkrampage
ld de, PlayerRolloutCount
@@ -7076,7 +7076,7 @@
; 36751
-BattleCommand3d: ; 36751
+BattleCommand_Rampage: ; 36751
; rampage
; No rampage during Sleep Talk.
@@ -7104,7 +7104,7 @@
; 36778
-BattleCommanda0: ; 36778
+BattleCommand_Teleport: ; 36778
; teleport
ld a, [BattleType]
@@ -7196,7 +7196,7 @@
; 3680f
-BattleCommand23: ; 3680f
+BattleCommand_ForceSwitch: ; 3680f
; forceswitch
ld a, [BattleType]
@@ -7391,7 +7391,7 @@
.asm_36969
call BattleCommand0a
- call BattleCommandaa
+ call BattleCommand_MoveDelay
call BattleCommand0c
jp PrintButItFailed
@@ -7445,7 +7445,7 @@
; 369b6
-BattleCommand24: ; 369b6
+BattleCommand_EndLoop: ; 369b6
; endloop
; Loop back to the command before 'critical'.
@@ -7578,7 +7578,7 @@
; 36a82
-BattleCommand94: ; 36a82
+BattleCommand_FakeOut: ; 36a82
ld a, [AttackMissed]
and a
ret nz
@@ -7601,7 +7601,7 @@
; 36aa0
-BattleCommand25: ; 36aa0
+BattleCommand_FlinchTarget: ; 36aa0
call CheckSubstituteOpp
ret nz
@@ -7640,7 +7640,7 @@
; 36ac9
-BattleCommand4d: ; 36ac9
+BattleCommand_KingsRock: ; 36ac9
; kingsrock
ld a, [AttackMissed]
@@ -7670,7 +7670,7 @@
; 36af3
-BattleCommand26: ; 36af3
+BattleCommand_OHKO: ; 36af3
; ohko
call ResetDamage
@@ -7700,7 +7700,7 @@
ld a, $ff
.asm_36b1e
ld [bc], a
- call BattleCommand09
+ call BattleCommand_CheckHit
ld hl, CurDamage
ld a, $ff
ld [hli], a
@@ -7717,7 +7717,7 @@
; 36b3a
-BattleCommand3a: ; 36b3a
+BattleCommand_CheckCharge: ; 36b3a
; checkcharge
ld a, BATTLE_VARS_SUBSTATUS3
@@ -7732,16 +7732,16 @@
; 36b4d
-BattleCommand39: ; 36b4d
+BattleCommand_Charge: ; 36b4d
; charge
- call BattleCommand38
+ call BattleCommand_ClearText
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
jr z, .asm_36b65
- call BattleCommandaa
+ call BattleCommand_MoveDelay
call BattleCommand0c
call PrintButItFailed
jp EndMoveEffect
@@ -7881,7 +7881,7 @@
; 36c2d
-BattleCommand3b: ; 36c2d
+BattleCommand_TrapTarget: ; 36c2d
; traptarget
ld a, [AttackMissed]
@@ -7939,7 +7939,7 @@
; 36c7e
-BattleCommand28: ; 36c7e
+BattleCommand_Mist: ; 36c7e
; mist
ld a, BATTLE_VARS_SUBSTATUS4
@@ -7956,7 +7956,7 @@
; 36c98
-BattleCommand29: ; 36c98
+BattleCommand_FocusEnergy: ; 36c98
; focusenergy
ld a, BATTLE_VARS_SUBSTATUS4
@@ -7973,7 +7973,7 @@
; 36cb2
-BattleCommand27: ; 36cb2
+BattleCommand_Recoil: ; 36cb2
; recoil
ld hl, BattleMonMaxHP
@@ -8039,7 +8039,7 @@
; 36d1d
-BattleCommand2b: ; 36d1d
+BattleCommand_ConfuseTarget: ; 36d1d
; confusetarget
call GetOpponentItem
@@ -8060,7 +8060,7 @@
jr Function36d70
-BattleCommand2a: ; 36d3b
+BattleCommand_Confuse: ; 36d3b
; confuse
call GetOpponentItem
@@ -8151,7 +8151,7 @@
; 36dc7
-BattleCommand30: ; 36dc7
+BattleCommand_Paralyze: ; 36dc7
; paralyze
ld a, BATTLE_VARS_STATUS_OPP
@@ -8267,10 +8267,10 @@
; 36e7c
-BattleCommand31: ; 36e7c
+BattleCommand_Substitute: ; 36e7c
; substitute
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld hl, BattleMonMaxHP
ld de, PlayerSubstituteHP
ld a, [hBattleTurn]
@@ -8358,7 +8358,7 @@
jp StdBattleTextBox
; 36f0b
-BattleCommand32: ; 36f0b
+BattleCommand_RechargeNextTurn: ; 36f0b
; rechargenextturn
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr
@@ -8377,7 +8377,7 @@
; 36f1d
-BattleCommand97: ; 36f1d
+BattleCommand_Rage: ; 36f1d
; rage
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVarAddr
@@ -8386,7 +8386,7 @@
; 36f25
-BattleCommand98: ; 36f25
+BattleCommand_DoubleFlyingDamage: ; 36f25
; doubleflyingdamage
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
@@ -8396,7 +8396,7 @@
; 36f2f
-BattleCommand99: ; 36f2f
+BattleCommand_DoubleUndergroundDamage: ; 36f2f
; doubleundergrounddamage
ld a, BATTLE_VARS_SUBSTATUS3_OPP
call GetBattleVar
@@ -8422,11 +8422,11 @@
; 36f46
-BattleCommand33: ; 36f46
+BattleCommand_Mimic: ; 36f46
; mimic
call Function372d8
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld a, [AttackMissed]
and a
jr nz, .asm_36f9a
@@ -8474,7 +8474,7 @@
; 36f9d
-BattleCommand35: ; 36f9d
+BattleCommand_LeechSeed: ; 36f9d
; leechseed
ld a, [AttackMissed]
and a
@@ -8517,7 +8517,7 @@
; 36fe1
-BattleCommand36: ; 36fe1
+BattleCommand_Splash: ; 36fe1
call AnimateCurrentMove
callba MobileFn_1060e5
jp PrintNothingHappened
@@ -8524,7 +8524,7 @@
; 36fed
-BattleCommand37: ; 36fed
+BattleCommand_Disable: ; 36fed
; disable
ld a, [AttackMissed]
@@ -8598,7 +8598,7 @@
; 3705c
-BattleCommand1e: ; 3705c
+BattleCommand_PayDay: ; 3705c
; payday
xor a
@@ -8627,7 +8627,7 @@
; 3707f
-BattleCommand1f: ; 3707f
+BattleCommand_Conversion: ; 3707f
; conversion
ld hl, BattleMonMoves
@@ -8724,7 +8724,7 @@
; 3710e
-BattleCommand20: ; 3710e
+BattleCommand_ResetStats: ; 3710e
; resetstats
ld a, 7 ; neutral
@@ -8759,7 +8759,7 @@
; 3713e
-BattleCommand2c: ; 3713e
+BattleCommand_Heal: ; 3713e
; heal
ld de, BattleMonHP
@@ -8788,7 +8788,7 @@
push hl
push de
push af
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld a, BATTLE_VARS_SUBSTATUS5
call GetBattleVarAddr
res SUBSTATUS_TOXIC, [hl]
@@ -8839,7 +8839,7 @@
; 371cd
-BattleCommand2d: ; 371cd
+BattleCommand_Transform: ; 371cd
; transform
call Function372d8
@@ -8961,7 +8961,7 @@
call Function37e36
jr .asm_372ae
.asm_372a8
- call BattleCommandaa
+ call BattleCommand_MoveDelay
call BattleCommanda6
.asm_372ae
xor a
@@ -9032,7 +9032,7 @@
; 372fc
-BattleCommand2e: ; 372fc
+BattleCommand_Screen: ; 372fc
; screen
ld hl, PlayerScreens
@@ -9151,7 +9151,7 @@
; 37380
-BattleCommand1a: ; 37380
+BattleCommand_SelfDestruct: ; 37380
callba MobileFn_10610d
ld a, $4
ld [wcfca], a
@@ -9233,7 +9233,7 @@
INCLUDE "battle/effects/thief.asm"
-BattleCommand51: ; 37517
+BattleCommand_ArenaTrap: ; 37517
; arenatrap
; Doesn't work on an absent opponent.
@@ -9264,7 +9264,7 @@
INCLUDE "battle/effects/nightmare.asm"
-BattleCommand53: ; 37563
+BattleCommand_Defrost: ; 37563
; defrost
; Thaw the user.
@@ -9320,7 +9320,7 @@
; 37792
-BattleCommand5e: ; 37792
+BattleCommand_FuryCutter: ; 37792
; furycutter
ld hl, PlayerFuryCutterCount
@@ -9381,7 +9381,7 @@
; 377ce
-BattleCommand5f: ; 377ce
+BattleCommand_Attract: ; 377ce
; attract
ld a, [AttackMissed]
and a
@@ -9462,7 +9462,7 @@
; 3784b
-BattleCommand60: ; 3784b
+BattleCommand_HappinessPower: ; 3784b
; happinesspower
push bc
ld hl, BattleMonHappiness
@@ -9490,7 +9490,7 @@
; 37874
-BattleCommand61: ; 37874
+BattleCommand_Present: ; 37874
; present
ld a, [wLinkMode]
@@ -9500,7 +9500,7 @@
push de
.asm_3787d
- call BattleCommand_CalcDamageTypeMultiplier
+ call BattleCommand_Stab
ld a, [wLinkMode]
cp $3
@@ -9585,7 +9585,7 @@
; 3790e
-BattleCommand63: ; 3790e
+BattleCommand_FrustrationPower: ; 3790e
; frustrationpower
push bc
@@ -9615,7 +9615,7 @@
; 37939
-BattleCommand64: ; 37939
+BattleCommand_Safeguard: ; 37939
; safeguard
ld hl, PlayerScreens
@@ -9655,7 +9655,7 @@
; 37972
-BattleCommand65: ; 37972
+BattleCommand_CheckSafeguard: ; 37972
; checksafeguard
ld hl, EnemyScreens
ld a, [hBattleTurn]
@@ -9667,7 +9667,7 @@
ret z
ld a, 1
ld [AttackMissed], a
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld hl, SafeguardProtectText
call StdBattleTextBox
jp EndMoveEffect
@@ -9674,7 +9674,7 @@
; 37991
-BattleCommand66: ; 37991
+BattleCommand_GetMagnitude: ; 37991
; getmagnitude
push bc
@@ -9695,7 +9695,7 @@
inc hl
ld a, [hl]
ld [wd265], a
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld hl, MagnitudeText
call StdBattleTextBox
pop de
@@ -9714,7 +9714,7 @@
; 379c9
-BattleCommand67: ; 379c9
+BattleCommand_BatonPass: ; 379c9
; batonpass
ld a, [hBattleTurn]
@@ -9828,19 +9828,19 @@
call CallBattleCore
ld a, [OTPartyCount]
- add NUM_MOVES
+ add BATTLEACTION_SWITCH1
ld b, a
ld a, [wBattleAction]
- cp NUM_MOVES
- jr c, .asm_37aa0
+ cp BATTLEACTION_SWITCH1
+ jr c, .baton_pass
cp b
- jr c, .asm_37aa8
+ jr c, .switch
-.asm_37aa0
+.baton_pass
ld a, [CurOTMon]
- add NUM_MOVES
+ add BATTLEACTION_SWITCH1
ld [wBattleAction], a
-.asm_37aa8
+.switch
jp WriteBackup
; 37aab
@@ -9950,7 +9950,7 @@
; 37b1d
-BattleCommand68: ; 37b1d
+BattleCommand_Pursuit: ; 37b1d
; pursuit
; Double damage if the opponent is switching.
@@ -9977,7 +9977,7 @@
; 37b39
-BattleCommand69: ; 37b39
+BattleCommand_ClearHazards: ; 37b39
; clearhazards
ld a, BATTLE_VARS_SUBSTATUS4
@@ -10016,25 +10016,25 @@
; 37b74
-BattleCommand6a: ; 37b74
+BattleCommand_HealMorn: ; 37b74
; healmorn
ld b, MORN
- jr BattleCommand6a6c
+ jr BattleCommand_HealMorn6c
; 37b78
-BattleCommand6b: ; 37b78
+BattleCommand_HealDay: ; 37b78
; healday
ld b, DAY
- jr BattleCommand6a6c
+ jr BattleCommand_HealMorn6c
; 37b7c
-BattleCommand6c: ; 37b7c
+BattleCommand_HealNite: ; 37b7c
; healnite
ld b, NITE
; fallthrough
; 37b7e
-BattleCommand6a6c: ; 37b7e
+BattleCommand_HealMorn6c: ; 37b7e
; Time- and weather-sensitive heal.
ld hl, BattleMonMaxHP
@@ -10120,7 +10120,7 @@
; 37be8
-BattleCommand6d: ; 37be8
+BattleCommand_HiddenPower: ; 37be8
; hiddenpower
ld a, [AttackMissed]
@@ -10131,7 +10131,7 @@
; 37bf4
-BattleCommand6e: ; 37bf4
+BattleCommand_StartRain: ; 37bf4
; startrain
ld a, WEATHER_RAIN
ld [Weather], a
@@ -10143,7 +10143,7 @@
; 37c07
-BattleCommand6f: ; 37c07
+BattleCommand_StartSun: ; 37c07
; startsun
ld a, WEATHER_SUN
ld [Weather], a
@@ -10155,9 +10155,9 @@
; 37c1a
-BattleCommand95: ; 37c1a
+BattleCommand_BellyDrum: ; 37c1a
; bellydrum
- call BattleCommand77
+ call BattleCommand_AttackUp2
ld a, [AttackMissed]
and a
jr nz, .asm_37c4f
@@ -10176,7 +10176,7 @@
.asm_37c41
push af
- call BattleCommand77
+ call BattleCommand_AttackUp2
pop af
dec a
jr nz, .asm_37c41
@@ -10189,7 +10189,7 @@
; 37c55
-BattleCommand96: ; 37c55
+BattleCommand_PsychUp: ; 37c55
; psychup
ld hl, EnemyStatLevels
@@ -10236,7 +10236,7 @@
; 37c95
-BattleCommand9a: ; 37c95
+BattleCommand_MirrorCoat: ; 37c95
; mirrorcoat
ld a, 1
@@ -10298,7 +10298,7 @@
; 37ce6
-BattleCommand9d: ; 37ce6
+BattleCommand_DoubleMinimizeDamage: ; 37ce6
; doubleminimizedamage
ld hl, wc6fa
@@ -10322,7 +10322,7 @@
; 37d02
-BattleCommand9e: ; 37d02
+BattleCommand_SkipSunCharge: ; 37d02
; skipsuncharge
ld a, [Weather]
cp WEATHER_SUN
@@ -10332,7 +10332,7 @@
; 37d0d
-BattleCommand9b: ; 37d0d
+BattleCommand_CheckFutureSight: ; 37d0d
; checkfuturesight
ld hl, wc71d
@@ -10360,7 +10360,7 @@
jp SkipToBattleCommand
; 37d34
-BattleCommand9c: ; 37d34
+BattleCommand_FutureSight: ; 37d34
; futuresight
call Function34548
@@ -10387,7 +10387,7 @@
ld a, $4
ld [hl], a
call BattleCommand0a
- call BattleCommandaa
+ call BattleCommand_MoveDelay
ld hl, ForesawAttackText
call StdBattleTextBox
call BattleCommand0c
@@ -10416,7 +10416,7 @@
; 37d94
-BattleCommand9f: ; 37d94
+BattleCommand_ThunderAccuracy: ; 37d94
; thunderaccuracy
ld a, BATTLE_VARS_MOVE_TYPE
@@ -10617,12 +10617,12 @@
AnimateFailedMove: ; 37e77
call BattleCommand0a
- call BattleCommandaa
+ call BattleCommand_MoveDelay
jp BattleCommand0c
; 37e80
-BattleCommandaa: ; 37e80
+BattleCommand_MoveDelay: ; 37e80
; movedelay
; Wait 40 frames.
ld c, 40
@@ -10630,7 +10630,7 @@
; 37e85
-BattleCommand38: ; 37e85
+BattleCommand_ClearText: ; 37e85
; cleartext
; Used in multi-hit moves.
--- a/battle/effects/curse.asm
+++ b/battle/effects/curse.asm
@@ -1,4 +1,4 @@
-BattleCommand54: ; 37588
+BattleCommand_Curse: ; 37588
; curse
ld de, BattleMonType1
@@ -45,14 +45,14 @@
ld a, $2
call Function36532
call BattleCommand_SwitchTurn
- call BattleCommand8d
+ call BattleCommand_StatMessageTarget
call ResetMiss
call BattleCommand_SwitchTurn
- call BattleCommand70
- call BattleCommand8c
+ call BattleCommand_AttackUp
+ call BattleCommand_StatMessageUser
call ResetMiss
- call BattleCommand71
- jp BattleCommand8c
+ call BattleCommand_DefenseUp
+ jp BattleCommand_StatMessageUser
.ghost
--- a/battle/effects/endure.asm
+++ b/battle/effects/endure.asm
@@ -1,4 +1,4 @@
-BattleCommand5a: ; 3766f
+BattleCommand_Endure: ; 3766f
; endure
; Endure shares code with Protect. See protect.asm.
--- a/battle/effects/foresight.asm
+++ b/battle/effects/foresight.asm
@@ -1,4 +1,4 @@
-BattleCommand57: ; 376a0
+BattleCommand_Foresight: ; 376a0
; foresight
ld a, [AttackMissed]
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -1,4 +1,4 @@
-BattleCommand34: ; 37418
+BattleCommand_Metronome: ; 37418
; metronome
call Function372d8
--- a/battle/effects/mirror_move.asm
+++ b/battle/effects/mirror_move.asm
@@ -1,4 +1,4 @@
-BattleCommand1b: ; 373c9
+BattleCommand_MirrorMove: ; 373c9
; mirrormove
call Function372d8
@@ -47,6 +47,6 @@
ld [wc689], a
.done
- call BattleCommandaa
+ call BattleCommand_MoveDelay
jp ResetTurn
; 37418
--- a/battle/effects/nightmare.asm
+++ b/battle/effects/nightmare.asm
@@ -1,4 +1,4 @@
-BattleCommand52: ; 37536
+BattleCommand_Nightmare: ; 37536
; nightmare
; Can't hit an absent opponent.
--- a/battle/effects/perish_song.asm
+++ b/battle/effects/perish_song.asm
@@ -1,4 +1,4 @@
-BattleCommand58: ; 376c2
+BattleCommand_PerishSong: ; 376c2
; perishsong
--- a/battle/effects/protect.asm
+++ b/battle/effects/protect.asm
@@ -1,4 +1,4 @@
-BattleCommand55: ; 37618
+BattleCommand_Protect: ; 37618
; protect
call ProtectChance
ret c
--- a/battle/effects/rollout.asm
+++ b/battle/effects/rollout.asm
@@ -1,7 +1,7 @@
MAX_ROLLOUT_COUNT EQU 5
-BattleCommand5b: ; 37718
+BattleCommand_CheckCurl: ; 37718
; checkcurl
ld de, PlayerRolloutCount
@@ -25,7 +25,7 @@
; 37734
-BattleCommand5c: ; 37734
+BattleCommand_RolloutPower: ; 37734
; rolloutpower
ld a, BATTLE_VARS_STATUS
--- a/battle/effects/sandstorm.asm
+++ b/battle/effects/sandstorm.asm
@@ -1,4 +1,4 @@
-BattleCommand59: ; 376f8
+BattleCommand_StartSandstorm: ; 376f8
; startsandstorm
ld a, [Weather]
--- a/battle/effects/spikes.asm
+++ b/battle/effects/spikes.asm
@@ -1,4 +1,4 @@
-BattleCommand56: ; 37683
+BattleCommand_Spikes: ; 37683
; spikes
ld hl, EnemyScreens
--- a/battle/effects/thief.asm
+++ b/battle/effects/thief.asm
@@ -1,4 +1,4 @@
-BattleCommand50: ; 37492
+BattleCommand_Thief: ; 37492
; thief
ld a, [hBattleTurn]
--- a/battle/hidden_power.asm
+++ b/battle/hidden_power.asm
@@ -106,7 +106,7 @@
; based on the new type, but keep base power.
ld a, d
push af
- callba BattleCommand06 ; damagestats
+ callba BattleCommand_DamageStats ; damagestats
pop af
ld d, a
ret
--- a/engine/predef.asm
+++ b/engine/predef.asm
@@ -54,7 +54,7 @@
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar
- add_predef Function3f43d ; $18
+ add_predef GetMonBackpic ; $18
add_predef Function3f47c
add_predef LearnLevelMoves
add_predef FillMoves
--- a/home/flag.asm
+++ b/home/flag.asm
@@ -102,7 +102,7 @@
; 0x2ead
-Function2ead:: ; 2ead
+CheckReceivedDex:: ; 2ead
ld de, ENGINE_POKEDEX
ld b, CHECK_FLAG
callba EngineFlagAction
--- a/items/item_effects.asm
+++ b/items/item_effects.asm
@@ -210,11 +210,11 @@
ParkBall: ; e8a2
ld a, [wBattleMode]
dec a
- jp nz, Functionf7a0
+ jp nz, UseBallInTrainerBattle
ld a, [PartyCount]
cp PARTY_LENGTH
- jr nz, .asm_e8c0
+ jr nz, .room_in_party
ld a, BANK(sBoxCount)
call GetSRAMBank
@@ -223,9 +223,9 @@
call CloseSRAM
jp z, Ball_BoxIsFullMessage
-.asm_e8c0
+.room_in_party
xor a
- ld [wc64e], a
+ ld [wCaughtMon], a
ld a, [CurItem]
cp PARK_BALL
call nz, Functionedfa
@@ -239,38 +239,38 @@
ld b, a
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
- jp z, .asm_e99c
+ jp z, .catch_without_fail
ld a, [CurItem]
cp MASTER_BALL
- jp z, .asm_e99c
+ jp z, .catch_without_fail
ld a, [CurItem]
ld c, a
ld hl, BallMultiplierFunctionTable
-.asm_e8f2
+.get_multiplier_loop
ld a, [hli]
cp $ff
- jr z, .asm_e906
+ jr z, .skip_or_return_from_ball_fn
cp c
- jr z, .asm_e8fe
+ jr z, .call_ball_function
rept 2
inc hl
endr
- jr .asm_e8f2
+ jr .get_multiplier_loop
-.asm_e8fe
+.call_ball_function
ld a, [hli]
ld h, [hl]
ld l, a
- ld de, .asm_e906
+ ld de, .skip_or_return_from_ball_fn
push de
jp [hl]
-.asm_e906
+.skip_or_return_from_ball_fn
ld a, [CurItem]
cp LEVEL_BALL
ld a, b
- jp z, .asm_e98e
+ jp z, .skip_hp_calc
ld a, b
ld [hMultiplicand + 2], a
@@ -295,7 +295,7 @@
ld e, l
ld a, d
and a
- jr z, .asm_e940
+ jr z, .okay_1
srl d
rr e
@@ -308,9 +308,9 @@
ld a, c
and a
- jr nz, .asm_e940
+ jr nz, .okay_1
ld c, $1
-.asm_e940
+.okay_1
ld b, e
push bc
@@ -350,9 +350,9 @@
.addstatus
ld a, b
add c
- jr nc, .asm_e977
+ jr nc, .max_1
ld a, $ff
-.asm_e977
+.max_1
ld d, a
push de
@@ -375,11 +375,11 @@
pop de
ld a, d
- jr nz, .asm_e98e
+ jr nz, .skip_hp_calc
add c
- jr nc, .asm_e98e
+ jr nc, .skip_hp_calc
ld a, $ff
-.asm_e98e
+.skip_hp_calc
ld b, a
ld [Buffer1], a
@@ -387,22 +387,22 @@
cp b
ld a, 0
- jr z, .asm_e99c
- jr nc, .asm_e99f
+ jr z, .catch_without_fail
+ jr nc, .fail_to_catch
-.asm_e99c
+.catch_without_fail
ld a, [EnemyMonSpecies]
-.asm_e99f
- ld [wc64e], a
+.fail_to_catch
+ ld [wCaughtMon], a
ld c, 20
call DelayFrames
ld a, [CurItem]
cp POKE_BALL + 1 ; Assumes Master/Ultra/Great come before
- jr c, .asm_e9b0
+ jr c, .not_kurt_ball
ld a, POKE_BALL
-.asm_e9b0
+.not_kurt_ball
ld [wc689], a
ld de, ANIM_THROW_POKE_BALL
@@ -416,23 +416,23 @@
ld [wcfca], a
predef PlayBattleAnim
- ld a, [wc64e]
+ ld a, [wCaughtMon]
and a
- jr nz, .asm_e9f5
+ jr nz, .caught
ld a, [Buffer2]
cp $1
ld hl, UnknownText_0xedb5
- jp z, .asm_ebdc
+ jp z, .shake_and_break_free
cp $2
ld hl, UnknownText_0xedba
- jp z, .asm_ebdc
+ jp z, .shake_and_break_free
cp $3
ld hl, UnknownText_0xedbf
- jp z, .asm_ebdc
+ jp z, .shake_and_break_free
cp $4
ld hl, UnknownText_0xedc4
- jp z, .asm_ebdc
-.asm_e9f5
+ jp z, .shake_and_break_free
+.caught
ld hl, EnemyMonStatus
ld a, [hli]
@@ -492,29 +492,29 @@
ld hl, EnemySubStatus5
bit SUBSTATUS_TRANSFORMED, [hl]
- jr nz, .asm_ea67
- ld hl, wc735
+ jr nz, .Transformed
+ ld hl, wCaughtMonMoves
ld de, EnemyMonMoves
ld bc, NUM_MOVES
call CopyBytes
- ld hl, wc739
+ ld hl, wCaughtMonPP
ld de, EnemyMonPP
ld bc, NUM_MOVES
call CopyBytes
-.asm_ea67
+.Transformed
ld a, [EnemyMonSpecies]
- ld [wc64e], a
+ ld [wCaughtMon], a
ld [CurPartySpecies], a
ld [wd265], a
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
- jp z, .asm_ebd9
+ jp z, .FinishTutorial
callba MobileFn_10607f
- ld hl, UnknownText_0xedc9
+ ld hl, Text_GotchaMonWasCaught
call PrintText
call ClearSprites
@@ -530,10 +530,10 @@
call SetSeenAndCaughtMon
pop af
and a
- jr nz, .asm_eab7
+ jr nz, .skip_pokedex
- call Function2ead
- jr z, .asm_eab7
+ call CheckReceivedDex
+ jr z, .skip_pokedex
ld hl, UnknownText_0xedf0
call PrintText
@@ -544,19 +544,19 @@
ld [wd265], a
predef Functionfb877
-.asm_eab7
+.skip_pokedex
ld a, [BattleType]
cp BATTLETYPE_CONTEST
- jp z, .asm_ebd1
+ jp z, .catch_bug_contest_mon
cp BATTLETYPE_CELEBI
- jr nz, .asm_eac8
+ jr nz, .not_celebi
ld hl, wBattleResult
set 6, [hl]
-.asm_eac8
+.not_celebi
ld a, [PartyCount]
cp PARTY_LENGTH
- jr z, .asm_eb3c
+ jr z, .SendToPC
xor a ; PARTYMON
ld [MonType], a
@@ -568,7 +568,7 @@
ld a, [CurItem]
cp FRIEND_BALL
- jr nz, .asm_eaf8
+ jr nz, .SkipPartyMonFriendBall
ld a, [PartyCount]
dec a
@@ -578,7 +578,7 @@
ld a, FRIEND_BALL_HAPPINESS
ld [hl], a
-.asm_eaf8
+.SkipPartyMonFriendBall
ld hl, UnknownText_0xedf5
call PrintText
@@ -588,7 +588,7 @@
call GetPokemonName
call YesNoBox
- jp c, .asm_ebe2
+ jp c, .return_from_capture
ld a, [PartyCount]
dec a
@@ -613,9 +613,9 @@
ld de, StringBuffer1
call InitName
- jp .asm_ebe2
+ jp .return_from_capture
-.asm_eb3c
+.SendToPC
call ClearSprites
predef SentPkmnIntoBox
@@ -627,17 +627,17 @@
ld a, [sBoxCount]
cp MONS_PER_BOX
- jr nz, .asm_eb5b
+ jr nz, .BoxNotFullYet
ld hl, wBattleResult
set 7, [hl]
-.asm_eb5b
+.BoxNotFullYet
ld a, [CurItem]
cp FRIEND_BALL
- jr nz, .asm_eb67
+ jr nz, .SkipBoxMonFriendBall
; Bug: overwrites the happiness of the first mon in the box!
ld a, FRIEND_BALL_HAPPINESS
ld [sBoxMon1Happiness], a
-.asm_eb67
+.SkipBoxMonFriendBall
call CloseSRAM
ld hl, UnknownText_0xedf5
@@ -648,7 +648,7 @@
call GetPokemonName
call YesNoBox
- jr c, .asm_ebaf
+ jr c, .SkipBoxMonNickname
xor a
ld [CurPartyMon], a
@@ -672,7 +672,7 @@
call CloseSRAM
-.asm_ebaf
+.SkipBoxMonNickname
ld a, BANK(sBoxMonNicknames)
call GetSRAMBank
@@ -688,20 +688,20 @@
call FadeToWhite
call LoadStandardFont
- jr .asm_ebe2
+ jr .return_from_capture
-.asm_ebd1
+.catch_bug_contest_mon
callba BugContest_SetCaughtContestMon
- jr .asm_ebe2
+ jr .return_from_capture
-.asm_ebd9
- ld hl, UnknownText_0xedc9
+.FinishTutorial
+ ld hl, Text_GotchaMonWasCaught
-.asm_ebdc
+.shake_and_break_free
call PrintText
call ClearSprites
-.asm_ebe2
+.return_from_capture
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
ret z
@@ -710,7 +710,7 @@
cp BATTLETYPE_CONTEST
jr z, .used_park_ball
- ld a, [wc64e]
+ ld a, [wCaughtMon]
and a
jr z, .toss
@@ -733,16 +733,16 @@
BallMultiplierFunctionTable:
; table of routines that increase or decrease the catch rate based on
; which ball is used in a certain situation.
- dbw ULTRA_BALL, UltraBallMultiplier
- dbw GREAT_BALL, GreatBallMultiplier
- dbw 8, SafariBallMultiplier ; Safari Ball, leftover from RBY
- dbw HEAVY_BALL, HeavyBallMultiplier
- dbw LEVEL_BALL, LevelBallMultiplier
- dbw LURE_BALL, LureBallMultiplier
- dbw FAST_BALL, FastBallMultiplier
- dbw MOON_BALL, MoonBallMultiplier
- dbw LOVE_BALL, LoveBallMultiplier
- dbw PARK_BALL, ParkBallMultiplier
+ dbw ULTRA_BALL, UltraBallMultiplier
+ dbw GREAT_BALL, GreatBallMultiplier
+ dbw SAFARI_BALL, SafariBallMultiplier ; Safari Ball, leftover from RBY
+ dbw HEAVY_BALL, HeavyBallMultiplier
+ dbw LEVEL_BALL, LevelBallMultiplier
+ dbw LURE_BALL, LureBallMultiplier
+ dbw FAST_BALL, FastBallMultiplier
+ dbw MOON_BALL, MoonBallMultiplier
+ dbw LOVE_BALL, LoveBallMultiplier
+ dbw PARK_BALL, ParkBallMultiplier
db $ff
UltraBallMultiplier:
@@ -1128,7 +1128,7 @@
db "@"
; 0xedc9
-UnknownText_0xedc9: ; 0xedc9
+Text_GotchaMonWasCaught: ; 0xedc9
; Gotcha! @ was caught!@ @
text_jump UnknownText_0x1c5b17
start_asm
@@ -1213,7 +1213,7 @@
and a
jr z, .asm_ee35
- jp Functionf795
+ jp UseDisposableItem
.asm_ee35
call WontHaveAnyEffectMessage
@@ -1270,7 +1270,7 @@
ld c, HAPPINESS_USEDITEM
callba ChangeHappiness
- jp Functionf795
+ jp UseDisposableItem
Functionee83: ; ee83
@@ -1450,7 +1450,7 @@
ld [wd1e9], a
callba Function421d8
- jp Functionf795
+ jp UseDisposableItem
; efad
@@ -1520,7 +1520,7 @@
call Functionf030
call Play_SFX_FULL_HEAL
call Functionf279
- call Functionf795
+ call UseDisposableItem
ld a, $0
ret
@@ -1695,7 +1695,7 @@
ld a, $f7
ld [PartyMenuActionText], a
call Functionf279
- call Functionf795
+ call UseDisposableItem
ld a, 0
ret
; f128
@@ -1735,7 +1735,7 @@
ld a, $f5
ld [PartyMenuActionText], a
call Functionf279
- call Functionf795
+ call UseDisposableItem
ld a, 0
ret
; f16a
@@ -1827,7 +1827,7 @@
ld a, $f5
ld [PartyMenuActionText], a
call Functionf279
- call Functionf795
+ call UseDisposableItem
ld a, 0
ret
@@ -2234,7 +2234,7 @@
ld a, [wd0ec]
cp 1
- call z, Functionf795
+ call z, UseDisposableItem
ret
; f462
@@ -2344,8 +2344,8 @@
callba CheckIfStatCanBeRaised
call WaitSFX
- callba BattleCommand8c
- callba BattleCommand8e
+ callba BattleCommand_StatMessageUser
+ callba BattleCommand_StatUpFailText
ld a, [CurBattleMon]
ld [CurPartyMon], a
@@ -2599,7 +2599,7 @@
Functionf64c: ; f64c
call ClearPalettes
- jp Functionf795
+ jp UseDisposableItem
; f652
Functionf652: ; f652
@@ -2805,7 +2805,7 @@
ld a, [wd0ec]
cp $1
ret nz
- call Functionf795
+ call UseDisposableItem
ret
; f763
@@ -2825,7 +2825,7 @@
ld hl, UnknownText_0xf778
call PrintText
- jp Functionf795
+ jp UseDisposableItem
; f778
UnknownText_0xf778: ; 0xf778
@@ -2944,7 +2944,7 @@
; fallthrough
; f795
-Functionf795: ; f795
+UseDisposableItem: ; f795
ld hl, NumItems
ld a, 1
ld [wItemQuantityChangeBuffer], a
@@ -2951,7 +2951,7 @@
jp TossItem
; f7a0
-Functionf7a0: ; f7a0
+UseBallInTrainerBattle: ; f7a0
call Functionedfa
ld de, ANIM_THROW_POKE_BALL
ld a, e
@@ -2967,7 +2967,7 @@
call PrintText
ld hl, DontBeAThiefText
call PrintText
- jr Functionf795
+ jr UseDisposableItem
; f7ca
WontHaveAnyEffect_NotUsedMessage: ; f7ca
--- a/main.asm
+++ b/main.asm
@@ -16375,7 +16375,7 @@
; 1563e
Function1563e: ; 1563e
- call Function2ead
+ call CheckReceivedDex
jr nz, .asm_15646
ld a, $0
ret
@@ -25054,7 +25054,7 @@
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic
- callba Function3f43d
+ callba GetMonBackpic
jr .continue
.gettutorialbackpic
--- a/wram.asm
+++ b/wram.asm
@@ -454,7 +454,9 @@
ds 1
wc64d:: ds 1
-wc64e:: ds 2
+wCaughtMon::
+wc64e:: ds 1
+ ds 1
wEnemyTrainerItem1:: ds 1
wEnemyTrainerItem2:: ds 1
wc652:: ds 4
@@ -831,8 +833,10 @@
BattleEnded:: ; c734
ds 1
+wCaughtMonMoves::
wc735:: ds 1
wc736:: ds 3
+wCaughtMonPP::
wc739:: ds 4
wc73d:: ds 1
wc73e:: ds 1