thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the Ghost identification and squiggly lines from night shade, etc

Browse source 
pretty objective fixes, need to make the rocket hideout more interesting
This commit is contained in:
May Evans 2022-09-28 13:59:54 +01:00
parent f9d86cdde9
commit bcef765d45
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/battle/animations.asm
View file

@ -1878,6 +1878,8 @@ AnimationWavyScreen:
ld c, $ff ld c, $ff
ld hl, WavyScreenLineOffsets ld hl, WavyScreenLineOffsets
.loop .loop
ld a, [hl] ; this fixes the wavy screen - PvK
ldh [hSCX], a
push hl push hl
.innerLoop .innerLoop
call WavyScreen_SetSCX call WavyScreen_SetSCX
@ -1894,6 +1896,7 @@ AnimationWavyScreen:
dec c dec c
jr nz, .loop jr nz, .loop
xor a xor a
ldh [hSCX], a ; also fixing the wavy screen - PvK
ldh [hWY], a ldh [hWY], a
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
call ClearScreen call ClearScreen

11
engine/battle/core.asm
View file

@ -1675,7 +1675,7 @@ LoadBattleMonFromParty:
ld bc, 1 + NUM_STATS * 2 ld bc, 1 + NUM_STATS * 2
call CopyData call CopyData
call ApplyBurnAndParalysisPenaltiesToPlayer call ApplyBurnAndParalysisPenaltiesToPlayer
call ApplyBadgeStatBoosts call ApplyBadgeStatBoosts ; if this is commented out maybe it stops them entirely? test - PvK
ld a, $7 ; default stat modifier ld a, $7 ; default stat modifier
ld b, NUM_STAT_MODS ld b, NUM_STAT_MODS
ld hl, wPlayerMonAttackMod ld hl, wPlayerMonAttackMod
@ -2405,7 +2405,11 @@ PartyMenuOrRockOrRun:
ld [wd0b5], a ld [wd0b5], a
call GetMonHeader call GetMonHeader
ld de, vFrontPic ld de, vFrontPic
call LoadMonFrontSprite call IsGhostBattle ; this prevents ghosts from being identified without the silph scope - PvK
push af
call nz, LoadMonFrontSprite
pop af
call z, LoadGhostPic ; fix ends here, just make it "call LoadMonFrontSprite on line 2408 to revert.
jr .enemyMonPicReloaded jr .enemyMonPicReloaded
.doEnemyMonAnimation .doEnemyMonAnimation
ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon) ld b, BANK(AnimationSubstitute) ; BANK(AnimationMinimizeMon)
@ -6285,12 +6289,15 @@ LoadEnemyMonData:
ld a, [wEnemyMonSpecies2] ld a, [wEnemyMonSpecies2]
ld [wd11e], a ld [wd11e], a
predef IndexToPokedex predef IndexToPokedex
call IsGhostBattle ; this prevents it from being identified early
jr nz, .noMarkSeen ; part of the ghost fix
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, FLAG_SET ld b, FLAG_SET
ld hl, wPokedexSeen ld hl, wPokedexSeen
predef FlagActionPredef ; mark this mon as seen in the pokedex predef FlagActionPredef ; mark this mon as seen in the pokedex
.noMarkSeen ; part of the ghost fix
ld hl, wEnemyMonLevel ld hl, wEnemyMonLevel
ld de, wEnemyMonUnmodifiedLevel ld de, wEnemyMonUnmodifiedLevel
ld bc, 1 + NUM_STATS * 2 ld bc, 1 + NUM_STATS * 2