diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-28 20:15:35 -0500 |
| commit | 794410352fd92ccf06974763e4b3be0b807641ab (patch) | |
| tree | 05f5dd861966762db9556082229cee82e8b5eed9 /engine/breeding | |
| parent | 9c5473e965520f672640daf4ee76622640e0de15 (diff) | |
| parent | 4bcd71e3227181baa536357af3d87a8d02af3890 (diff) | |
Merge pull request #328 from PikalaxALT/master
Split out most of main.asm
Diffstat (limited to 'engine/breeding')
| -rwxr-xr-x | engine/breeding/egg.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 7c4d8ba62..ebf5e48d8 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -192,7 +192,7 @@ OverworldHatchEgg:: ; 16f5e call ResetWindow call LoadStandardMenuDataHeader call Function16f70 - call Function2b4d + call ExitAllMenus call RestartMapMusic jp LoadMoveSprites ; 16f70 @@ -219,7 +219,7 @@ Function16f7a: ; 16f7a (5:6f7a) push de - callba Function4dbb8 + callba SetEggMonCaughtData callba MobileFn_10608d ld a, [CurPartyMon] ld hl, PartyMons ; wdcdf (aliases: PartyMon1, PartyMon1Species) @@ -650,7 +650,7 @@ Function1723c: ; 1723c (5:723c) ld hl, BattleMonDVs predef GetUnownLetter pop de - predef_jump Function5108b + predef_jump FrontpicPredef Function17254: ; 17254 (5:7254) push af @@ -775,7 +775,7 @@ Function1728f: ; 1728f (5:728f) Function17363: ; 17363 (5:7363) ld [PlayerHPPal], a - ld b, $b + ld b, SCGB_0B ld c, $0 jp GetSGBLayout @@ -792,8 +792,8 @@ Function1736d: ; 1736d (5:736d) add $4c ld d, a ld e, $58 - ld a, $19 - call Function3b2a + ld a, SPRITE_ANIM_INDEX_19 + call _InitSpriteAnimStruct ld hl, $3 add hl, bc ld [hl], $0 @@ -821,8 +821,8 @@ Function173b3: ; 173b3 (5:73b3) ld b, a push hl push bc - ld a, $1c - call Function3b2a + ld a, SPRITE_ANIM_INDEX_1C + call _InitSpriteAnimStruct ld hl, $3 add hl, bc ld [hl], $0 |