Leahnaya/poketcg2
1
0
Fork 0
mirror of https://github.com/pret/poketcg2.git synced 2026-08-23 01:54:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

bank05: name the trainer-card AI's buggy call target

Browse Source 
The .trainer_card path's `call $6968` is an original-game bug: it was meant to
be a `bank1call` to bank01's LoadNonPokemonCardEffectCommands, but as a plain
`call` (bank05 mapped) it jumps to bank05:$6968 -- the middle of Func_167e5 --
whose unbalanced `pop af` corrupts the stack. The branch is never taken in
normal play.

Name the intended target (byte-faithful: LoadNonPokemonCardEffectCommands is at
$6968, so it still assembles to `call $6968`) and document the missing bank1call.
Drop the now-unused Func_167e5.weird_jump scaffolding label. make compare stays OK.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Test User
2026-06-05 11:20:59 -04:00
parent 359a496e91
commit 464ba7e281
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/engine/bank05.asm
View File

@@ -6635,10 +6635,9 @@ Func_167e5:
get_turn_duelist_var
ldh [hDuelActionCardIndex], a
xor a ; PLAY_AREA_ARENA
; $6968: the trainer-card AI path (.trainer_card, far below) has a leftover `call`
; that targets here, in the middle of this routine -- it then hits the unbalanced
; `pop af` and corrupts the stack. normal flow simply falls through from .has_bench.
.weird_jump
; bank05:$6968 -- the buggy plain `call` in .trainer_card (a missing bank1call to
; bank01:LoadNonPokemonCardEffectCommands) lands here at runtime. Normal flow just
; falls through from .has_bench.
ldh [hDuelActionArgs + 0], a
ld a, OPPACTION_USE_PKMN_POWER
farcall AIMakeDecision
@@ -9968,11 +9967,13 @@ CheckIfCardCanBePlayed:
.trainer_card
bank1call CheckCantUseTrainerDueToEffect
ret c
; leftover/dead code: this calls into the middle of Func_167e5 at .weird_jump
; (bank05:$6968 -- this path runs with bank05 mapped, NOT bank01), which then
; executes an unbalanced `pop af` and corrupts the stack. the branch is not
; taken in normal play. preserved byte-for-byte.
call Func_167e5.weird_jump
; BUG (in the original game): this should be a `bank1call` to bank01's
; LoadNonPokemonCardEffectCommands. As a plain `call` it runs with bank05
; mapped, so instead of bank01:$6968 it jumps to bank05:$6968 -- the middle
; of Func_167e5 -- whose unbalanced `pop af` corrupts the stack. The branch
; is not taken in normal play. Byte-faithful: LoadNonPokemonCardEffectCommands
; sits at $6968, so this still assembles to `call $6968`.
call LoadNonPokemonCardEffectCommands
ld a, EFFECTCMDTYPE_INITIAL_EFFECT_1
call TryExecuteEffectCommandFunction
ret