aboutsummaryrefslogtreecommitdiffstats
path: root/engine/link
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2025-01-28 23:31:15 -0500
committerGitHub <noreply@github.com>2025-01-28 23:31:15 -0500
commitafb899016938d03911eaafb85c7caa1c67680210 (patch)
tree26e5d73301ab16e060c4a16171e0a5aa3c47d732 /engine/link
parentComment on size of union (diff)
downloadpokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.gz
pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.tar.xz
pokeyellow-afb899016938d03911eaafb85c7caa1c67680210.zip
Miscellaneous cleanup (#488)
Co-authored-by: SatoMew <SatoMew@users.noreply.github.com>
Diffstat (limited to 'engine/link')
-rw-r--r--engine/link/cable_club.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm
index 92a1b596..2bf36f18 100644
--- a/engine/link/cable_club.asm
+++ b/engine/link/cable_club.asm
@@ -57,8 +57,8 @@ CableClub_DoBattleOrTradeAgain:
ld [hli], a
dec b
jr nz, .zeroPlayerDataPatchListLoop
- ld hl, wGrassRate
- ld bc, wTrainerHeaderPtr - wGrassRate
+ ld hl, wLinkEnemyTrainerName
+ ld bc, wTrainerHeaderPtr - wLinkEnemyTrainerName
.zeroEnemyPartyLoop
xor a
ld [hli], a
@@ -818,7 +818,7 @@ TradeCenter_Trade:
ld a, [wPartyCount]
dec a
ld [wWhichPokemon], a
- ld a, $1
+ ld a, TRUE
ld [wForceEvolution], a
ld a, [wTradingWhichEnemyMon]
ld hl, wEnemyPartySpecies