mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-09-09 09:51:34 -07:00
More battle command labels
This commit is contained in:
PikalaxALT
parent
ae2970d73b
commit
d8aa438644
@ -176,7 +176,7 @@ AI_Types: ; 38635
|
||||
push de
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
pop de
|
||||
pop bc
|
||||
pop hl
|
||||
@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
|
||||
push hl
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
pop hl
|
||||
|
||||
; 60% chance to discourage this move if not very effective.
|
||||
@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d
|
||||
|
||||
push hl
|
||||
push bc
|
||||
callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callba BattleCheckTypeMatchup
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
pop bc
|
||||
@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8
|
||||
|
||||
ld a, $1
|
||||
ld [hBattleTurn], a
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
@ -1504,7 +1504,7 @@ AI_Smart_Encore: ; 38c3b
|
||||
push hl
|
||||
ld a, [wEnemyMoveStruct + MOVE_TYPE]
|
||||
ld hl, EnemyMonType1
|
||||
predef Function347d3
|
||||
predef CheckTypeMatchup
|
||||
|
||||
pop hl
|
||||
ld a, [wd265]
|
||||
@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98
|
||||
xor a
|
||||
ld [hBattleTurn], a
|
||||
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
|
||||
ld a, [wd265]
|
||||
cp $a
|
||||
@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e
|
||||
|
||||
; Calculate Hidden Power's type and base power based on enemy's DVs.
|
||||
callab HiddenPowerDamage
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
pop hl
|
||||
|
||||
; Discourage Hidden Power if not very effective.
|
||||
@ -3498,7 +3498,7 @@ AI_Status: ; 39453
|
||||
push de
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
pop de
|
||||
pop bc
|
||||
pop hl
|
||||
|
||||
@ -498,7 +498,7 @@ endr
|
||||
ret
|
||||
|
||||
BattleAnimCmd_EF: ; cc383 (33:4383)
|
||||
ld hl, wc689
|
||||
ld hl, wKickCounter
|
||||
ld a, [hl]
|
||||
and a
|
||||
jr z, .asm_cc39a
|
||||
@ -568,7 +568,7 @@ endr
|
||||
|
||||
BattleAnimCmd_F8: ; cc3d6 (33:43d6)
|
||||
call GetBattleAnimByte
|
||||
ld hl, wc689
|
||||
ld hl, wKickCounter
|
||||
cp [hl]
|
||||
jr z, .jump
|
||||
|
||||
@ -598,7 +598,7 @@ endr
|
||||
BattleAnimCmd_EE: ; cc3fa (33:43fa)
|
||||
call GetBattleAnimByte
|
||||
ld e, a
|
||||
ld a, [wc689]
|
||||
ld a, [wKickCounter]
|
||||
and e
|
||||
jr nz, .jump
|
||||
|
||||
@ -1150,7 +1150,7 @@ BattleAnimCmd_E6: ; cc776 (33:4776)
|
||||
ld a, [CurPartySpecies] ; CurPartySpecies
|
||||
push af
|
||||
|
||||
ld a, [wc689]
|
||||
ld a, [wKickCounter]
|
||||
ld [CurPartySpecies], a ; CurPartySpecies
|
||||
|
||||
ld a, [hBattleTurn] ; $ff00+$e4
|
||||
|
||||
@ -424,7 +424,7 @@ Function3c27c: ; 3c27c
|
||||
call GetItemName
|
||||
ld hl, BattleText_UsersStringBuffer1Activated
|
||||
call StdBattleTextBox
|
||||
callab BattleCommand_StatMessageUser
|
||||
callab BattleCommand_StatUpMessage
|
||||
pop af
|
||||
bit SUBSTATUS_CONFUSED, a
|
||||
ret nz
|
||||
@ -1133,7 +1133,7 @@ ResidualDamage: ; 3c716
|
||||
ld c, l
|
||||
.did_toxic
|
||||
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
.did_psn_brn
|
||||
|
||||
call HasUserFainted
|
||||
@ -1155,7 +1155,7 @@ ResidualDamage: ; 3c716
|
||||
call SwitchTurnCore
|
||||
|
||||
call GetEighthMaxHP
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
ld a, $1
|
||||
ld [hBGMapMode], a
|
||||
call Function3ccef
|
||||
@ -1175,7 +1175,7 @@ ResidualDamage: ; 3c716
|
||||
ld de, ANIM_IN_NIGHTMARE
|
||||
call Function3ee0f
|
||||
call GetQuarterMaxHP
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
ld hl, HasANightmareText
|
||||
call StdBattleTextBox
|
||||
.asm_3c7c5
|
||||
@ -1193,7 +1193,7 @@ ResidualDamage: ; 3c716
|
||||
ld de, ANIM_IN_NIGHTMARE
|
||||
call Function3ee0f
|
||||
call GetQuarterMaxHP
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
ld hl, HurtByCurseText
|
||||
call StdBattleTextBox
|
||||
|
||||
@ -1334,7 +1334,7 @@ Function3c874: ; 3c874
|
||||
|
||||
.asm_3c8d3
|
||||
call GetSixteenthMaxHP
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
ld hl, BattleText_UsersHurtByStringBuffer1
|
||||
jr .asm_3c8e1
|
||||
|
||||
@ -1827,7 +1827,7 @@ HandleWeather: ; 3cb9e
|
||||
call Call_PlayBattleAnim
|
||||
call SwitchTurnCore
|
||||
call GetEighthMaxHP
|
||||
call Function3cc3f
|
||||
call SubtractHPFromUser
|
||||
|
||||
ld hl, SandstormHitsText
|
||||
jp StdBattleTextBox
|
||||
@ -1863,19 +1863,19 @@ endr
|
||||
dw BattleText_TheSandstormSubsided
|
||||
; 3cc39
|
||||
|
||||
Function3cc39: ; 3cc39
|
||||
call Function3cc45
|
||||
SubtractHPFromTarget: ; 3cc39
|
||||
call SubtractHP
|
||||
jp Function3cd3c
|
||||
; 3cc3f
|
||||
|
||||
Function3cc3f: ; 3cc3f
|
||||
SubtractHPFromUser: ; 3cc3f
|
||||
; Subtract HP from Pkmn
|
||||
call Function3cc45
|
||||
call SubtractHP
|
||||
jp Function3cd36
|
||||
; 3cc45
|
||||
|
||||
|
||||
Function3cc45: ; 3cc45
|
||||
SubtractHP: ; 3cc45
|
||||
ld hl, BattleMonHP
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
@ -3480,7 +3480,7 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
|
||||
ld a, BANK(Moves)
|
||||
call FarCopyBytes
|
||||
call SetEnemyTurn
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
pop bc
|
||||
pop de
|
||||
pop hl
|
||||
@ -3516,13 +3516,13 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
|
||||
ld a, [BattleMonType1]
|
||||
ld [wPlayerMoveStruct + MOVE_TYPE], a
|
||||
call SetPlayerTurn
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
ld a, [wd265]
|
||||
cp 10 + 1 ; 1.0 + 0.1
|
||||
jr nc, .asm_3d663
|
||||
ld a, [BattleMonType2]
|
||||
ld [wPlayerMoveStruct + MOVE_TYPE], a
|
||||
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn
|
||||
callab BattleCheckTypeMatchup
|
||||
ld a, [wd265]
|
||||
cp 10 + 1 ; 1.0 + 0.1
|
||||
jr nc, .asm_3d663
|
||||
@ -3749,7 +3749,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
|
||||
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
call SetEnemyTurn
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
@ -3757,7 +3757,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
|
||||
call BattleCheckEnemyShininess
|
||||
jr nc, .asm_3d800
|
||||
ld a, 1 ; shiny anim
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
.asm_3d800
|
||||
@ -3811,8 +3811,8 @@ endr
|
||||
; 3d867
|
||||
|
||||
ResetEnemyStatLevels: ; 3d867
|
||||
ld a, 7
|
||||
ld b, 8
|
||||
ld a, BASE_STAT_LEVEL
|
||||
ld b, NUM_LEVEL_STATS
|
||||
ld hl, EnemyStatLevels
|
||||
.loop
|
||||
ld [hli], a
|
||||
@ -4142,8 +4142,8 @@ GetEnemyMonDVs: ; 3da97
|
||||
; 3dab1
|
||||
|
||||
ResetPlayerStatLevels: ; 3dab1
|
||||
ld a, 7
|
||||
ld b, 8
|
||||
ld a, BASE_STAT_LEVEL
|
||||
ld b, NUM_LEVEL_STATS
|
||||
ld hl, PlayerStatLevels
|
||||
.loop
|
||||
ld [hli], a
|
||||
@ -4255,13 +4255,13 @@ Function3db5f: ; 3db5f
|
||||
call SetPlayerTurn
|
||||
xor a
|
||||
ld [wcfca], a
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
call BattleCheckPlayerShininess
|
||||
jr nc, .asm_3dbbc
|
||||
ld a, $1
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
|
||||
@ -4351,7 +4351,7 @@ SpikesDamage: ; 3dc23
|
||||
call StdBattleTextBox
|
||||
|
||||
call GetEighthMaxHP
|
||||
call Function3cc39
|
||||
call SubtractHPFromTarget
|
||||
|
||||
pop hl
|
||||
call .hl
|
||||
@ -4627,15 +4627,15 @@ Function3dde9: ; 3dde9
|
||||
res SUBSTATUS_CONFUSED, [hl]
|
||||
|
||||
.asm_3de26
|
||||
ld hl, Function365fd
|
||||
ld hl, CalcEnemyStats
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_3de31
|
||||
ld hl, Function365d7
|
||||
ld hl, CalcPlayerStats
|
||||
|
||||
.asm_3de31
|
||||
call SwitchTurnCore
|
||||
ld a, BANK(Function365fd)
|
||||
ld a, BANK(CalcEnemyStats)
|
||||
rst FarCall
|
||||
call SwitchTurnCore
|
||||
call Function3ddc8
|
||||
@ -4761,7 +4761,7 @@ endr
|
||||
call GetItemName
|
||||
ld hl, BattleText_UsersStringBuffer1Activated
|
||||
call StdBattleTextBox
|
||||
callab BattleCommand_StatMessageUser
|
||||
callab BattleCommand_StatUpMessage
|
||||
ret
|
||||
|
||||
.asm_3def9
|
||||
@ -6170,18 +6170,18 @@ Function3e7c1: ; 3e7c1
|
||||
call SetEnemyTurn
|
||||
callab UpdateMoveData
|
||||
call CheckSubstatus_RechargeChargedRampageBideRollout
|
||||
jr nz, .asm_3e894
|
||||
jr nz, .raging
|
||||
xor a
|
||||
ld [wc733], a
|
||||
|
||||
.asm_3e894
|
||||
.raging
|
||||
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
|
||||
cp EFFECT_FURY_CUTTER
|
||||
jr z, .asm_3e89f
|
||||
jr z, .fury_cutter
|
||||
xor a
|
||||
ld [EnemyFuryCutterCount], a
|
||||
|
||||
.asm_3e89f
|
||||
.fury_cutter
|
||||
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
|
||||
cp EFFECT_RAGE
|
||||
jr z, .asm_3e8af
|
||||
@ -6929,11 +6929,11 @@ Function3ec30: ; 3ec30
|
||||
|
||||
Function3ec31: ; 3ec31
|
||||
ld [hBattleTurn], a
|
||||
call Function3ec39
|
||||
jp Function3ec76
|
||||
call ApplyPrzEffectOnSpeed
|
||||
jp ApplyBrnEffectOnAttack
|
||||
; 3ec39
|
||||
|
||||
Function3ec39: ; 3ec39
|
||||
ApplyPrzEffectOnSpeed: ; 3ec39
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_3ec5a
|
||||
@ -6979,7 +6979,7 @@ Function3ec39: ; 3ec39
|
||||
ret
|
||||
; 3ec76
|
||||
|
||||
Function3ec76: ; 3ec76
|
||||
ApplyBrnEffectOnAttack: ; 3ec76
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
jr z, .asm_3ec93
|
||||
@ -9547,7 +9547,7 @@ BattleStartMessage: ; 3fc8b
|
||||
ld a, 1
|
||||
ld [hBattleTurn], a
|
||||
ld a, 1
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
ld de, ANIM_SEND_OUT_MON
|
||||
call Call_PlayBattleAnim
|
||||
|
||||
|
||||
@ -11,7 +11,7 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommand_DamageVariation ; 34cfd
|
||||
dw BattleCommand_CheckHit ; 34d32
|
||||
dw BattleCommand_LowerSub ; 34eee
|
||||
dw BattleCommand0b ; 34f60
|
||||
dw BattleCommand_HitTargetNoSub ; 34f60
|
||||
dw BattleCommand_RaiseSub ; 35004
|
||||
dw BattleCommand_ResultText ; 35023
|
||||
dw BattleCommand_CheckFaint ; 3505e
|
||||
@ -140,8 +140,8 @@ BattleCommandPointers: ; 3fd28
|
||||
dw BattleCommand_SpecialDefenseDown2 ; 362d9
|
||||
dw BattleCommand_AccuracyDown2 ; 362dd
|
||||
dw BattleCommand_EvasionDown2 ; 362e1
|
||||
dw BattleCommand_StatMessageUser ; 363b8
|
||||
dw BattleCommand_StatMessageTarget ; 363e9
|
||||
dw BattleCommand_StatUpMessage ; 363b8
|
||||
dw BattleCommand_StatDownMessage ; 363e9
|
||||
dw BattleCommand_StatUpFailText ; 3644c
|
||||
dw BattleCommand_StatDownFailText ; 3646a
|
||||
dw BattleCommand_EffectChance ; 34ecc
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -26,13 +26,13 @@ BattleCommand_Curse: ; 37588
|
||||
|
||||
; Attack
|
||||
ld a, [bc]
|
||||
cp 13 ; max
|
||||
cp MAX_STAT_LEVEL
|
||||
jr c, .raise
|
||||
|
||||
; Defense
|
||||
inc bc
|
||||
ld a, [bc]
|
||||
cp 13 ; max
|
||||
cp MAX_STAT_LEVEL
|
||||
jr nc, .cantraise
|
||||
|
||||
.raise
|
||||
@ -40,19 +40,19 @@ BattleCommand_Curse: ; 37588
|
||||
; Raise Attack and Defense, and lower Speed.
|
||||
|
||||
ld a, $1
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
call AnimateCurrentMove
|
||||
ld a, $2
|
||||
call Function36532
|
||||
ld a, SPEED
|
||||
call LowerStat
|
||||
call BattleCommand_SwitchTurn
|
||||
call BattleCommand_StatMessageTarget
|
||||
call BattleCommand_StatDownMessage
|
||||
call ResetMiss
|
||||
call BattleCommand_SwitchTurn
|
||||
call BattleCommand_AttackUp
|
||||
call BattleCommand_StatMessageUser
|
||||
call BattleCommand_StatUpMessage
|
||||
call ResetMiss
|
||||
call BattleCommand_DefenseUp
|
||||
jp BattleCommand_StatMessageUser
|
||||
jp BattleCommand_StatUpMessage
|
||||
|
||||
|
||||
.ghost
|
||||
@ -74,7 +74,7 @@ BattleCommand_Curse: ; 37588
|
||||
call AnimateCurrentMove
|
||||
ld hl, GetHalfMaxHP
|
||||
call CallBattleCore
|
||||
ld hl, Function3cc3f
|
||||
ld hl, SubtractHPFromUser
|
||||
call CallBattleCore
|
||||
call UpdateUserInParty
|
||||
ld hl, PutACurseText
|
||||
@ -89,7 +89,7 @@ BattleCommand_Curse: ; 37588
|
||||
|
||||
; Can't raise either stat.
|
||||
|
||||
ld b, $8 ; ABILITY
|
||||
ld b, ABILITY + 1
|
||||
call GetStatName
|
||||
call AnimateFailedMove
|
||||
ld hl, WontRiseAnymoreText
|
||||
|
||||
@ -5,14 +5,14 @@ BattleCommand_Metronome: ; 37418
|
||||
call Function34548
|
||||
jr nz, .asm_3742b
|
||||
|
||||
ld a, [wc689]
|
||||
ld a, [wKickCounter]
|
||||
push af
|
||||
call BattleCommand_LowerSub
|
||||
pop af
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
|
||||
.asm_3742b
|
||||
call Function37e36
|
||||
call PlayPlayerMoveAnim_ClearHiID
|
||||
|
||||
.GetMove
|
||||
call BattleRandom
|
||||
|
||||
@ -40,11 +40,11 @@ BattleCommand_MirrorMove: ; 373c9
|
||||
call Function34548
|
||||
jr nz, .done
|
||||
|
||||
ld a, [wc689]
|
||||
ld a, [wKickCounter]
|
||||
push af
|
||||
call BattleCommand_LowerSub
|
||||
pop af
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
|
||||
.done
|
||||
call BattleCommand_MoveDelay
|
||||
|
||||
@ -208,7 +208,7 @@ Explosion:
|
||||
damagevariation
|
||||
checkhit
|
||||
selfdestruct
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
criticaltext
|
||||
@ -255,7 +255,7 @@ AttackUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -269,7 +269,7 @@ DefenseUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -281,7 +281,7 @@ SpeedUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -294,7 +294,7 @@ SpecialAttackUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -306,7 +306,7 @@ SpecialDefenseUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -318,7 +318,7 @@ AccuracyUp:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -333,7 +333,7 @@ EvasionUp:
|
||||
statupanim
|
||||
effect0xa7
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -346,7 +346,7 @@ AttackUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -360,7 +360,7 @@ DefenseUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -373,7 +373,7 @@ SpeedUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -385,7 +385,7 @@ SpecialAttackUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -398,7 +398,7 @@ SpecialDefenseUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -410,7 +410,7 @@ AccuracyUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -422,7 +422,7 @@ EvasionUp2:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -436,7 +436,7 @@ AttackDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -451,7 +451,7 @@ DefenseDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -465,7 +465,7 @@ SpeedDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -478,7 +478,7 @@ SpecialAttackDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -491,7 +491,7 @@ SpecialDefenseDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -508,7 +508,7 @@ AccuracyDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -522,7 +522,7 @@ EvasionDown:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -536,7 +536,7 @@ AttackDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -550,7 +550,7 @@ DefenseDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -565,7 +565,7 @@ SpeedDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -578,7 +578,7 @@ SpecialAttackDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -591,7 +591,7 @@ SpecialDefenseDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -604,7 +604,7 @@ AccuracyDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -617,7 +617,7 @@ EvasionDown2:
|
||||
lowersub
|
||||
statdownanim
|
||||
raisesub
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
statdownfailtext
|
||||
endmove
|
||||
|
||||
@ -641,7 +641,7 @@ AttackDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
attackdown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
Acid:
|
||||
@ -667,7 +667,7 @@ DefenseDownHit:
|
||||
buildopponentrage
|
||||
effectchance
|
||||
defensedown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
Bubblebeam:
|
||||
@ -693,7 +693,7 @@ SpeedDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
speeddown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
SpecialAttackDownHit:
|
||||
@ -715,7 +715,7 @@ SpecialAttackDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
specialattackdown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
PsychicM:
|
||||
@ -740,7 +740,7 @@ SpecialDefenseDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
specialdefensedown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
MudSlap:
|
||||
@ -764,7 +764,7 @@ AccuracyDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
accuracydown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
EvasionDownHit:
|
||||
@ -786,7 +786,7 @@ EvasionDownHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
evasiondown
|
||||
statmessagetarget
|
||||
statdownmessage
|
||||
endmove
|
||||
|
||||
SteelWing:
|
||||
@ -809,7 +809,7 @@ DefenseUpHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
defenseup
|
||||
statmessageuser
|
||||
statupmessage
|
||||
endmove
|
||||
|
||||
MetalClaw:
|
||||
@ -832,7 +832,7 @@ AttackUpHit:
|
||||
checkdestinybond
|
||||
buildopponentrage
|
||||
attackup
|
||||
statmessageuser
|
||||
statupmessage
|
||||
endmove
|
||||
|
||||
Ancientpower:
|
||||
@ -966,7 +966,7 @@ MultiHit:
|
||||
stab
|
||||
damagevariation
|
||||
clearmissdamage
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
criticaltext
|
||||
@ -994,7 +994,7 @@ PoisonMultiHit:
|
||||
stab
|
||||
damagevariation
|
||||
clearmissdamage
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
criticaltext
|
||||
@ -1350,7 +1350,7 @@ Dig:
|
||||
stab
|
||||
damagevariation
|
||||
checkhit
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
raisesub
|
||||
resulttext
|
||||
checkfaint
|
||||
@ -1571,7 +1571,7 @@ TripleKick:
|
||||
stab
|
||||
damagevariation
|
||||
clearmissdamage
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
criticaltext
|
||||
@ -1730,7 +1730,7 @@ Swagger:
|
||||
raisesub
|
||||
resulttext
|
||||
switchturn
|
||||
statmessageuser
|
||||
statupmessage
|
||||
switchturn
|
||||
confusetarget
|
||||
endmove
|
||||
@ -2041,7 +2041,7 @@ SkullBash:
|
||||
kingsrock
|
||||
endturn
|
||||
defenseup
|
||||
statmessageuser
|
||||
statupmessage
|
||||
endmove
|
||||
|
||||
Twister:
|
||||
@ -2097,7 +2097,7 @@ FutureSight:
|
||||
futuresight
|
||||
damagevariation
|
||||
checkhit
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
checkdestinybond
|
||||
@ -2211,7 +2211,7 @@ BeatUp:
|
||||
damagecalc
|
||||
damagevariation
|
||||
clearmissdamage
|
||||
effect0x0b
|
||||
hittargetnosub
|
||||
resulttext
|
||||
checkfaint
|
||||
criticaltext
|
||||
@ -2234,6 +2234,6 @@ DefenseCurl:
|
||||
lowersub
|
||||
statupanim
|
||||
raisesub
|
||||
statmessageuser
|
||||
statupmessage
|
||||
statupfailtext
|
||||
endmove
|
||||
|
||||
@ -4,6 +4,8 @@ EGG_LEVEL EQU 5
|
||||
NUM_MOVES EQU 4
|
||||
|
||||
REST_TURNS EQU 2
|
||||
MAX_STAT_LEVEL EQU 13
|
||||
BASE_STAT_LEVEL EQU 7
|
||||
|
||||
const_def
|
||||
const ATTACK
|
||||
@ -13,6 +15,8 @@ REST_TURNS EQU 2
|
||||
const SP_DEFENSE
|
||||
const ACCURACY
|
||||
const EVASION
|
||||
const ABILITY
|
||||
NUM_LEVEL_STATS EQU const_value
|
||||
|
||||
; move struct
|
||||
const_def
|
||||
|
||||
@ -95,7 +95,7 @@ PredefPointers:: ; 856b
|
||||
add_predef Function5108b
|
||||
add_predef GetTrainerPic
|
||||
add_predef DecompressPredef ; $40
|
||||
add_predef Function347d3
|
||||
add_predef CheckTypeMatchup
|
||||
add_predef ConvertMon_1to2
|
||||
add_predef Functionfb877
|
||||
add_predef Functiond0000
|
||||
|
||||
@ -403,7 +403,7 @@ endr
|
||||
jr c, .not_kurt_ball
|
||||
ld a, POKE_BALL
|
||||
.not_kurt_ball
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
|
||||
ld de, ANIM_THROW_POKE_BALL
|
||||
ld a, e
|
||||
@ -1567,7 +1567,7 @@ Functionf030: ; f030 (3:7030)
|
||||
res 7, [hl]
|
||||
.asm_f04f
|
||||
push bc
|
||||
callba Function365d7
|
||||
callba CalcPlayerStats
|
||||
pop bc
|
||||
ret
|
||||
|
||||
@ -2344,7 +2344,7 @@ endr
|
||||
callba CheckIfStatCanBeRaised
|
||||
call WaitSFX
|
||||
|
||||
callba BattleCommand_StatMessageUser
|
||||
callba BattleCommand_StatUpMessage
|
||||
callba BattleCommand_StatUpFailText
|
||||
|
||||
ld a, [CurBattleMon]
|
||||
@ -2959,7 +2959,7 @@ UseBallInTrainerBattle: ; f7a0
|
||||
ld a, d
|
||||
ld [FXAnimIDHi], a
|
||||
xor a
|
||||
ld [wc689], a
|
||||
ld [wKickCounter], a
|
||||
ld [hBattleTurn], a
|
||||
ld [wcfca], a
|
||||
predef PlayBattleAnim
|
||||
|
||||
@ -15,7 +15,7 @@ endm
|
||||
command damagevariation
|
||||
command checkhit
|
||||
command lowersub
|
||||
command effect0x0b
|
||||
command hittargetnosub
|
||||
command raisesub
|
||||
command resulttext
|
||||
command checkfaint
|
||||
@ -144,8 +144,8 @@ endm
|
||||
command specialdefensedown2
|
||||
command accuracydown2
|
||||
command evasiondown2
|
||||
command statmessageuser
|
||||
command statmessagetarget
|
||||
command statupmessage
|
||||
command statdownmessage
|
||||
command statupfailtext
|
||||
command statdownfailtext
|
||||
command effectchance
|
||||
|
||||
3
wram.asm
3
wram.asm
@ -600,7 +600,7 @@ EnemyDamageTaken:: ; c684
|
||||
|
||||
wc686:: ds 2
|
||||
wc688:: ds 1
|
||||
wc689:: ds 1
|
||||
wKickCounter:: ds 1
|
||||
wc68a::
|
||||
BattleScriptBuffer:: ; c68a
|
||||
ds 40
|
||||
@ -1898,6 +1898,7 @@ wd264:: ds 1
|
||||
wFoundMatchingIDInParty::
|
||||
wNamedObjectIndexBuffer::
|
||||
wCurTMHM::
|
||||
wTypeMatchup::
|
||||
wd265:: ds 1
|
||||
wd266:: ds 1
|
||||
wd267:: ds 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user