From 98e6878429a2c74b5293426204e0013c322d50a3 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Mon, 12 Feb 2018 23:58:19 +0100 Subject: [PATCH] CalcwBufferMonStats -> CalcBufferMonStats The 'w' was probably added in some mass-replacement. It's completely irrelevant to the function itself and doesn't fit the PascalCase model. --- engine/billspc.asm | 6 +++--- engine/stats_screen.asm | 2 +- engine/tempmon.asm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/engine/billspc.asm b/engine/billspc.asm index 57c4faac4..9db6413c3 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -1763,7 +1763,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, PARTYMON_STRUCT_LENGTH call CopyBytes call CloseSRAM - farcall CalcwBufferMonStats + farcall CalcBufferMonStats ret .party @@ -1806,7 +1806,7 @@ BillsPC_CopyMon: ; e2fd6 (38:6fd6) ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - farcall CalcwBufferMonStats + farcall CalcBufferMonStats ret DepositPokemon: ; e307c (38:707c) @@ -2112,7 +2112,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7 ld bc, BOXMON_STRUCT_LENGTH call CopyMonToTemp call CloseSRAM - farcall CalcwBufferMonStats + farcall CalcBufferMonStats ld a, PC_DEPOSIT ld [wPokemonWithdrawDepositParameter], a farcall RemoveMonFromPartyOrBox diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index e55c85c86..b3daadcc6 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -230,7 +230,7 @@ StatsScreen_CopyToTempMon: ; 4ddf2 (13:5df2) ld a, [wMonType] cp TEMPMON jr nz, .breedmon - ld a, [wBufferMon] + ld a, [wBufferMonSpecies] ld [wCurSpecies], a call GetBaseData ld hl, wBufferMon diff --git a/engine/tempmon.asm b/engine/tempmon.asm index 03bec3755..37b485e38 100644 --- a/engine/tempmon.asm +++ b/engine/tempmon.asm @@ -1,6 +1,6 @@ CopyPkmnToTempMon: ; 5084a ; gets the BaseData of a Pkmn -; and copys the PkmnStructure to wTempMon +; and copies the party_struct to wTempMon ld a, [wCurPartyMon] ld e, a @@ -32,7 +32,7 @@ CopyPkmnToTempMon: ; 5084a .done ret -CalcwBufferMonStats: ; 5088b +CalcBufferMonStats: ; 5088b ld bc, wBufferMon jr _TempMonStatsCalculation