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

Merge pull request #167 from Pokechu22/rgbds-0.3.3

Browse source 
Update for RGBDS 0.3.3
This commit is contained in:
yenatch 2017-09-29 22:41:34 -04:00 • committed by GitHub
commit 5c24193831
21 changed files with 219 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
engine/battle/core.asm
View file

@ -3150,7 +3150,7 @@ ExecutePlayerMove:
jp z, ExecutePlayerMoveDone
call CheckPlayerStatusConditions
jr nz, .playerHasNoSpecialCondition
jp [hl]
jp hl
.playerHasNoSpecialCondition
call GetCurrentMove
ld hl, wPlayerBattleStatus1
@ -5690,7 +5690,7 @@ ExecuteEnemyMove:
ld [wDamageMultipliers], a
call CheckEnemyStatusConditions
jr nz, .enemyHasNoSpecialConditions
jp [hl]
jp hl
.enemyHasNoSpecialConditions
ld hl, wEnemyBattleStatus1
bit ChargingUp, [hl] ; is the enemy charging up for attack?
@ -7139,7 +7139,7 @@ _JumpMoveEffect:
ld a, [hli]
ld h, [hl]
ld l, a
jp [hl] ; jump to special effect handler
jp hl ; jump to special effect handler
MoveEffectPointerTable:
dw SleepEffect ; unused effect