From a9869f18962353b056559dc14dfc00fef0df5978 Mon Sep 17 00:00:00 2001 From: Idain Date: Wed, 28 Sep 2022 20:51:39 -0400 Subject: [PATCH] Replace hardcoded wMonType constants (#1011) --- engine/battle/move_effects/attract.asm | 2 +- engine/events/daycare.asm | 2 +- engine/pokemon/bills_pc.asm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm index 8bca67ebf..32c4f5338 100644 --- a/engine/battle/move_effects/attract.asm +++ b/engine/battle/move_effects/attract.asm @@ -53,7 +53,7 @@ CheckOppositeGender: ld [wTempMonDVs], a ld a, [hl] ld [wTempMonDVs + 1], a - ld a, 3 + ld a, TEMPMON ld [wMonType], a farcall GetGender pop bc diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm index b44264692..00675502b 100644 --- a/engine/events/daycare.asm +++ b/engine/events/daycare.asm @@ -562,7 +562,7 @@ DayCare_InitBreeding: ld [wTempMonDVs + 1], a ld a, [wBreedMon1Species] ld [wCurPartySpecies], a - ld a, $3 + ld a, TEMPMON ld [wMonType], a ld a, [wBreedMon1Species] cp DITTO diff --git a/engine/pokemon/bills_pc.asm b/engine/pokemon/bills_pc.asm index d569ff749..8103b38e0 100644 --- a/engine/pokemon/bills_pc.asm +++ b/engine/pokemon/bills_pc.asm @@ -1079,7 +1079,7 @@ PCMonInfo: hlcoord 1, 12 call PrintLevel - ld a, $3 + ld a, TEMPMON ld [wMonType], a farcall GetGender jr c, .skip_gender