More syncing with pokegold

This commit is contained in:
Rangi
2020-11-03 10:13:06 -05:00
parent 01d6e6c758
commit 826e070f04
14 changed files with 29 additions and 29 deletions

View File

@@ -3652,17 +3652,17 @@ BattleCommand_SleepTarget:
jr nz, .fail
call AnimateCurrentMove
ld b, $7
ld b, SLP
ld a, [wInBattleTowerBattle]
and a
jr z, .random_loop
ld b, $3
ld b, %011
.random_loop
call BattleRandom
and b
jr z, .random_loop
cp 7
cp SLP
jr z, .random_loop
inc a
ld [de], a
@@ -5714,7 +5714,8 @@ BattleCommand_Charge:
text_far _BattleDugText
text_end
BattleCommand_Unused3C: ; unreferenced
BattleCommand_Unused3C:
; effect0x3c
ret
BattleCommand_TrapTarget:
@@ -6488,7 +6489,8 @@ INCLUDE "engine/battle/move_effects/sandstorm.asm"
INCLUDE "engine/battle/move_effects/rollout.asm"
BattleCommand_Unused5D: ; unreferenced
BattleCommand_Unused5D:
; effect0x5d
ret
INCLUDE "engine/battle/move_effects/fury_cutter.asm"

View File

@@ -17,7 +17,7 @@ BattleCommand_BellyDrum:
pop bc
callfar SubtractHPFromUser
call UpdateUserInParty
ld a, 5
ld a, MAX_STAT_LEVEL - BASE_STAT_LEVEL - 1
.max_attack_loop
push af

View File

@@ -1,5 +1,4 @@
DisplayUsedMoveText:
; battle command 03
ld hl, UsedMoveText
call BattleTextbox
jp WaitBGMap