diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /engine/pokemon/tempmon.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'engine/pokemon/tempmon.asm')
| -rw-r--r-- | engine/pokemon/tempmon.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/pokemon/tempmon.asm b/engine/pokemon/tempmon.asm index 723bfb1dd..4547a02b9 100644 --- a/engine/pokemon/tempmon.asm +++ b/engine/pokemon/tempmon.asm @@ -1,4 +1,4 @@ -CopyMonToTempMon: ; 5084a +CopyMonToTempMon: ; gets the BaseData of a mon ; and copies the party_struct to wTempMon @@ -32,13 +32,13 @@ CopyMonToTempMon: ; 5084a .done ret -CalcBufferMonStats: ; 5088b +CalcBufferMonStats: ld bc, wBufferMon jr _TempMonStatsCalculation -CalcTempmonStats: ; 50890 +CalcTempmonStats: ld bc, wTempMon -_TempMonStatsCalculation: ; 50893 +_TempMonStatsCalculation: ld hl, MON_LEVEL add hl, bc ld a, [hl] @@ -82,7 +82,7 @@ _TempMonStatsCalculation: ; 50893 ld [hl], a ret -GetMonSpecies: ; 508d5 +GetMonSpecies: ; [wMonType] has the type of the mon ; e = Nr. of mon (i.e. [wCurPartyMon]) |