diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
| commit | f748d34aa389b9e80fc6cab81e6efb1867327f7b (patch) | |
| tree | 92343b604a0df54d4ecf549ee85d4273a1784352 /engine/time_capsule/conversion.asm | |
| parent | fd7cf5987a6e4958d63645c76e994c96b51fcc4c (diff) | |
| parent | 288902139f00a9113ea9b360eb00d3109727dcfe (diff) | |
Merge remote-tracking branch 'origin/master' into c-tools
Diffstat (limited to 'engine/time_capsule/conversion.asm')
| -rwxr-xr-x | engine/time_capsule/conversion.asm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engine/time_capsule/conversion.asm b/engine/time_capsule/conversion.asm index 5d093d515..561721074 100755 --- a/engine/time_capsule/conversion.asm +++ b/engine/time_capsule/conversion.asm @@ -46,9 +46,8 @@ ValidateOTTrademon: ; fb57e ld [CurSpecies], a call GetBaseData ld hl, wLinkOTPartyMonTypes -rept 2 add hl, bc -endr + add hl, bc ld a, [BaseType1] cp [hl] jr nz, .abnormal @@ -384,7 +383,7 @@ NewPokedexEntry: ; fb877 ld [TempMonDVs], a ld a, [hl] ld [TempMonDVs + 1], a - ld b, SCGB_FRONTPICPALS + ld b, SCGB_TRAINER_OR_MON_FRONTPIC_PALS call GetSGBLayout call SetPalettes ret |