diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/link/time_capsule.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/link/time_capsule.asm')
| -rw-r--r-- | engine/link/time_capsule.asm | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/engine/link/time_capsule.asm b/engine/link/time_capsule.asm index f90b7e249..195062c1e 100644 --- a/engine/link/time_capsule.asm +++ b/engine/link/time_capsule.asm @@ -1,6 +1,6 @@ ; These functions seem to be related to backwards compatibility -ValidateOTTrademon: ; fb57e +ValidateOTTrademon: ld a, [wd003] ld hl, wOTPartyMon1Species call GetPartyLocation @@ -63,9 +63,8 @@ ValidateOTTrademon: ; fb57e .abnormal scf ret -; fb5dd -Functionfb5dd: ; fb5dd +Functionfb5dd: ld a, [wd002] ld d, a ld a, [wPartyCount] @@ -100,9 +99,8 @@ Functionfb5dd: ; fb5dd .done and a ret -; fb60d -PlaceTradePartnerNamesAndParty: ; fb60d +PlaceTradePartnerNamesAndParty: hlcoord 4, 0 ld de, wPlayerName call PlaceString @@ -118,7 +116,7 @@ PlaceTradePartnerNamesAndParty: ; fb60d call .PlaceSpeciesNames hlcoord 7, 9 ld de, wOTPartySpecies -.PlaceSpeciesNames: ; fb634 +.PlaceSpeciesNames: ld c, $0 .loop ld a, [de] @@ -142,6 +140,5 @@ PlaceTradePartnerNamesAndParty: ; fb60d pop bc inc c jr .loop -; fb656 INCLUDE "data/pokemon/gen1_base_special.asm" |