thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Label some battle related functions

Browse source
This commit is contained in:
xCrystal 2015-03-31 20:50:49 +02:00
parent 4ba8dd6090
commit c73b5d73f4
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
engine/battle/core.asm
View file

@ -875,7 +875,7 @@ FaintEnemyPokemon ; 0x3c567
call WaitForSoundToFinish call WaitForSoundToFinish
jr .sfxplayed jr .sfxplayed
.wild_win .wild_win
call Func_3c643 call EndLowHealthAlarm
ld a, MUSIC_DEFEATED_WILD_MON ld a, MUSIC_DEFEATED_WILD_MON
call PlayBattleVictoryMusic call PlayBattleVictoryMusic
.sfxplayed .sfxplayed
@ -946,7 +946,7 @@ EnemyMonFaintedText: ; 0x3c63e
TX_FAR _EnemyMonFaintedText TX_FAR _EnemyMonFaintedText
db "@" db "@"
Func_3c643: ; 3c643 (f:4643) EndLowHealthAlarm: ; 3c643 (f:4643)
xor a xor a
ld [wLowHealthAlarm], a ;disable low health alarm ld [wLowHealthAlarm], a ;disable low health alarm
ld [wc02a], a ld [wc02a], a
@ -996,7 +996,7 @@ ReplaceFaintedEnemyMon: ; 3c664 (f:4664)
ret ret
TrainerBattleVictory: ; 3c696 (f:4696) TrainerBattleVictory: ; 3c696 (f:4696)
call Func_3c643 call EndLowHealthAlarm
ld b, MUSIC_DEFEATED_GYM_LEADER ld b, MUSIC_DEFEATED_GYM_LEADER
ld a, [W_GYMLEADERNO] ld a, [W_GYMLEADERNO]
and a and a
@ -3188,7 +3188,7 @@ PlayerCalcMoveDamage: ; 3d6dc (f:56dc)
jp c,.moveHitTest ; SetDamageEffects moves (e.g. Seismic Toss and Super Fang) skip damage calculation jp c,.moveHitTest ; SetDamageEffects moves (e.g. Seismic Toss and Super Fang) skip damage calculation
call CriticalHitTest call CriticalHitTest
call HandleCounterMove call HandleCounterMove
jr z,asm_3d705 jr z,handleIfMoveMissed
call GetDamageVarsForPlayerAttack call GetDamageVarsForPlayerAttack
call CalculateDamage call CalculateDamage
jp z,asm_3d74b ; for moves with 0 BP, skip any further damage calculation and, for now, skip MoveHitTest jp z,asm_3d74b ; for moves with 0 BP, skip any further damage calculation and, for now, skip MoveHitTest
@ -3197,7 +3197,7 @@ PlayerCalcMoveDamage: ; 3d6dc (f:56dc)
call RandomizeDamage call RandomizeDamage
.moveHitTest .moveHitTest
call MoveHitTest call MoveHitTest
asm_3d705 handleIfMoveMissed
ld a,[W_MOVEMISSED] ld a,[W_MOVEMISSED]
and a and a
jr z,asm_3d714 jr z,asm_3d714
@ -3573,7 +3573,7 @@ CheckPlayerStatusConditions: ; 3d854 (f:5854)
ld [hl],a ld [hl],a
ld a,BIDE ld a,BIDE
ld [W_PLAYERMOVENUM],a ld [W_PLAYERMOVENUM],a
ld hl,asm_3d705 ; skip damage calculation, DecrementPP and MoveHitTest ld hl,handleIfMoveMissed ; skip damage calculation, DecrementPP and MoveHitTest
jp .returnToHL jp .returnToHL
.ThrashingAboutCheck .ThrashingAboutCheck
@ -4481,7 +4481,7 @@ CalculateDamage: ; 3df65 (f:5f65)
; d: base power ; d: base power
; e: level ; e: level
ld a, [$fff3] ; whose turn? ld a, [H_WHOSETURN] ; whose turn?
and a and a
ld a, [W_PLAYERMOVEEFFECT] ld a, [W_PLAYERMOVEEFFECT]
jr z, .effect jr z, .effect
@ -4504,7 +4504,7 @@ CalculateDamage: ; 3df65 (f:5f65)
; Calculate OHKO damage based on remaining HP. ; Calculate OHKO damage based on remaining HP.
cp a, OHKO_EFFECT cp a, OHKO_EFFECT
jp z, Func_3e016 jp z, JumpToOHKOMoveEffect
; Don't calculate damage for moves that don't do any. ; Don't calculate damage for moves that don't do any.
ld a, d ; base power ld a, d ; base power
@ -4636,7 +4636,7 @@ CalculateDamage: ; 3df65 (f:5f65)
and a and a
ret ret
Func_3e016: ; 3e016 (f:6016) JumpToOHKOMoveEffect: ; 3e016 (f:6016)
call JumpMoveEffect call JumpMoveEffect
ld a, [W_MOVEMISSED] ld a, [W_MOVEMISSED]
dec a dec a
@ -5066,7 +5066,7 @@ AttackSubstitute: ; 3e25e (f:625e)
; the Substitute had before being attacked. ; the Substitute had before being attacked.
ld h,b ld h,b
ld l,c ld l,c
res 4,[hl] ; unset the substitute bit res HasSubstituteUp,[hl] ; unset the substitute bit
ld hl,SubstituteBrokeText ld hl,SubstituteBrokeText
call PrintText call PrintText
; flip whose turn it is for the next function call ; flip whose turn it is for the next function call
@ -7096,7 +7096,7 @@ JumpMoveEffect: ; 3f132 (f:7132)
ret ret
_JumpMoveEffect: ; 3f138 (f:7138) _JumpMoveEffect: ; 3f138 (f:7138)
ld a, [$fff3] ;whose turn? ld a, [H_WHOSETURN]
and a and a
ld a, [W_PLAYERMOVEEFFECT] ld a, [W_PLAYERMOVEEFFECT]
jr z, .next1 jr z, .next1
@ -7376,7 +7376,7 @@ FreezeBurnParalyzeEffect: ; 3f30c (f:730c)
ld [wcc5b], a ld [wcc5b], a
call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag] call CheckTargetSubstitute ; test bit 4 of d063/d068 flags [target has substitute flag]
ret nz ; return if they have a substitute, can't effect them ret nz ; return if they have a substitute, can't effect them
ld a, [$fff3] ld a, [H_WHOSETURN]
and a and a
jp nz, opponentAttacker jp nz, opponentAttacker
ld a, [wEnemyMonStatus] ld a, [wEnemyMonStatus]
@ -7488,7 +7488,7 @@ CheckDefrost: ; 3f3e2 (f:73e2)
; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target ; any fire-type move that has a chance inflict burn (all but Fire Spin) will defrost a frozen target
and a, 1 << FRZ ; are they frozen? and a, 1 << FRZ ; are they frozen?
ret z ; return if so ret z ; return if so
ld a, [$fff3] ld a, [H_WHOSETURN]
and a and a
jr nz, .opponent jr nz, .opponent
;player [attacker] ;player [attacker]
@ -7885,7 +7885,7 @@ MoveMissed: ; 3f65a (f:765a)
ld a, [de] ld a, [de]
cp $44 cp $44
ret nc ret nc
jp Func_3fb4e jp ConditionalPrintButItFailed
MonsStatsFellText: ; 3f661 (f:7661) MonsStatsFellText: ; 3f661 (f:7661)
TX_FAR _MonsStatsFellText TX_FAR _MonsStatsFellText
@ -8084,7 +8084,7 @@ SwitchAndTeleportEffect: ; 3f739 (f:7739)
ld a, [W_ENEMYMOVENUM] ld a, [W_ENEMYMOVENUM]
cp TELEPORT cp TELEPORT
jp nz, PrintText jp nz, PrintText
jp Func_3fb4e jp ConditionalPrintButItFailed
.asm_3f7e4 .asm_3f7e4
push af push af
call PlayBattleAnimation call PlayBattleAnimation
@ -8358,7 +8358,7 @@ ConfusionEffectFailed: ; 3f9a6 (f:79a6)
ret z ret z
ld c, $32 ld c, $32
call DelayFrames call DelayFrames
jp Func_3fb4e jp ConditionalPrintButItFailed
ParalyzeEffect: ; 3f9b1 (f:79b1) ParalyzeEffect: ; 3f9b1 (f:79b1)
ld hl, ParalyzeEffect_ ld hl, ParalyzeEffect_
@ -8613,10 +8613,10 @@ NoEffectText: ; 3fb49 (f:7b49)
TX_FAR _NoEffectText TX_FAR _NoEffectText
db "@" db "@"
Func_3fb4e: ; 3fb4e (f:7b4e) ConditionalPrintButItFailed: ; 3fb4e (f:7b4e)
ld a, [wMoveDidntMiss] ld a, [wMoveDidntMiss]
and a and a
ret nz ret nz ; return if the side effect failed, yet the attack was successful
PrintButItFailedText_: ; 3fb53 (f:7b53) PrintButItFailedText_: ; 3fb53 (f:7b53)
ld hl, ButItFailedText ld hl, ButItFailedText