mirror of
https://github.com/pret/pokecrystal.git
synced 2026-04-24 06:48:37 -05:00
Merge 66a60c9b32 into 983c33b5c9
This commit is contained in:
commit
fbc0ca324b
|
|
@ -38,7 +38,7 @@ BattleCommandPointers:
|
|||
dw BattleCommand_Conversion
|
||||
dw BattleCommand_ResetStats
|
||||
dw BattleCommand_StoreEnergy
|
||||
dw BattleCommand_UnleashEnergy
|
||||
dw BattleCommand_StartBide
|
||||
dw BattleCommand_ForceSwitch
|
||||
dw BattleCommand_EndLoop
|
||||
dw BattleCommand_FlinchTarget
|
||||
|
|
|
|||
|
|
@ -797,7 +797,7 @@ Bide:
|
|||
checkobedience
|
||||
doturn
|
||||
usedmovetext
|
||||
unleashenergy
|
||||
startbide
|
||||
resettypematchup
|
||||
checkhit
|
||||
moveanim
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ Defined in [macros/scripts/battle_commands.asm](https://github.com/pret/pokecrys
|
|||
## `$21`: `storeenergy`
|
||||
|
||||
|
||||
## `$22`: `unleashenergy`
|
||||
## `$22`: `startbide`
|
||||
|
||||
|
||||
## `$23`: `forceswitch`
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ BattleCommand_StoreEnergy:
|
|||
ld a, BIDE
|
||||
ld [hl], a
|
||||
|
||||
ld b, unleashenergy_command
|
||||
ld b, startbide_command
|
||||
jp SkipToBattleCommand
|
||||
|
||||
.still_storing
|
||||
|
|
@ -67,7 +67,7 @@ BattleCommand_StoreEnergy:
|
|||
call StdBattleTextbox
|
||||
jp EndMoveEffect
|
||||
|
||||
BattleCommand_UnleashEnergy:
|
||||
BattleCommand_StartBide:
|
||||
ld de, wPlayerDamageTaken
|
||||
ld bc, wPlayerRolloutCount
|
||||
ldh a, [hBattleTurn]
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ ENDM
|
|||
command conversion ; 1f
|
||||
command resetstats ; 20
|
||||
command storeenergy ; 21
|
||||
command unleashenergy ; 22
|
||||
command startbide ; 22
|
||||
command forceswitch ; 23
|
||||
command endloop ; 24
|
||||
command flinchtarget ; 25
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user