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

reworked disobedience, also new Tsubomitto sprite

Browse source 
turns out the last time we tried removing disobedience, pokemon wouldn't attack. also reworked the texts to remove references to it, as well as some SS Anne stuff
This commit is contained in:
MementoMartha 2023-04-12 12:03:40 +01:00
parent 90fc563b57
commit bb65963836
9 changed files with 21 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
engine/battle/core.asm
View file

@ -3111,7 +3111,7 @@ ExecutePlayerMove:
ld hl, wPlayerBattleStatus1
bit CHARGING_UP, [hl] ; charging up for attack
jr nz, PlayerCanExecuteChargingMove
;call CheckForDisobedience
call CheckForDisobedience
jp z, ExecutePlayerMoveDone
CheckIfPlayerNeedsToChargeUp:
@ -4003,15 +4003,15 @@ CheckForDisobedience:
ld a, 101
jr nz, .next
bit BIT_MARSHBADGE, [hl]
ld a, 70
ld a, 101
jr nz, .next
bit BIT_RAINBOWBADGE, [hl]
ld a, 50
ld a, 101
jr nz, .next
bit BIT_CASCADEBADGE, [hl]
ld a, 30
ld a, 101
jr nz, .next
ld a, 10
ld a, 101
.next
ld b, a
ld c, a