thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adding move data, types, and some Pokemon data

Browse source
This commit is contained in:
MementoMartha 2022-08-31 10:17:48 +01:00
parent cdcd29b503
commit ac45c8b5bc
14 changed files with 383 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

9
engine/battle/core.asm
View file

@ -368,14 +368,21 @@ MainInBattleLoop:
callfar SwitchEnemyMon
.noLinkBattle
ld a, [wPlayerSelectedMove]
cp BULLET_PUNCH
jr z, .PriorityMoveUsed
cp QUICK_ATTACK
jr nz, .playerDidNotUseQuickAttack
.PriorityMoveUsed
ld a, [wEnemySelectedMove]
cp BULLET_PUNCH
jr z, .compareSpeed
cp QUICK_ATTACK
jr z, .compareSpeed ; if both used Quick Attack
jp .playerMovesFirst ; if player used Quick Attack and enemy didn't
.playerDidNotUseQuickAttack
ld a, [wEnemySelectedMove]
cp BULLET_PUNCH
jr z, .enemyMovesFirst
cp QUICK_ATTACK
jr z, .enemyMovesFirst ; if enemy used Quick Attack and player didn't
ld a, [wPlayerSelectedMove]
@ -5150,7 +5157,7 @@ MetronomePickMove:
and a
jr z, .pickMoveLoop
cp STRUGGLE
assert NUM_ATTACKS == STRUGGLE ; random numbers greater than STRUGGLE are not moves
assert NUM_ATTACKS == BULLET_PUNCH ; rerolls if greater than the last move in index
jr nc, .pickMoveLoop
cp METRONOME
jr z, .pickMoveLoop