From 00efe3c6b461773a20b424fbf548cb38c880c9ac Mon Sep 17 00:00:00 2001 From: Thorn Avery Date: Tue, 14 Nov 2023 08:10:40 +1100 Subject: [PATCH] caught icon + ai gets to land status --- .gitignore | 5 +++++ engine/battle/core.asm | 22 ++++++++++++++++++++++ engine/battle/effects.asm | 14 ++++++++------ gfx/font/font.png | Bin 1809 -> 2369 bytes 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4520aed3..05fc82a8 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,8 @@ *.sg1 .vscode/* + +# nix stuff +.direnv +.envrc +result diff --git a/engine/battle/core.asm b/engine/battle/core.asm index a52f2d37..67c11dd9 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -1986,6 +1986,28 @@ DrawEnemyHUDAndHPBar: lb bc, 4, 12 call ClearScreenArea callfar PlaceEnemyHUDTiles + push hl + ld a, [wIsInBattle] + cp 2 + jr z, .notOwned + ld a, [wEnemyMonSpecies2] + ld [wd11e], a + ld hl, IndexToPokedex + ld b, BANK(IndexToPokedex) + call Bankswitch + ld a, [wd11e] + dec a + ld c, a + ld b, FLAG_TEST + ld hl, wPokedexOwned + predef FlagActionPredef + ld a, c + and a + jr z, .notOwned + coord hl, 1, 1;horizontal/vertical + ld [hl], $D0 ;replace this with your Poké Ball icon or other character +.notOwned + pop hl ld de, wEnemyMonNick hlcoord 1, 0 call CenterMonName diff --git a/engine/battle/effects.asm b/engine/battle/effects.asm index aaaf20d0..d35f3cab 100644 --- a/engine/battle/effects.asm +++ b/engine/battle/effects.asm @@ -544,12 +544,14 @@ StatModifierDownEffect: ld hl, wPlayerMonStatMods ld de, wEnemyMoveEffect ld bc, wPlayerBattleStatus1 - ld a, [wLinkState] - cp LINK_STATE_BATTLING - jr z, .statModifierDownEffect - call BattleRandom - cp 25 percent + 1 ; chance to miss by in regular battle - jp c, MoveMissed + ;; the below code, when uncommented, restores + ;; the ai's 25% miss chance on status moves. + ; ld a, [wLinkState] + ; cp LINK_STATE_BATTLING + ; jr z, .statModifierDownEffect + ; call BattleRandom + ; cp 25 percent + 1 ; chance to miss by in regular battle + ; jp c, MoveMissed .statModifierDownEffect call CheckTargetSubstitute ; can't hit through substitute jp nz, MoveMissed diff --git a/gfx/font/font.png b/gfx/font/font.png index af26395ebcd3b0bd28108fb127b48edc74372c74..f6a75a35897ab2dd75a6571594b4d28fa1c512f2 100644 GIT binary patch delta 2344 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 X7k`}z@t6PpX+T(L#M$=Xq#ynVH<+sQ