From e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Thu, 22 Feb 2018 17:13:29 +0100
Subject: Pkmn -> Mon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since we're aiming for consistency across the codebase, I believe it
includes a uniform way to refer to the creatures this game consists of
in the labels of the code.
The only exceptions to this rule are labels referring to things named
through the use of the <PK><MN> or <PKMN> characters, in which case PKMN
is used.

Most of this was already consistent enough™, I just picked the
convention with the most occurences and fixed the outliers.
---
 engine/evolve.asm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engine/evolve.asm')

diff --git a/engine/evolve.asm b/engine/evolve.asm
index 5fb5aff46..efcc9c3f0 100755
--- a/engine/evolve.asm
+++ b/engine/evolve.asm
@@ -55,7 +55,7 @@ EvolveAfterBattle_MasterLoop
 	push hl
 	xor a
 	ld [wMonType], a
-	predef CopyPkmnToTempMon
+	predef CopyMonToTempMon
 	pop hl
 
 .loop
@@ -265,7 +265,7 @@ EvolveAfterBattle_MasterLoop
 	ld hl, wTempMonExp + 2
 	ld de, wTempMonMaxHP
 	ld b, $1
-	predef CalcPkmnStats
+	predef CalcMonStats
 
 	ld a, [wCurPartyMon]
 	ld hl, wPartyMons
-- 
cgit v1.2.3