diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/breeding/egg.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'engine/breeding/egg.asm')
| -rwxr-xr-x | engine/breeding/egg.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 326faaa6c..5051083b2 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -234,7 +234,7 @@ HatchEggs: ; 16f70 (5:6f70) callba SetEggMonCaughtData callba TrainerRankings_EggsHatched ld a, [CurPartyMon] - ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species) + ld hl, PartyMon1Species ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes ld a, [hl] @@ -263,7 +263,7 @@ HatchEggs: ; 16f70 (5:6f70) ld [wd26b], a call GetBaseData ld a, [CurPartyMon] - ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species) + ld hl, PartyMon1 ld bc, PARTYMON_STRUCT_LENGTH call AddNTimes push hl @@ -309,7 +309,7 @@ HatchEggs: ; 16f70 (5:6f70) ld a, [PlayerID + 1] ld [hl], a ld a, [CurPartyMon] - ld hl, PartyMonOT ; wddff (aliases: PartyMonOT) + ld hl, PartyMonOT ld bc, NAME_LENGTH call AddNTimes ld d, h @@ -803,7 +803,7 @@ EggHatch_CrackShell: ; 1736d (5:736d) add 9 * 8 + 4 ld d, a ld e, 11 * 8 - ld a, SPRITE_ANIM_INDEX_19 + ld a, SPRITE_ANIM_INDEX_EGG_CRACK call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID add hl, bc @@ -813,7 +813,7 @@ EggHatch_CrackShell: ; 1736d (5:736d) ; 17393 (5:7393) EggHatchGFX: ; 17393 -INCBIN "gfx/unknown/017393.2bpp" +INCBIN "gfx/evo/egg_hatch.2bpp" ; 173b3 Hatch_InitShellFragments: ; 173b3 (5:73b3) @@ -833,7 +833,7 @@ Hatch_InitShellFragments: ; 173b3 (5:73b3) push hl push bc - ld a, SPRITE_ANIM_INDEX_1C + ld a, SPRITE_ANIM_INDEX_EGG_HATCH call _InitSpriteAnimStruct ld hl, SPRITEANIMSTRUCT_TILE_ID |