diff options
| author | Narishma-gb <194818981+Narishma-gb@users.noreply.github.com> | 2025-11-27 19:39:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-27 13:39:25 -0500 |
| commit | 3a4382c6055e21da72357dd18638947a2acbbda9 (patch) | |
| tree | cb383fbd6a0dc57e3b0f9e9483c2a3f898f42f96 /engine/link | |
| parent | Avoid magic numbers for most `CopyData` calls (#542) (diff) | |
| download | pokeyellow-3a4382c6055e21da72357dd18638947a2acbbda9.tar.gz pokeyellow-3a4382c6055e21da72357dd18638947a2acbbda9.tar.xz pokeyellow-3a4382c6055e21da72357dd18638947a2acbbda9.zip | |
Use more Pokemon data constants, create MOVE_NAME_LENGTH (#543)
Diffstat (limited to 'engine/link')
| -rw-r--r-- | engine/link/cable_club.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/link/cable_club.asm b/engine/link/cable_club.asm index ea39b938..4a300164 100644 --- a/engine/link/cable_club.asm +++ b/engine/link/cable_club.asm @@ -763,9 +763,9 @@ TradeCenter_Trade: call CopyData ld hl, wPartyMon1Species ld a, [wTradingWhichPlayerMon] - ld bc, wPartyMon2 - wPartyMon1 + ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld bc, wPartyMon1OTID - wPartyMon1 + ld bc, MON_OTID add hl, bc ld a, [hli] ld [wTradedPlayerMonOTID], a @@ -779,9 +779,9 @@ TradeCenter_Trade: call CopyData ld hl, wEnemyMons ld a, [wTradingWhichEnemyMon] - ld bc, wEnemyMon2 - wEnemyMon1 + ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes - ld bc, wEnemyMon1OTID - wEnemyMon1 + ld bc, MON_OTID add hl, bc ld a, [hli] ld [wTradedEnemyMonOTID], a @@ -809,10 +809,10 @@ TradeCenter_Trade: ld [wCurPartySpecies], a ld hl, wEnemyMons ld a, c - ld bc, wEnemyMon2 - wEnemyMon1 + ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes ld de, wLoadedMon - ld bc, wEnemyMon2 - wEnemyMon1 + ld bc, PARTYMON_STRUCT_LENGTH call CopyData call AddEnemyMonToPlayerParty ld a, [wPartyCount] |