diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 14:45:40 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-29 14:51:41 -0400 |
| commit | bcc0d633e948227e68da8a264d1533771a54b5c4 (patch) | |
| tree | f28e95e126f4f398597539f5c45205ed048561e5 /engine/link/time_capsule.asm | |
| parent | ea426a88794b1d216a278b54d18cefafbf7d8771 (diff) | |
Identify the remaining (non-mobile) uses of another WRAM union
Diffstat (limited to 'engine/link/time_capsule.asm')
| -rw-r--r-- | engine/link/time_capsule.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm index bacda9c4b..b8c68a32b 100644 --- a/engine/link/time_capsule.asm +++ b/engine/link/time_capsule.asm @@ -1,11 +1,11 @@ ; These functions seem to be related to backwards compatibility ValidateOTTrademon: - ld a, [wd003] + ld a, [wCurOTTradePartyMon] ld hl, wOTPartyMon1Species call GetPartyLocation push hl - ld a, [wd003] + ld a, [wCurOTTradePartyMon] inc a ld c, a ld b, 0 @@ -30,7 +30,7 @@ ValidateOTTrademon: cp LINK_TIMECAPSULE jr nz, .normal ld hl, wOTPartySpecies - ld a, [wd003] + ld a, [wCurOTTradePartyMon] ld c, a ld b, 0 add hl, bc @@ -65,11 +65,11 @@ ValidateOTTrademon: ret CheckAnyOtherAliveMonsForTrade: - ld a, [wd002] + ld a, [wCurTradePartyMon] ld d, a ld a, [wPartyCount] ld b, a - ld c, $0 + ld c, 0 .loop ld a, c cp d @@ -87,7 +87,7 @@ CheckAnyOtherAliveMonsForTrade: inc c dec b jr nz, .loop - ld a, [wd003] + ld a, [wCurOTTradePartyMon] ld hl, wOTPartyMon1HP call GetPartyLocation ld a, [hli] |