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

fixing a few small bugs

Browse source
This commit is contained in:
MementoMartha 2022-09-28 10:46:42 +01:00
parent f457830786
commit 91c79913fd
6 changed files with 39 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engine/battle/core.asm
View file

@ -5291,6 +5291,21 @@ AdjustDamageForMoveType:
ld b, a
ld a, [hl] ; a = damage multiplier
ldh [hMultiplier], a
and a ; cp NO_EFFECT ;This fixes incorrect type effectiveness messages
jr z, .gotMultiplier
cp NOT_VERY_EFFECTIVE
jr nz, .nothalf
ld a, [wDamageMultipliers]
and $7f
srl a
jr .gotMultiplier
.nothalf
cp SUPER_EFFECTIVE
jr nz, .gotMultiplier
ld a, [wDamageMultipliers]
and $7f
sla a
.gotMultiplier
add b
ld [wDamageMultipliers], a
xor a

2
engine/movie/oak_speech/oak_speech.asm
View file

@ -157,7 +157,7 @@ OakSpeechText1:
text_end
OakSpeechText2:
text_far _OakSpeechText2A
sound_cry_nidorina
sound_cry_nidorino
text_far _OakSpeechText2B
text_end
IntroducePlayerText: