diff options
| author | yenatch <yenatch@gmail.com> | 2016-08-11 15:55:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 15:55:32 -0400 |
| commit | 700321a7fb2d6c852ffc91cc0b8867526cb76813 (patch) | |
| tree | 1a81b2ef5a4d7a2e5a9433e990ea178f5083acbf /engine/breeding | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | 050a0162b89c645c4a2a3ed311c4da791fb3de6c (diff) | |
Merge pull request #342 from PikalaxALT/master
More label interpretations
Diffstat (limited to 'engine/breeding')
| -rwxr-xr-x | engine/breeding/egg.asm | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index b6f41743e..050fa69af 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -8,7 +8,7 @@ CheckBreedmonCompatibility: ; 16e1d ld [TempMonDVs], a ld a, [wBreedMon1DVs + 1] ld [TempMonDVs + 1], a - ld a, BREEDMON + ld a, TEMPMON ld [MonType], a predef GetGender jr c, .genderless @@ -442,9 +442,8 @@ GLOBAL EggMoves ld c, a ld b, 0 ld hl, EggMovePointers -rept 2 add hl, bc -endr + add hl, bc ld a, BANK(EggMovePointers) call GetFarHalfword .loop @@ -477,9 +476,8 @@ endr ld c, a ld b, 0 ld hl, EvosAttacksPointers -rept 2 add hl, bc -endr + add hl, bc ld a, BANK(EvosAttacksPointers) call GetFarHalfword .loop3 @@ -590,7 +588,7 @@ GetHeritableMoves: ; 17197 ld [TempMonDVs], a ld a, [wBreedMon2DVs + 1] ld [TempMonDVs + 1], a - ld a, BREEDMON + ld a, TEMPMON ld [MonType], a predef GetGender jr c, .inherit_mon2_moves @@ -606,7 +604,7 @@ GetHeritableMoves: ; 17197 ld [TempMonDVs], a ld a, [wBreedMon1DVs + 1] ld [TempMonDVs + 1], a - ld a, BREEDMON + ld a, TEMPMON ld [MonType], a predef GetGender jr c, .inherit_mon1_moves @@ -788,7 +786,7 @@ EggHatch_AnimationSequence: ; 1728f (5:728f) Hatch_LoadFrontpicPal: ; 17363 (5:7363) ld [PlayerHPPal], a - ld b, SCGB_0B + ld b, SCGB_EVOLUTION ld c, $0 jp GetSGBLayout @@ -849,7 +847,7 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3) add [hl] ld [hl], a - ld hl, SPRITEANIMSTRUCT_0B + ld hl, SPRITEANIMSTRUCT_JUMPTABLE_INDEX add hl, bc ld [hl], d |