pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

More battle command labels

Browse Source
This commit is contained in:
PikalaxALT
2015-11-06 20:55:16 -05:00
parent ae2970d73b
commit d8aa438644
14 changed files with 510 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
battle/ai/scoring.asm
View File

@@ -176,7 +176,7 @@ AI_Types: ; 38635
push de push de
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
pop de pop de
pop bc pop bc
pop hl pop hl
@@ -431,7 +431,7 @@ AI_Smart_LeechHit: ; 387f7
push hl push hl
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
pop hl pop hl
; 60% chance to discourage this move if not very effective. ; 60% chance to discourage this move if not very effective.
@@ -512,7 +512,7 @@ AI_Smart_LockOn: ; 3881d
push hl push hl
push bc push bc
callba HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callba BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
pop bc pop bc
@@ -1384,7 +1384,7 @@ AI_Smart_Mimic: ; 38ba8
ld a, $1 ld a, $1
ld [hBattleTurn], a ld [hBattleTurn], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
@@ -1504,7 +1504,7 @@ AI_Smart_Encore: ; 38c3b
push hl push hl
ld a, [wEnemyMoveStruct + MOVE_TYPE] ld a, [wEnemyMoveStruct + MOVE_TYPE]
ld hl, EnemyMonType1 ld hl, EnemyMonType1
predef Function347d3 predef CheckTypeMatchup
pop hl pop hl
ld a, [wd265] ld a, [wd265]
@@ -1830,7 +1830,7 @@ AI_Smart_Conversion2: ; 38d98
xor a xor a
ld [hBattleTurn], a ld [hBattleTurn], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp $a cp $a
@@ -2496,7 +2496,7 @@ AI_Smart_HiddenPower: ; 3909e
; Calculate Hidden Power's type and base power based on enemy's DVs. ; Calculate Hidden Power's type and base power based on enemy's DVs.
callab HiddenPowerDamage callab HiddenPowerDamage
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
pop hl pop hl
; Discourage Hidden Power if not very effective. ; Discourage Hidden Power if not very effective.
@@ -3498,7 +3498,7 @@ AI_Status: ; 39453
push de push de
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
pop de pop de
pop bc pop bc
pop hl pop hl

8
battle/anim_commands.asm
View File

@@ -498,7 +498,7 @@ endr
ret ret
BattleAnimCmd_EF: ; cc383 (33:4383) BattleAnimCmd_EF: ; cc383 (33:4383)
ld hl, wc689 ld hl, wKickCounter
ld a, [hl] ld a, [hl]
and a and a
jr z, .asm_cc39a jr z, .asm_cc39a
@@ -568,7 +568,7 @@ endr
BattleAnimCmd_F8: ; cc3d6 (33:43d6) BattleAnimCmd_F8: ; cc3d6 (33:43d6)
call GetBattleAnimByte call GetBattleAnimByte
ld hl, wc689 ld hl, wKickCounter
cp [hl] cp [hl]
jr z, .jump jr z, .jump
@@ -598,7 +598,7 @@ endr
BattleAnimCmd_EE: ; cc3fa (33:43fa) BattleAnimCmd_EE: ; cc3fa (33:43fa)
call GetBattleAnimByte call GetBattleAnimByte
ld e, a ld e, a
ld a, [wc689] ld a, [wKickCounter]
and e and e
jr nz, .jump jr nz, .jump
@@ -1150,7 +1150,7 @@ BattleAnimCmd_E6: ; cc776 (33:4776)
ld a, [CurPartySpecies] ; CurPartySpecies ld a, [CurPartySpecies] ; CurPartySpecies
push af push af
ld a, [wc689] ld a, [wKickCounter]
ld [CurPartySpecies], a ; CurPartySpecies ld [CurPartySpecies], a ; CurPartySpecies
ld a, [hBattleTurn] ; $ff00+$e4 ld a, [hBattleTurn] ; $ff00+$e4

74
battle/core.asm
View File

@@ -424,7 +424,7 @@ Function3c27c: ; 3c27c
call GetItemName call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox call StdBattleTextBox
callab BattleCommand_StatMessageUser callab BattleCommand_StatUpMessage
pop af pop af
bit SUBSTATUS_CONFUSED, a bit SUBSTATUS_CONFUSED, a
ret nz ret nz
@@ -1133,7 +1133,7 @@ ResidualDamage: ; 3c716
ld c, l ld c, l
.did_toxic .did_toxic
call Function3cc3f call SubtractHPFromUser
.did_psn_brn .did_psn_brn
call HasUserFainted call HasUserFainted
@@ -1155,7 +1155,7 @@ ResidualDamage: ; 3c716
call SwitchTurnCore call SwitchTurnCore
call GetEighthMaxHP call GetEighthMaxHP
call Function3cc3f call SubtractHPFromUser
ld a, $1 ld a, $1
ld [hBGMapMode], a ld [hBGMapMode], a
call Function3ccef call Function3ccef
@@ -1175,7 +1175,7 @@ ResidualDamage: ; 3c716
ld de, ANIM_IN_NIGHTMARE ld de, ANIM_IN_NIGHTMARE
call Function3ee0f call Function3ee0f
call GetQuarterMaxHP call GetQuarterMaxHP
call Function3cc3f call SubtractHPFromUser
ld hl, HasANightmareText ld hl, HasANightmareText
call StdBattleTextBox call StdBattleTextBox
.asm_3c7c5 .asm_3c7c5
@@ -1193,7 +1193,7 @@ ResidualDamage: ; 3c716
ld de, ANIM_IN_NIGHTMARE ld de, ANIM_IN_NIGHTMARE
call Function3ee0f call Function3ee0f
call GetQuarterMaxHP call GetQuarterMaxHP
call Function3cc3f call SubtractHPFromUser
ld hl, HurtByCurseText ld hl, HurtByCurseText
call StdBattleTextBox call StdBattleTextBox
@@ -1334,7 +1334,7 @@ Function3c874: ; 3c874
.asm_3c8d3 .asm_3c8d3
call GetSixteenthMaxHP call GetSixteenthMaxHP
call Function3cc3f call SubtractHPFromUser
ld hl, BattleText_UsersHurtByStringBuffer1 ld hl, BattleText_UsersHurtByStringBuffer1
jr .asm_3c8e1 jr .asm_3c8e1
@@ -1827,7 +1827,7 @@ HandleWeather: ; 3cb9e
call Call_PlayBattleAnim call Call_PlayBattleAnim
call SwitchTurnCore call SwitchTurnCore
call GetEighthMaxHP call GetEighthMaxHP
call Function3cc3f call SubtractHPFromUser
ld hl, SandstormHitsText ld hl, SandstormHitsText
jp StdBattleTextBox jp StdBattleTextBox
@@ -1863,19 +1863,19 @@ endr
dw BattleText_TheSandstormSubsided dw BattleText_TheSandstormSubsided
; 3cc39 ; 3cc39
Function3cc39: ; 3cc39 SubtractHPFromTarget: ; 3cc39
call Function3cc45 call SubtractHP
jp Function3cd3c jp Function3cd3c
; 3cc3f ; 3cc3f
Function3cc3f: ; 3cc3f SubtractHPFromUser: ; 3cc3f
; Subtract HP from Pkmn ; Subtract HP from Pkmn
call Function3cc45 call SubtractHP
jp Function3cd36 jp Function3cd36
; 3cc45 ; 3cc45
Function3cc45: ; 3cc45 SubtractHP: ; 3cc45
ld hl, BattleMonHP ld hl, BattleMonHP
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
@@ -3480,7 +3480,7 @@ LookUpTheEffectivenessOfEveryMove: ; 3d5d7
ld a, BANK(Moves) ld a, BANK(Moves)
call FarCopyBytes call FarCopyBytes
call SetEnemyTurn call SetEnemyTurn
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
pop bc pop bc
pop de pop de
pop hl pop hl
@@ -3516,13 +3516,13 @@ IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
ld a, [BattleMonType1] ld a, [BattleMonType1]
ld [wPlayerMoveStruct + MOVE_TYPE], a ld [wPlayerMoveStruct + MOVE_TYPE], a
call SetPlayerTurn call SetPlayerTurn
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr nc, .asm_3d663 jr nc, .asm_3d663
ld a, [BattleMonType2] ld a, [BattleMonType2]
ld [wPlayerMoveStruct + MOVE_TYPE], a ld [wPlayerMoveStruct + MOVE_TYPE], a
callab HowEffectiveIsTheMovetypeAgainstTheEnemyPkmn callab BattleCheckTypeMatchup
ld a, [wd265] ld a, [wd265]
cp 10 + 1 ; 1.0 + 0.1 cp 10 + 1 ; 1.0 + 0.1
jr nc, .asm_3d663 jr nc, .asm_3d663
@@ -3749,7 +3749,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
xor a xor a
ld [wcfca], a ld [wcfca], a
ld [wc689], a ld [wKickCounter], a
call SetEnemyTurn call SetEnemyTurn
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
@@ -3757,7 +3757,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
call BattleCheckEnemyShininess call BattleCheckEnemyShininess
jr nc, .asm_3d800 jr nc, .asm_3d800
ld a, 1 ; shiny anim ld a, 1 ; shiny anim
ld [wc689], a ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
.asm_3d800 .asm_3d800
@@ -3811,8 +3811,8 @@ endr
; 3d867 ; 3d867
ResetEnemyStatLevels: ; 3d867 ResetEnemyStatLevels: ; 3d867
ld a, 7 ld a, BASE_STAT_LEVEL
ld b, 8 ld b, NUM_LEVEL_STATS
ld hl, EnemyStatLevels ld hl, EnemyStatLevels
.loop .loop
ld [hli], a ld [hli], a
@@ -4142,8 +4142,8 @@ GetEnemyMonDVs: ; 3da97
; 3dab1 ; 3dab1
ResetPlayerStatLevels: ; 3dab1 ResetPlayerStatLevels: ; 3dab1
ld a, 7 ld a, BASE_STAT_LEVEL
ld b, 8 ld b, NUM_LEVEL_STATS
ld hl, PlayerStatLevels ld hl, PlayerStatLevels
.loop .loop
ld [hli], a ld [hli], a
@@ -4255,13 +4255,13 @@ Function3db5f: ; 3db5f
call SetPlayerTurn call SetPlayerTurn
xor a xor a
ld [wcfca], a ld [wcfca], a
ld [wc689], a ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
call BattleCheckPlayerShininess call BattleCheckPlayerShininess
jr nc, .asm_3dbbc jr nc, .asm_3dbbc
ld a, $1 ld a, $1
ld [wc689], a ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim
@@ -4351,7 +4351,7 @@ SpikesDamage: ; 3dc23
call StdBattleTextBox call StdBattleTextBox
call GetEighthMaxHP call GetEighthMaxHP
call Function3cc39 call SubtractHPFromTarget
pop hl pop hl
call .hl call .hl
@@ -4627,15 +4627,15 @@ Function3dde9: ; 3dde9
res SUBSTATUS_CONFUSED, [hl] res SUBSTATUS_CONFUSED, [hl]
.asm_3de26 .asm_3de26
ld hl, Function365fd ld hl, CalcEnemyStats
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3de31 jr z, .asm_3de31
ld hl, Function365d7 ld hl, CalcPlayerStats
.asm_3de31 .asm_3de31
call SwitchTurnCore call SwitchTurnCore
ld a, BANK(Function365fd) ld a, BANK(CalcEnemyStats)
rst FarCall rst FarCall
call SwitchTurnCore call SwitchTurnCore
call Function3ddc8 call Function3ddc8
@@ -4761,7 +4761,7 @@ endr
call GetItemName call GetItemName
ld hl, BattleText_UsersStringBuffer1Activated ld hl, BattleText_UsersStringBuffer1Activated
call StdBattleTextBox call StdBattleTextBox
callab BattleCommand_StatMessageUser callab BattleCommand_StatUpMessage
ret ret
.asm_3def9 .asm_3def9
@@ -6170,18 +6170,18 @@ Function3e7c1: ; 3e7c1
call SetEnemyTurn call SetEnemyTurn
callab UpdateMoveData callab UpdateMoveData
call CheckSubstatus_RechargeChargedRampageBideRollout call CheckSubstatus_RechargeChargedRampageBideRollout
jr nz, .asm_3e894 jr nz, .raging
xor a xor a
ld [wc733], a ld [wc733], a
.asm_3e894 .raging
ld a, [wEnemyMoveStruct + MOVE_EFFECT] ld a, [wEnemyMoveStruct + MOVE_EFFECT]
cp EFFECT_FURY_CUTTER cp EFFECT_FURY_CUTTER
jr z, .asm_3e89f jr z, .fury_cutter
xor a xor a
ld [EnemyFuryCutterCount], a ld [EnemyFuryCutterCount], a
.asm_3e89f .fury_cutter
ld a, [wEnemyMoveStruct + MOVE_EFFECT] ld a, [wEnemyMoveStruct + MOVE_EFFECT]
cp EFFECT_RAGE cp EFFECT_RAGE
jr z, .asm_3e8af jr z, .asm_3e8af
@@ -6929,11 +6929,11 @@ Function3ec30: ; 3ec30
Function3ec31: ; 3ec31 Function3ec31: ; 3ec31
ld [hBattleTurn], a ld [hBattleTurn], a
call Function3ec39 call ApplyPrzEffectOnSpeed
jp Function3ec76 jp ApplyBrnEffectOnAttack
; 3ec39 ; 3ec39
Function3ec39: ; 3ec39 ApplyPrzEffectOnSpeed: ; 3ec39
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3ec5a jr z, .asm_3ec5a
@@ -6979,7 +6979,7 @@ Function3ec39: ; 3ec39
ret ret
; 3ec76 ; 3ec76
Function3ec76: ; 3ec76 ApplyBrnEffectOnAttack: ; 3ec76
ld a, [hBattleTurn] ld a, [hBattleTurn]
and a and a
jr z, .asm_3ec93 jr z, .asm_3ec93
@@ -9547,7 +9547,7 @@ BattleStartMessage: ; 3fc8b
ld a, 1 ld a, 1
ld [hBattleTurn], a ld [hBattleTurn], a
ld a, 1 ld a, 1
ld [wc689], a ld [wKickCounter], a
ld de, ANIM_SEND_OUT_MON ld de, ANIM_SEND_OUT_MON
call Call_PlayBattleAnim call Call_PlayBattleAnim

6
battle/effect_command_pointers.asm
View File

@@ -11,7 +11,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_DamageVariation ; 34cfd dw BattleCommand_DamageVariation ; 34cfd
dw BattleCommand_CheckHit ; 34d32 dw BattleCommand_CheckHit ; 34d32
dw BattleCommand_LowerSub ; 34eee dw BattleCommand_LowerSub ; 34eee
dw BattleCommand0b ; 34f60 dw BattleCommand_HitTargetNoSub ; 34f60
dw BattleCommand_RaiseSub ; 35004 dw BattleCommand_RaiseSub ; 35004
dw BattleCommand_ResultText ; 35023 dw BattleCommand_ResultText ; 35023
dw BattleCommand_CheckFaint ; 3505e dw BattleCommand_CheckFaint ; 3505e
@@ -140,8 +140,8 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand_SpecialDefenseDown2 ; 362d9 dw BattleCommand_SpecialDefenseDown2 ; 362d9
dw BattleCommand_AccuracyDown2 ; 362dd dw BattleCommand_AccuracyDown2 ; 362dd
dw BattleCommand_EvasionDown2 ; 362e1 dw BattleCommand_EvasionDown2 ; 362e1
dw BattleCommand_StatMessageUser ; 363b8 dw BattleCommand_StatUpMessage ; 363b8
dw BattleCommand_StatMessageTarget ; 363e9 dw BattleCommand_StatDownMessage ; 363e9
dw BattleCommand_StatUpFailText ; 3644c dw BattleCommand_StatUpFailText ; 3644c
dw BattleCommand_StatDownFailText ; 3646a dw BattleCommand_StatDownFailText ; 3646a
dw BattleCommand_EffectChance ; 34ecc dw BattleCommand_EffectChance ; 34ecc

752
battle/effect_commands.asm
View File

File diff suppressed because it is too large Load Diff

20
battle/effects/curse.asm
View File

@@ -26,13 +26,13 @@ BattleCommand_Curse: ; 37588
; Attack ; Attack
ld a, [bc] ld a, [bc]
cp 13 ; max cp MAX_STAT_LEVEL
jr c, .raise jr c, .raise
; Defense ; Defense
inc bc inc bc
ld a, [bc] ld a, [bc]
cp 13 ; max cp MAX_STAT_LEVEL
jr nc, .cantraise jr nc, .cantraise
.raise .raise
@@ -40,19 +40,19 @@ BattleCommand_Curse: ; 37588
; Raise Attack and Defense, and lower Speed. ; Raise Attack and Defense, and lower Speed.
ld a, $1 ld a, $1
ld [wc689], a ld [wKickCounter], a
call AnimateCurrentMove call AnimateCurrentMove
ld a, $2 ld a, SPEED
call Function36532 call LowerStat
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call BattleCommand_StatMessageTarget call BattleCommand_StatDownMessage
call ResetMiss call ResetMiss
call BattleCommand_SwitchTurn call BattleCommand_SwitchTurn
call BattleCommand_AttackUp call BattleCommand_AttackUp
call BattleCommand_StatMessageUser call BattleCommand_StatUpMessage
call ResetMiss call ResetMiss
call BattleCommand_DefenseUp call BattleCommand_DefenseUp
jp BattleCommand_StatMessageUser jp BattleCommand_StatUpMessage
.ghost .ghost
@@ -74,7 +74,7 @@ BattleCommand_Curse: ; 37588
call AnimateCurrentMove call AnimateCurrentMove
ld hl, GetHalfMaxHP ld hl, GetHalfMaxHP
call CallBattleCore call CallBattleCore
ld hl, Function3cc3f ld hl, SubtractHPFromUser
call CallBattleCore call CallBattleCore
call UpdateUserInParty call UpdateUserInParty
ld hl, PutACurseText ld hl, PutACurseText
@@ -89,7 +89,7 @@ BattleCommand_Curse: ; 37588
; Can't raise either stat. ; Can't raise either stat.
ld b, $8 ; ABILITY ld b, ABILITY + 1
call GetStatName call GetStatName
call AnimateFailedMove call AnimateFailedMove
ld hl, WontRiseAnymoreText ld hl, WontRiseAnymoreText

6
battle/effects/metronome.asm
View File

@@ -5,14 +5,14 @@ BattleCommand_Metronome: ; 37418
call Function34548 call Function34548
jr nz, .asm_3742b jr nz, .asm_3742b
ld a, [wc689] ld a, [wKickCounter]
push af push af
call BattleCommand_LowerSub call BattleCommand_LowerSub
pop af pop af
ld [wc689], a ld [wKickCounter], a
.asm_3742b .asm_3742b
call Function37e36 call PlayPlayerMoveAnim_ClearHiID
.GetMove .GetMove
call BattleRandom call BattleRandom

4
battle/effects/mirror_move.asm
View File

@@ -40,11 +40,11 @@ BattleCommand_MirrorMove: ; 373c9
call Function34548 call Function34548
jr nz, .done jr nz, .done
ld a, [wc689] ld a, [wKickCounter]
push af push af
call BattleCommand_LowerSub call BattleCommand_LowerSub
pop af pop af
ld [wc689], a ld [wKickCounter], a
.done .done
call BattleCommand_MoveDelay call BattleCommand_MoveDelay

94
battle/moves/move_effects.asm
View File

@@ -208,7 +208,7 @@ Explosion:
damagevariation damagevariation
checkhit checkhit
selfdestruct selfdestruct
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
criticaltext criticaltext
@@ -255,7 +255,7 @@ AttackUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -269,7 +269,7 @@ DefenseUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -281,7 +281,7 @@ SpeedUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -294,7 +294,7 @@ SpecialAttackUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -306,7 +306,7 @@ SpecialDefenseUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -318,7 +318,7 @@ AccuracyUp:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -333,7 +333,7 @@ EvasionUp:
statupanim statupanim
effect0xa7 effect0xa7
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -346,7 +346,7 @@ AttackUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -360,7 +360,7 @@ DefenseUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -373,7 +373,7 @@ SpeedUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -385,7 +385,7 @@ SpecialAttackUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -398,7 +398,7 @@ SpecialDefenseUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -410,7 +410,7 @@ AccuracyUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -422,7 +422,7 @@ EvasionUp2:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove
@@ -436,7 +436,7 @@ AttackDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -451,7 +451,7 @@ DefenseDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -465,7 +465,7 @@ SpeedDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -478,7 +478,7 @@ SpecialAttackDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -491,7 +491,7 @@ SpecialDefenseDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -508,7 +508,7 @@ AccuracyDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -522,7 +522,7 @@ EvasionDown:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -536,7 +536,7 @@ AttackDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -550,7 +550,7 @@ DefenseDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -565,7 +565,7 @@ SpeedDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -578,7 +578,7 @@ SpecialAttackDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -591,7 +591,7 @@ SpecialDefenseDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -604,7 +604,7 @@ AccuracyDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -617,7 +617,7 @@ EvasionDown2:
lowersub lowersub
statdownanim statdownanim
raisesub raisesub
statmessagetarget statdownmessage
statdownfailtext statdownfailtext
endmove endmove
@@ -641,7 +641,7 @@ AttackDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
attackdown attackdown
statmessagetarget statdownmessage
endmove endmove
Acid: Acid:
@@ -667,7 +667,7 @@ DefenseDownHit:
buildopponentrage buildopponentrage
effectchance effectchance
defensedown defensedown
statmessagetarget statdownmessage
endmove endmove
Bubblebeam: Bubblebeam:
@@ -693,7 +693,7 @@ SpeedDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
speeddown speeddown
statmessagetarget statdownmessage
endmove endmove
SpecialAttackDownHit: SpecialAttackDownHit:
@@ -715,7 +715,7 @@ SpecialAttackDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
specialattackdown specialattackdown
statmessagetarget statdownmessage
endmove endmove
PsychicM: PsychicM:
@@ -740,7 +740,7 @@ SpecialDefenseDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
specialdefensedown specialdefensedown
statmessagetarget statdownmessage
endmove endmove
MudSlap: MudSlap:
@@ -764,7 +764,7 @@ AccuracyDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
accuracydown accuracydown
statmessagetarget statdownmessage
endmove endmove
EvasionDownHit: EvasionDownHit:
@@ -786,7 +786,7 @@ EvasionDownHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
evasiondown evasiondown
statmessagetarget statdownmessage
endmove endmove
SteelWing: SteelWing:
@@ -809,7 +809,7 @@ DefenseUpHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
defenseup defenseup
statmessageuser statupmessage
endmove endmove
MetalClaw: MetalClaw:
@@ -832,7 +832,7 @@ AttackUpHit:
checkdestinybond checkdestinybond
buildopponentrage buildopponentrage
attackup attackup
statmessageuser statupmessage
endmove endmove
Ancientpower: Ancientpower:
@@ -966,7 +966,7 @@ MultiHit:
stab stab
damagevariation damagevariation
clearmissdamage clearmissdamage
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
criticaltext criticaltext
@@ -994,7 +994,7 @@ PoisonMultiHit:
stab stab
damagevariation damagevariation
clearmissdamage clearmissdamage
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
criticaltext criticaltext
@@ -1350,7 +1350,7 @@ Dig:
stab stab
damagevariation damagevariation
checkhit checkhit
effect0x0b hittargetnosub
raisesub raisesub
resulttext resulttext
checkfaint checkfaint
@@ -1571,7 +1571,7 @@ TripleKick:
stab stab
damagevariation damagevariation
clearmissdamage clearmissdamage
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
criticaltext criticaltext
@@ -1730,7 +1730,7 @@ Swagger:
raisesub raisesub
resulttext resulttext
switchturn switchturn
statmessageuser statupmessage
switchturn switchturn
confusetarget confusetarget
endmove endmove
@@ -2041,7 +2041,7 @@ SkullBash:
kingsrock kingsrock
endturn endturn
defenseup defenseup
statmessageuser statupmessage
endmove endmove
Twister: Twister:
@@ -2097,7 +2097,7 @@ FutureSight:
futuresight futuresight
damagevariation damagevariation
checkhit checkhit
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
checkdestinybond checkdestinybond
@@ -2211,7 +2211,7 @@ BeatUp:
damagecalc damagecalc
damagevariation damagevariation
clearmissdamage clearmissdamage
effect0x0b hittargetnosub
resulttext resulttext
checkfaint checkfaint
criticaltext criticaltext
@@ -2234,6 +2234,6 @@ DefenseCurl:
lowersub lowersub
statupanim statupanim
raisesub raisesub
statmessageuser statupmessage
statupfailtext statupfailtext
endmove endmove

4
constants/battle_constants.asm
View File

@@ -4,6 +4,8 @@ EGG_LEVEL EQU 5
NUM_MOVES EQU 4 NUM_MOVES EQU 4
REST_TURNS EQU 2 REST_TURNS EQU 2
MAX_STAT_LEVEL EQU 13
BASE_STAT_LEVEL EQU 7
const_def const_def
const ATTACK const ATTACK
@@ -13,6 +15,8 @@ REST_TURNS EQU 2
const SP_DEFENSE const SP_DEFENSE
const ACCURACY const ACCURACY
const EVASION const EVASION
const ABILITY
NUM_LEVEL_STATS EQU const_value
; move struct ; move struct
const_def const_def

2
engine/predef.asm
View File

@@ -95,7 +95,7 @@ PredefPointers:: ; 856b
add_predef Function5108b add_predef Function5108b
add_predef GetTrainerPic add_predef GetTrainerPic
add_predef DecompressPredef ; $40 add_predef DecompressPredef ; $40
add_predef Function347d3 add_predef CheckTypeMatchup
add_predef ConvertMon_1to2 add_predef ConvertMon_1to2
add_predef Functionfb877 add_predef Functionfb877
add_predef Functiond0000 add_predef Functiond0000

8
items/item_effects.asm
View File

@@ -403,7 +403,7 @@ endr
jr c, .not_kurt_ball jr c, .not_kurt_ball
ld a, POKE_BALL ld a, POKE_BALL
.not_kurt_ball .not_kurt_ball
ld [wc689], a ld [wKickCounter], a
ld de, ANIM_THROW_POKE_BALL ld de, ANIM_THROW_POKE_BALL
ld a, e ld a, e
@@ -1567,7 +1567,7 @@ Functionf030: ; f030 (3:7030)
res 7, [hl] res 7, [hl]
.asm_f04f .asm_f04f
push bc push bc
callba Function365d7 callba CalcPlayerStats
pop bc pop bc
ret ret
@@ -2344,7 +2344,7 @@ endr
callba CheckIfStatCanBeRaised callba CheckIfStatCanBeRaised
call WaitSFX call WaitSFX
callba BattleCommand_StatMessageUser callba BattleCommand_StatUpMessage
callba BattleCommand_StatUpFailText callba BattleCommand_StatUpFailText
ld a, [CurBattleMon] ld a, [CurBattleMon]
@@ -2959,7 +2959,7 @@ UseBallInTrainerBattle: ; f7a0
ld a, d ld a, d
ld [FXAnimIDHi], a ld [FXAnimIDHi], a
xor a xor a
ld [wc689], a ld [wKickCounter], a
ld [hBattleTurn], a ld [hBattleTurn], a
ld [wcfca], a ld [wcfca], a
predef PlayBattleAnim predef PlayBattleAnim

6
macros/move_effect.asm
View File

@@ -15,7 +15,7 @@ endm
command damagevariation command damagevariation
command checkhit command checkhit
command lowersub command lowersub
command effect0x0b command hittargetnosub
command raisesub command raisesub
command resulttext command resulttext
command checkfaint command checkfaint
@@ -144,8 +144,8 @@ endm
command specialdefensedown2 command specialdefensedown2
command accuracydown2 command accuracydown2
command evasiondown2 command evasiondown2
command statmessageuser command statupmessage
command statmessagetarget command statdownmessage
command statupfailtext command statupfailtext
command statdownfailtext command statdownfailtext
command effectchance command effectchance

3
wram.asm
View File

@@ -600,7 +600,7 @@ EnemyDamageTaken:: ; c684
wc686:: ds 2 wc686:: ds 2
wc688:: ds 1 wc688:: ds 1
wc689:: ds 1 wKickCounter:: ds 1
wc68a:: wc68a::
BattleScriptBuffer:: ; c68a BattleScriptBuffer:: ; c68a
ds 40 ds 40
@@ -1898,6 +1898,7 @@ wd264:: ds 1
wFoundMatchingIDInParty:: wFoundMatchingIDInParty::
wNamedObjectIndexBuffer:: wNamedObjectIndexBuffer::
wCurTMHM:: wCurTMHM::
wTypeMatchup::
wd265:: ds 1 wd265:: ds 1
wd266:: ds 1 wd266:: ds 1
wd267:: ds 1 wd267:: ds 1