diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:13:29 +0100 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-02-22 17:39:06 +0100 |
| commit | e8bc86d1fedfc6be5a99d426ffc236c4fcf494f4 (patch) | |
| tree | dabac449a3cf7bf08c6cb134701ce296a5403c61 /engine/tempmon.asm | |
| parent | c3abe8f88b62b121ec7e76cac91467df7471223a (diff) | |
Pkmn -> Mon
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.
Diffstat (limited to 'engine/tempmon.asm')
| -rw-r--r-- | engine/tempmon.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/tempmon.asm b/engine/tempmon.asm index 37b485e38..5bee7b06a 100644 --- a/engine/tempmon.asm +++ b/engine/tempmon.asm @@ -1,10 +1,10 @@ -CopyPkmnToTempMon: ; 5084a -; gets the BaseData of a Pkmn +CopyMonToTempMon: ; 5084a +; gets the BaseData of a mon ; and copies the party_struct to wTempMon ld a, [wCurPartyMon] ld e, a - call GetPkmnSpecies + call GetMonSpecies ld a, [wCurPartySpecies] ld [wCurSpecies], a call GetBaseData @@ -51,7 +51,7 @@ _TempMonStatsCalculation: ; 50893 add hl, bc push bc ld b, $1 - predef CalcPkmnStats + predef CalcMonStats pop bc ld hl, MON_HP add hl, bc @@ -82,9 +82,9 @@ _TempMonStatsCalculation: ; 50893 ld [hl], a ret -GetPkmnSpecies: ; 508d5 -; [wMonType] has the type of the Pkmn -; e = Nr. of Pkmn (i.e. [wCurPartyMon]) +GetMonSpecies: ; 508d5 +; [wMonType] has the type of the mon +; e = Nr. of mon (i.e. [wCurPartyMon]) ld a, [wMonType] and a ; PARTYMON |