wonder traded eggs use base egg cycles

Author: itsdarsh

engine/events/npc_trade.asm

@@ -257,7 +257,7 @@ DoNPCTrade:
 	ld a, [wPartyCount]
 	dec a
 	ld [wCurPartyMon], a
-	farcall ComputeNPCTrademonStats
+	farcall ComputeNPCTrademonStatsAndEggSteps
 	pop af
 	ld [wCurPartyMon], a
 	jmp PopAFBCDEHL

engine/events/wonder_trade.asm

@@ -364,7 +364,7 @@ endr
 	ld a, [wPartyCount]
 	dec a
 	ld [wCurPartyMon], a
-	farcall ComputeNPCTrademonStats
+	farcall ComputeNPCTrademonStatsAndEggSteps
 	farcall GivePokerusToWonderTradeMon
 	pop af
 	ld [wCurPartyMon], a

engine/pokemon/move_mon.asm

@@ -900,7 +900,7 @@ RemoveMonFromParty:
 	ld e, 0
 	farjp SetStorageBoxPointer
 
-ComputeNPCTrademonStats:
+ComputeNPCTrademonStatsAndEggSteps:
 	ld a, MON_LEVEL
 	call GetPartyParamLocationAndValue
 	ld [wCurPartyLevel], a
@@ -929,14 +929,27 @@ ComputeNPCTrademonStats:
 	ld [hld], a
 	ld a, [wCurForm]
 	and IS_EGG_MASK
-	ret nz
+	jr nz, .set_egg_steps
 	ld a, [de]
 	inc de
 	ld [hli], a
 	ld a, [de]
 	ld [hl], a
 	ret
 
+.set_egg_steps
+	ld a, MON_HAPPINESS
+	call GetPartyParamLocationAndValue
+	ld a, [wBaseEggSteps]
+	and $f
+	inc a
+	ld b, a
+	add a
+	add a
+	add b
+	ld [hl], a
+	ret
+
 FixPlayerEVsAndStats:
 	farcall FixPlayerEVs
 	ld a, [wPartyCount]