Sprite movement function labels

6 files changed, 227 insertions, 231 deletions

diff --git a/battle/core.asm b/battle/core.asm
index 02ee90932..18cb3c2fd 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -87,7 +87,7 @@ Function3c000: ; 3c000
 	call Function3d490
 	call LoadTileMapToTempTileMap
 	call Function3d57a
-	call Function3da0d
+	call InitBattleMon
 	call ResetPlayerStatLevels
 	call SendOutPkmnText
 	call NewBattleMonStatus
@@ -2917,7 +2917,7 @@ Function3d227: ; 3d227
 	ld a, [CurPartyMon]
 	ld [CurBattleMon], a
 	call Function3d581
-	call Function3da0d
+	call InitBattleMon
 	call ResetPlayerStatLevels
 	call ClearPalettes
 	call DelayFrame
@@ -2945,7 +2945,7 @@ Function3d2b3: ; 3d2b3
 	ld a, [CurPartyMon]
 	ld [CurBattleMon], a
 	call Function3d581
-	call Function3da0d
+	call InitBattleMon
 	call ResetPlayerStatLevels
 	call SendOutPkmnText
 	call NewBattleMonStatus
@@ -3745,7 +3745,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 	ld a, OTPARTYMON
 	ld [MonType], a
 	predef CopyPkmnToTempMon
-	call Function3f47c
+	call GetMonFrontpic
 
 	xor a
 	ld [wcfca], a
@@ -3754,7 +3754,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 
-	call Function3da79
+	call BattleCheckEnemyShininess
 	jr nc, .asm_3d800
 	ld a, 1 ; shiny anim
 	ld [wc689], a
@@ -4062,7 +4062,7 @@ TryToRunAwayFromBattle: ; 3d8b3
 ; 3da0d
 
 
-Function3da0d: ; 3da0d
+InitBattleMon: ; 3da0d
 	ld a, MON_SPECIES
 	call GetPartyParamLocation
 	ld de, BattleMonSpecies
@@ -4096,28 +4096,28 @@ endr
 	call CopyBytes
 	ld hl, BattleMonAttack
 	ld de, PlayerStats
-	ld bc, 2 * 5
+	ld bc, (PARTYMON_STRUCT_LENGTH) - (MON_ATK)
 	call CopyBytes
 	call Function3ec2c
 	call BadgeStatBoosts
 	ret
 ; 3da74
 
-Function3da74: ; 3da74
-	call Function3da85
-	jr Function3da7c
+BattleCheckPlayerShininess: ; 3da74
+	call GetPartyMonDVs
+	jr BattleCheckShininess
 
-Function3da79: ; 3da79
-	call Function3da97
+BattleCheckEnemyShininess: ; 3da79
+	call GetEnemyMonDVs
 
-Function3da7c: ; 3da7c
+BattleCheckShininess: ; 3da7c
 	ld b, h
 	ld c, l
 	callab CheckShininess
 	ret
 ; 3da85
 
-Function3da85: ; 3da85
+GetPartyMonDVs: ; 3da85
 	ld hl, BattleMonDVs
 	ld a, [PlayerSubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
@@ -4127,7 +4127,7 @@ Function3da85: ; 3da85
 	jp GetPartyLocation
 ; 3da97
 
-Function3da97: ; 3da97
+GetEnemyMonDVs: ; 3da97
 	ld hl, EnemyMonDVs
 	ld a, [EnemySubStatus5]
 	bit SUBSTATUS_TRANSFORMED, a
@@ -4214,7 +4214,7 @@ Function3db32: ; 3db32
 	ld a, [CurPartyMon]
 	ld [CurBattleMon], a
 	call Function3d581
-	call Function3da0d
+	call InitBattleMon
 	call ResetPlayerStatLevels
 	call NewBattleMonStatus
 	call BreakAttraction
@@ -4258,7 +4258,7 @@ Function3db5f: ; 3db5f
 	ld [wc689], a
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
-	call Function3da74
+	call BattleCheckPlayerShininess
 	jr nc, .asm_3dbbc
 	ld a, $1
 	ld [wc689], a
@@ -5252,7 +5252,7 @@ BattleMenu_Pack: ; 3e1c7
 	call DelayFrame
 	call Function3ed9f
 	call GetMonBackpic
-	call Function3f47c
+	call GetMonFrontpic
 	call ExitMenu
 	call WaitBGMap
 	call Function3ee27
@@ -5287,7 +5287,7 @@ Function3e234: ; 3e234
 	call GetMonBackpic
 
 .asm_3e25d
-	call Function3f47c
+	call GetMonFrontpic
 	ld a, $1
 	ld [MenuSelection2], a
 	call ExitMenu
@@ -5523,7 +5523,7 @@ BattleMonEntrance: ; 3e40b
 	ld a, [CurBattleMon]
 	ld [CurPartyMon], a
 	call Function3d581
-	call Function3da0d
+	call InitBattleMon
 	call ResetPlayerStatLevels
 	call SendOutPkmnText
 	call NewBattleMonStatus
@@ -5549,7 +5549,7 @@ PassedBattleMonEntrance: ; 3e459
 	ld a, [CurPartyMon]
 	ld [CurBattleMon], a
 	call Function3d581
-	call Function3da0d
+	call InitBattleMon
 	xor a
 	ld [wd265], a
 	call ApplyStatLevelMultiplierOnAllStats
@@ -8392,7 +8392,7 @@ Function3f46f: ; 3f46f
 	ret
 ; 3f47c
 
-Function3f47c: ; 3f47c
+GetMonFrontpic: ; 3f47c
 	ld a, [EnemySubStatus4]
 	bit SUBSTATUS_SUBSTITUTE, a
 	ld hl, BattleAnimCmd_DD
@@ -8470,8 +8470,8 @@ Function3f4dd: ; 3f4dd
 	callba FindFirstAliveMon
 	call DisableSpriteUpdates
 	callba ClearBattleRAM
-	call Function3f55e
-	call Function3f568
+	call InitEnemy
+	call BackUpVBGMap2
 	ld b, $0
 	call GetSGBLayout
 	ld hl, rLCDC
@@ -8510,20 +8510,20 @@ LoadTrainerOrWildMonPic: ; 3f54e
 	ret
 ; 3f55e
 
-Function3f55e: ; 3f55e
+InitEnemy: ; 3f55e
 	ld a, [OtherTrainerClass]
 	and a
-	jp nz, Function3f594 ; trainer
-	jp Function3f607 ; wild
+	jp nz, InitEnemyTrainer ; trainer
+	jp InitEnemyWildmon ; wild
 ; 3f568
 
-Function3f568: ; 3f568
+BackUpVBGMap2: ; 3f568
 	ld a, [rSVBK]
 	push af
-	ld a, $6
+	ld a, $6 ; BANK(w6_d000)
 	ld [rSVBK], a
 	ld hl, w6_d000
-	ld bc, $400
+	ld bc, $40 tiles ; VBGMap3 - VBGMap2
 	ld a, $2
 	call ByteFill
 	ld a, [rVBK]
@@ -8531,8 +8531,8 @@ Function3f568: ; 3f568
 	ld a, $1
 	ld [rVBK], a
 	ld de, w6_d000
-	ld hl, VBGMap0
-	ld bc, $0f40
+	ld hl, VBGMap0 ; VBGMap2
+	lb bc, BANK(BackUpVBGMap2), $40
 	call Request2bpp
 	pop af
 	ld [rVBK], a
@@ -8541,7 +8541,7 @@ Function3f568: ; 3f568
 	ret
 ; 3f594
 
-Function3f594: ; 3f594
+InitEnemyTrainer: ; 3f594
 	ld [TrainerClass], a
 	callba MobileFn_10606a
 	xor a
@@ -8596,7 +8596,7 @@ Function3f594: ; 3f594
 	ret
 ; 3f607
 
-Function3f607: ; 3f607
+InitEnemyWildmon: ; 3f607
 	ld a, $1
 	ld [wBattleMode], a
 	callba MobileFn_10605d
@@ -9360,8 +9360,8 @@ Function3fb54: ; 3fb54
 Function3fb6c: ; 3fb6c
 	call Function3fbf8
 	hlcoord 0, 12
-	ld b, $4
-	ld c, $12
+	ld b, 4
+	ld c, 18
 	call TextBox
 	callba MobileTextBorder
 	hlcoord 1, 5
@@ -9385,7 +9385,7 @@ Function3fb6c: ; 3fb6c
 	ld a, $31
 	ld [$ffad], a
 	hlcoord 2, 6
-	ld bc, $0606
+	lb bc, 6, 6
 	predef FillBox
 	xor a
 	ld [hWY], a
@@ -9421,13 +9421,13 @@ Function3fbd6: ; 3fbd6
 ; 3fbf8
 
 Function3fbf8: ; 3fbf8
-	call GetBattleBackpic
-	call Function3fc30
+	call GetTrainerBackpic
+	call CopyBackpic
 	ret
 ; 3fbff
 
 
-GetBattleBackpic: ; 3fbff
+GetTrainerBackpic: ; 3fbff
 ; Load the player character's backpic (6x6) into VRAM starting from $9310.
 
 ; Special exception for Dude.
@@ -9462,7 +9462,7 @@ GetBattleBackpic: ; 3fbff
 ; 3fc30
 
 
-Function3fc30: ; 3fc30
+CopyBackpic: ; 3fc30
 	ld a, [rSVBK]
 	push af
 	ld a, $6
@@ -9479,7 +9479,7 @@ Function3fc30: ; 3fc30
 	ld a, $31
 	ld [$ffad], a
 	hlcoord 2, 6
-	ld bc, $0606
+	lb bc, 6, 6
 	predef FillBox
 	ret
 ; 3fc5b
@@ -9490,10 +9490,10 @@ Function3fc5b: ; 3fc5b
 	ld [hMapObjectIndexBuffer], a
 	ld b, $6
 	ld e, $a8
-.asm_3fc65
+.outer_loop
 	ld c, $3
 	ld d, $40
-.asm_3fc69
+.inner_loop
 	ld [hl], d
 	inc hl
 	ld [hl], e
@@ -9508,7 +9508,7 @@ Function3fc5b: ; 3fc5b
 	add $8
 	ld d, a
 	dec c
-	jr nz, .asm_3fc69
+	jr nz, .inner_loop
 	ld a, [hMapObjectIndexBuffer]
 	add $3
 	ld [hMapObjectIndexBuffer], a
@@ -9516,7 +9516,7 @@ Function3fc5b: ; 3fc5b
 	add $8
 	ld e, a
 	dec b
-	jr nz, .asm_3fc65
+	jr nz, .outer_loop
 	ret
 ; 3fc8b
 
@@ -9524,7 +9524,7 @@ Function3fc5b: ; 3fc5b
 BattleStartMessage: ; 3fc8b
 	ld a, [wBattleMode]
 	dec a
-	jr z, .asm_3fcaa
+	jr z, .wild
 
 	ld de, SFX_SHINE
 	call PlaySFX
@@ -9536,11 +9536,11 @@ BattleStartMessage: ; 3fc8b
 	callba Battle_GetTrainerName
 
 	ld hl, WantsToBattleText
-	jr .asm_3fd0e
+	jr .PlaceBattleStartText
 
-.asm_3fcaa
-	call Function3da79
-	jr nc, .asm_3fcc2
+.wild
+	call BattleCheckEnemyShininess
+	jr nc, .not_shiny
 
 	xor a
 	ld [wcfca], a
@@ -9551,45 +9551,45 @@ BattleStartMessage: ; 3fc8b
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 
-.asm_3fcc2
+.not_shiny
 	callba CheckSleepingTreeMon
-	jr c, .asm_3fceb
+	jr c, .skip_cry
 
 	callba CheckBattleScene
-	jr c, .asm_3fce0
+	jr c, .do_cry
 
 	hlcoord 12, 0
 	ld d, $0
 	ld e, $1
 	predef Functiond008e
-	jr .asm_3fceb
+	jr .skip_cry
 
-.asm_3fce0
+.do_cry
 	ld a, $0f
 	ld [CryTracks], a
 	ld a, [TempEnemyMonSpecies]
 	call PlayStereoCry
 
-.asm_3fceb
+.skip_cry
 	ld a, [BattleType]
 	cp BATTLETYPE_FISH
-	jr nz, .asm_3fcfd
+	jr nz, .NotFishing
 
 	callba MobileFn_106086
 
 	ld hl, HookedPokemonAttackedText
-	jr .asm_3fd0e
+	jr .PlaceBattleStartText
 
-.asm_3fcfd
+.NotFishing
 	ld hl, PokemonFellFromTreeText
 	cp BATTLETYPE_TREE
-	jr z, .asm_3fd0e
+	jr z, .PlaceBattleStartText
 	ld hl, WildCelebiAppearedText
 	cp BATTLETYPE_CELEBI
-	jr z, .asm_3fd0e
+	jr z, .PlaceBattleStartText
 	ld hl, WildPokemonAppearedText
 
-.asm_3fd0e
+.PlaceBattleStartText
 	push hl
 	callba Function2c000
 	pop hl
diff --git a/battle/effect_command_pointers.asm b/battle/effect_command_pointers.asm
index 735a1792c..530578439 100644
--- a/battle/effect_command_pointers.asm
+++ b/battle/effect_command_pointers.asm
@@ -1,7 +1,3 @@
-
-
-
-
 	dw 0 ; padding
 
 BattleCommandPointers: ; 3fd28
@@ -14,9 +10,9 @@ BattleCommandPointers: ; 3fd28
 	dw BattleCommand_Stab ; 346d2 - 07
 	dw BattleCommand_DamageVariation ; 34cfd
 	dw BattleCommand_CheckHit ; 34d32
-	dw BattleCommand0a ; 34eee
+	dw BattleCommand_LowerSub ; 34eee
 	dw BattleCommand0b ; 34f60
-	dw BattleCommand0c ; 35004
+	dw BattleCommand_RaiseSub ; 35004
 	dw BattleCommand_ResultText ; 35023
 	dw BattleCommand_CheckFaint ; 3505e
 	dw BattleCommand_CriticalText ; 35175
@@ -149,8 +145,8 @@ BattleCommandPointers: ; 3fd28
 	dw BattleCommand_StatUpFailText ; 3644c
 	dw BattleCommand_StatDownFailText ; 3646a
 	dw BattleCommand_EffectChance ; 34ecc
-	dw BattleCommand91 ; 34fdb
-	dw BattleCommand92 ; 34fd1
+	dw BattleCommand_StatDownAnim ; 34fdb
+	dw BattleCommand_StatUpAnim ; 34fd1
 	dw BattleCommand_SwitchTurn ; 34ffd - 93
 	dw BattleCommand_FakeOut ; 36a82
 	dw BattleCommand_BellyDrum ; 37c1a
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 610cdb1fd..b782ee62c 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -540,7 +540,7 @@ CheckEnemyTurn: ; 3421f
 	call StdBattleTextBox
 	call Function355dd
 	call BattleCommand_DamageCalc
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	xor a
 	ld [wcfca], a
 
@@ -553,7 +553,7 @@ CheckEnemyTurn: ; 3421f
 
 	ld c, $1
 	call Function35d1c
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	call CantMove
 	jp Function34385
 
@@ -653,7 +653,7 @@ HitConfusion: ; 343a5
 
 	call Function355dd
 	call BattleCommand_DamageCalc
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 
 	xor a
 	ld [wcfca], a
@@ -671,7 +671,7 @@ HitConfusion: ; 343a5
 	ld [$ffd4], a
 	ld c, $1
 	call Function35d7e
-	jp BattleCommand0c
+	jp BattleCommand_RaiseSub
 ; 343db
 
 
@@ -2691,7 +2691,7 @@ BattleCommand_EffectChance: ; 34ecc
 ; 34eee
 
 
-BattleCommand0a: ; 34eee
+BattleCommand_LowerSub: ; 34eee
 ; lowersub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2702,29 +2702,29 @@ BattleCommand0a: ; 34eee
 	ld a, BATTLE_VARS_SUBSTATUS3
 	call GetBattleVar
 	bit SUBSTATUS_CHARGED, a
-	jr nz, .asm_34f18
+	jr nz, .already_charged
 
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_RAZOR_WIND
-	jr z, .asm_34f21
+	jr z, .charge_turn
 	cp EFFECT_SKY_ATTACK
-	jr z, .asm_34f21
+	jr z, .charge_turn
 	cp EFFECT_SKULL_BASH
-	jr z, .asm_34f21
+	jr z, .charge_turn
 	cp EFFECT_SOLARBEAM
-	jr z, .asm_34f21
+	jr z, .charge_turn
 	cp EFFECT_FLY
-	jr z, .asm_34f21
+	jr z, .charge_turn
 
-.asm_34f18
+.already_charged
 	call .Rampage
-	jr z, .asm_34f21
+	jr z, .charge_turn
 
 	call Function34548
 	ret nz
 
-.asm_34f21
+.charge_turn
 	call Function37ed5
 	jr c, .asm_34f36
 
@@ -2744,15 +2744,15 @@ BattleCommand0a: ; 34eee
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_ROLLOUT
-	jr z, .asm_34f4d
+	jr z, .rollout_rampage
 	cp EFFECT_RAMPAGE
-	jr z, .asm_34f4d
+	jr z, .rollout_rampage
 
 	ld a, 1
 	and a
 	ret
 
-.asm_34f4d
+.rollout_rampage
 	ld a, [wc73e]
 	and a
 	ld a, 0
@@ -2763,9 +2763,9 @@ BattleCommand0a: ; 34eee
 
 BattleCommand_HitTarget: ; 34f57
 ; hittarget
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call BattleCommand0b
-	jp BattleCommand0c
+	jp BattleCommand_RaiseSub
 ; 34f60
 
 
@@ -2787,19 +2787,19 @@ BattleCommand0b: ; 34f60
 	ld a, BATTLE_VARS_MOVE_EFFECT
 	call GetBattleVar
 	cp EFFECT_MULTI_HIT
-	jr z, .asm_34fb0
+	jr z, .multihit_conversion_doublehit_twineedle
 	cp EFFECT_CONVERSION
-	jr z, .asm_34fb0
+	jr z, .multihit_conversion_doublehit_twineedle
 	cp EFFECT_DOUBLE_HIT
-	jr z, .asm_34fb0
+	jr z, .multihit_conversion_doublehit_twineedle
 	cp EFFECT_TWINEEDLE
-	jr z, .asm_34fb0
+	jr z, .multihit_conversion_doublehit_twineedle
 	cp EFFECT_TRIPLE_KICK
-	jr z, .asm_34f96
+	jr z, .triplekick
 	xor a
 	ld [wc689], a
 
-.asm_34f96
+.triplekick
 
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
@@ -2810,14 +2810,14 @@ BattleCommand0b: ; 34f60
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
 	cp FLY
-	jr z, .asm_34fad
+	jr z, .fly_dig
 	cp DIG
 	ret nz
 
-.asm_34fad
+.fly_dig
 ; clear sprite
 	jp Function37ec7
-.asm_34fb0
+.multihit_conversion_doublehit_twineedle
 	ld a, [wc689]
 	and 1
 	xor 1
@@ -2837,17 +2837,17 @@ BattleCommand0b: ; 34f60
 ; 34fd1
 
 
-BattleCommand92: ; 34fd1
+BattleCommand_StatUpAnim: ; 34fd1
 	ld a, [AttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
 
 	xor a
-	jr BattleCommand91_92
+	jr BattleCommand_StatUpDownAnim
 ; 34fdb
 
 
-BattleCommand91: ; 34fdb
+BattleCommand_StatDownAnim: ; 34fdb
 	ld a, [AttackMissed]
 	and a
 	jp nz, BattleCommand_MoveDelay
@@ -2855,14 +2855,14 @@ BattleCommand91: ; 34fdb
 	ld a, [hBattleTurn]
 	and a
 	ld a, 2
-	jr z, BattleCommand91_92
+	jr z, BattleCommand_StatUpDownAnim
 	ld a, 5
 
 	; fallthrough
 ; 34feb
 
 
-BattleCommand91_92: ; 34feb
+BattleCommand_StatUpDownAnim: ; 34feb
 	ld [wcfca], a
 	xor a
 	ld [wc689], a
@@ -2884,7 +2884,7 @@ BattleCommand_SwitchTurn: ; 34ffd
 ; 35004
 
 
-BattleCommand0c: ; 35004
+BattleCommand_RaiseSub: ; 35004
 ; raisesub
 
 	ld a, BATTLE_VARS_SUBSTATUS4
@@ -2933,7 +2933,7 @@ BattleCommand_ResultText: ; 35023
 	jp EndMoveEffect
 
 .asm_35049
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	jp EndMoveEffect
 
 .asm_3504f
@@ -3274,7 +3274,7 @@ BattleCommand_CheckDestinyBond: ; 351c0
 	jr nz, .asm_3524d
 
 .asm_3524a
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 
 .asm_3524d
 	jp EndMoveEffect
@@ -5011,7 +5011,7 @@ BattleCommand_SleepTalk: ; 35b33
 	jr nz, .asm_35b9a
 	ld a, [wc689]
 	push af
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	pop af
 	ld [wc689], a
 .asm_35b9a
@@ -6793,9 +6793,9 @@ BattleCommanda6: ; 365af
 	ld hl, GetMonBackpic
 	ld a, [hBattleTurn]
 	and a
-	jr z, .asm_365ba ; 365b5 $3
-	ld hl, Function3f47c
-.asm_365ba
+	jr z, .PlayerTurn ; 365b5 $3
+	ld hl, GetMonFrontpic
+.PlayerTurn
 	xor a
 	ld [$ffd4], a
 	call CallBattleCore
@@ -6807,9 +6807,9 @@ BattleCommanda7: ; 365c3
 	ld hl, Function3f447
 	ld a, [hBattleTurn]
 	and a
-	jr z, .asm_365ce ; 365c9 $3
+	jr z, .PlayerTurn ; 365c9 $3
 	ld hl, Function3f486
-.asm_365ce
+.PlayerTurn
 	xor a
 	ld [$ffd4], a
 	call CallBattleCore
@@ -7176,7 +7176,7 @@ BattleCommand_Teleport: ; 36778
 	ld [wd232], a
 	ld [wc689], a
 	call Function36804
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call Function37e36
 	ld c, 20
 	call DelayFrames
@@ -7390,9 +7390,9 @@ BattleCommand_ForceSwitch: ; 3680f
 	jp CallBattleCore
 
 .asm_36969
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call BattleCommand_MoveDelay
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	jp PrintButItFailed
 
 .asm_36975
@@ -7742,7 +7742,7 @@ BattleCommand_Charge: ; 36b4d
 	jr z, .asm_36b65
 
 	call BattleCommand_MoveDelay
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	call PrintButItFailed
 	jp EndMoveEffect
 
@@ -7756,7 +7756,7 @@ BattleCommand_Charge: ; 36b4d
 	and a
 	call nz, StdBattleTextBox
 
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	xor a
 	ld [wcfca], a
 	inc a
@@ -7768,7 +7768,7 @@ BattleCommand_Charge: ; 36b4d
 	jr z, .asm_36b96
 	cp DIG
 	jr z, .asm_36b96
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	jr .asm_36b99
 .asm_36b96
 	call Function37ec0
@@ -8346,13 +8346,13 @@ endr
 
 .asm_36ef4
 	call Function34548
-	call nz, BattleCommand0c
+	call nz, BattleCommand_RaiseSub
 	ld hl, HasSubstituteText
 	jr .asm_36f08
 
 .asm_36eff
 	call Function34548
-	call nz, BattleCommand0c
+	call nz, BattleCommand_RaiseSub
 	ld hl, TooWeakSubText
 .asm_36f08
 	jp StdBattleTextBox
@@ -9166,7 +9166,7 @@ BattleCommand_SelfDestruct: ; 37380
 	ld [hl], a
 	ld a, $1
 	ld [wc689], a
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call Function37e36
 	ld a, BATTLE_VARS_SUBSTATUS4
 	call GetBattleVarAddr
@@ -10386,11 +10386,11 @@ BattleCommand_FutureSight: ; 37d34
 	jr nz, .asm_37d87 ; 37d58 $2d
 	ld a, $4
 	ld [hl], a
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call BattleCommand_MoveDelay
 	ld hl, ForesawAttackText
 	call StdBattleTextBox
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	ld de, wc727
 	ld a, [hBattleTurn]
 	and a
@@ -10497,11 +10497,11 @@ Function37de9: ; 37de9
 	push bc
 	ld a, [wc689]
 	push af
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	pop af
 	ld [wc689], a
 	call Function37e19
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	pop bc
 	pop de
 	pop hl
@@ -10515,11 +10515,11 @@ AnimateCurrentMove: ; 37e01
 	push bc
 	ld a, [wc689]
 	push af
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	pop af
 	ld [wc689], a
 	call Function37e36
-	call BattleCommand0c
+	call BattleCommand_RaiseSub
 	pop bc
 	pop de
 	pop hl
@@ -10616,9 +10616,9 @@ CallBattleCore: ; 37e73
 
 
 AnimateFailedMove: ; 37e77
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	call BattleCommand_MoveDelay
-	jp BattleCommand0c
+	jp BattleCommand_RaiseSub
 ; 37e80
 
 
diff --git a/battle/effects/metronome.asm b/battle/effects/metronome.asm
index ba20de47d..016d67089 100644
--- a/battle/effects/metronome.asm
+++ b/battle/effects/metronome.asm
@@ -7,7 +7,7 @@ BattleCommand_Metronome: ; 37418
 
 	ld a, [wc689]
 	push af
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	pop af
 	ld [wc689], a
 
diff --git a/battle/effects/mirror_move.asm b/battle/effects/mirror_move.asm
index 146c6df03..1b39b1ad3 100644
--- a/battle/effects/mirror_move.asm
+++ b/battle/effects/mirror_move.asm
@@ -42,7 +42,7 @@ BattleCommand_MirrorMove: ; 373c9
 
 	ld a, [wc689]
 	push af
-	call BattleCommand0a
+	call BattleCommand_LowerSub
 	pop af
 	ld [wc689], a
 
diff --git a/battle/moves/move_effects.asm b/battle/moves/move_effects.asm
index 29fd27983..b5aadf1a1 100644
--- a/battle/moves/move_effects.asm
+++ b/battle/moves/move_effects.asm
@@ -252,9 +252,9 @@ AttackUp:
 	usedmovetext
 	doturn
 	attackup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -266,9 +266,9 @@ DefenseUp:
 	usedmovetext
 	doturn
 	defenseup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -278,9 +278,9 @@ SpeedUp:
 	usedmovetext
 	doturn
 	speedup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -291,9 +291,9 @@ SpecialAttackUp:
 	usedmovetext
 	doturn
 	specialattackup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -303,9 +303,9 @@ SpecialDefenseUp:
 	usedmovetext
 	doturn
 	specialdefenseup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -315,9 +315,9 @@ AccuracyUp:
 	usedmovetext
 	doturn
 	accuracyup
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -328,11 +328,11 @@ EvasionUp:
 	checkobedience
 	usedmovetext
 	doturn
-	effect0x0a
+	lowersub
 	evasionup
-	effect0x92
+	statupanim
 	effect0xa7
-	effect0x0c
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -343,9 +343,9 @@ AttackUp2:
 	usedmovetext
 	doturn
 	attackup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -357,9 +357,9 @@ DefenseUp2:
 	usedmovetext
 	doturn
 	defenseup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -370,9 +370,9 @@ SpeedUp2:
 	usedmovetext
 	doturn
 	speedup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -382,9 +382,9 @@ SpecialAttackUp2:
 	usedmovetext
 	doturn
 	specialattackup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -395,9 +395,9 @@ SpecialDefenseUp2:
 	usedmovetext
 	doturn
 	specialdefenseup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -407,9 +407,9 @@ AccuracyUp2:
 	usedmovetext
 	doturn
 	accuracyup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -419,9 +419,9 @@ EvasionUp2:
 	usedmovetext
 	doturn
 	evasionup2
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove
@@ -433,9 +433,9 @@ AttackDown:
 	doturn
 	checkhit
 	attackdown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -448,9 +448,9 @@ DefenseDown:
 	doturn
 	checkhit
 	defensedown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -462,9 +462,9 @@ SpeedDown:
 	doturn
 	checkhit
 	speeddown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -475,9 +475,9 @@ SpecialAttackDown:
 	doturn
 	checkhit
 	specialattackdown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -488,9 +488,9 @@ SpecialDefenseDown:
 	doturn
 	checkhit
 	specialdefensedown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -505,9 +505,9 @@ AccuracyDown:
 	doturn
 	checkhit
 	accuracydown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -519,9 +519,9 @@ EvasionDown:
 	doturn
 	checkhit
 	evasiondown
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -533,9 +533,9 @@ AttackDown2:
 	doturn
 	checkhit
 	attackdown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -547,9 +547,9 @@ DefenseDown2:
 	doturn
 	checkhit
 	defensedown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -562,9 +562,9 @@ SpeedDown2:
 	doturn
 	checkhit
 	speeddown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -575,9 +575,9 @@ SpecialAttackDown2:
 	doturn
 	checkhit
 	specialattackdown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -588,9 +588,9 @@ SpecialDefenseDown2:
 	doturn
 	checkhit
 	specialdefensedown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -601,9 +601,9 @@ AccuracyDown2:
 	doturn
 	checkhit
 	accuracydown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -614,9 +614,9 @@ EvasionDown2:
 	doturn
 	checkhit
 	evasiondown2
-	effect0x0a
-	effect0x91
-	effect0x0c
+	lowersub
+	statdownanim
+	raisesub
 	statmessagetarget
 	statdownfailtext
 	endmove
@@ -958,7 +958,7 @@ MultiHit:
 	usedmovetext
 	doturn
 	startloop
-	effect0x0a
+	lowersub
 	checkhit
 	critical
 	damagestats
@@ -975,7 +975,7 @@ MultiHit:
 	checkdestinybond
 	buildopponentrage
 	endloop
-	effect0x0c
+	raisesub
 	kingsrock
 	endmove
 
@@ -985,7 +985,7 @@ PoisonMultiHit:
 	usedmovetext
 	doturn
 	startloop
-	effect0x0a
+	lowersub
 	checkhit
 	effectchance
 	critical
@@ -1003,7 +1003,7 @@ PoisonMultiHit:
 	checkdestinybond
 	buildopponentrage
 	endloop
-	effect0x0c
+	raisesub
 	kingsrock
 	poisontarget
 	endmove
@@ -1351,7 +1351,7 @@ Dig:
 	damagevariation
 	checkhit
 	effect0x0b
-	effect0x0c
+	raisesub
 	resulttext
 	checkfaint
 	criticaltext
@@ -1562,7 +1562,7 @@ TripleKick:
 	usedmovetext
 	doturn
 	startloop
-	effect0x0a
+	lowersub
 	checkhit
 	critical
 	damagestats
@@ -1581,7 +1581,7 @@ TripleKick:
 	buildopponentrage
 	kickcounter
 	endloop
-	effect0x0c
+	raisesub
 	kingsrock
 	endmove
 
@@ -1725,9 +1725,9 @@ Swagger:
 	switchturn
 	attackup2
 	switchturn
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	resulttext
 	switchturn
 	statmessageuser
@@ -2204,7 +2204,7 @@ BeatUp:
 	movedelay
 	doturn
 	startloop
-	effect0x0a
+	lowersub
 	checkhit
 	critical
 	beatup
@@ -2221,7 +2221,7 @@ BeatUp:
 	buildopponentrage
 	endloop
 	effect0xa8
-	effect0x0c
+	raisesub
 	kingsrock
 	endmove
 
@@ -2231,9 +2231,9 @@ DefenseCurl:
 	doturn
 	defenseup
 	curl
-	effect0x0a
-	effect0x92
-	effect0x0c
+	lowersub
+	statupanim
+	raisesub
 	statmessageuser
 	statupfailtext
 	endmove