diff options
Diffstat (limited to 'engine/time_capsule.asm')
| -rwxr-xr-x | engine/time_capsule.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/time_capsule.asm b/engine/time_capsule.asm index b7e5d28c8..f90b7e249 100755 --- a/engine/time_capsule.asm +++ b/engine/time_capsule.asm @@ -2,14 +2,14 @@ ValidateOTTrademon: ; fb57e ld a, [wd003] - ld hl, OTPartyMon1Species + ld hl, wOTPartyMon1Species call GetPartyLocation push hl ld a, [wd003] inc a ld c, a ld b, 0 - ld hl, OTPartyCount + ld hl, wOTPartyCount add hl, bc ld a, [hl] pop hl @@ -29,7 +29,7 @@ ValidateOTTrademon: ; fb57e ld a, [wLinkMode] cp LINK_TIMECAPSULE jr nz, .normal - ld hl, OTPartySpecies + ld hl, wOTPartySpecies ld a, [wd003] ld c, a ld b, 0 @@ -43,16 +43,16 @@ ValidateOTTrademon: ; fb57e cp MAGNETON jr z, .normal - ld [CurSpecies], a + ld [wCurSpecies], a call GetBaseData ld hl, wLinkOTPartyMonTypes add hl, bc add hl, bc - ld a, [BaseType1] + ld a, [wBaseType1] cp [hl] jr nz, .abnormal inc hl - ld a, [BaseType2] + ld a, [wBaseType2] cp [hl] jr nz, .abnormal @@ -68,7 +68,7 @@ ValidateOTTrademon: ; fb57e Functionfb5dd: ; fb5dd ld a, [wd002] ld d, a - ld a, [PartyCount] + ld a, [wPartyCount] ld b, a ld c, $0 .loop @@ -77,7 +77,7 @@ Functionfb5dd: ; fb5dd jr z, .next push bc ld a, c - ld hl, PartyMon1HP + ld hl, wPartyMon1HP call GetPartyLocation pop bc ld a, [hli] @@ -89,7 +89,7 @@ Functionfb5dd: ; fb5dd dec b jr nz, .loop ld a, [wd003] - ld hl, OTPartyMon1HP + ld hl, wOTPartyMon1HP call GetPartyLocation ld a, [hli] or [hl] @@ -104,20 +104,20 @@ Functionfb5dd: ; fb5dd PlaceTradePartnerNamesAndParty: ; fb60d hlcoord 4, 0 - ld de, PlayerName + ld de, wPlayerName call PlaceString ld a, $14 ld [bc], a hlcoord 4, 8 - ld de, OTPlayerName + ld de, wOTPlayerName call PlaceString ld a, $14 ld [bc], a hlcoord 7, 1 - ld de, PartySpecies + ld de, wPartySpecies call .PlaceSpeciesNames hlcoord 7, 9 - ld de, OTPartySpecies + ld de, wOTPartySpecies .PlaceSpeciesNames: ; fb634 ld c, $0 .loop |