Merge pull request #477 from mid-kid/master

Medium-sized cleanups

1 files changed, 18 insertions, 18 deletions

diff --git a/engine/billspc.asm b/engine/billspc.asm
index 57c4faac4..42a761634 100755
--- a/engine/billspc.asm
+++ b/engine/billspc.asm
@@ -203,7 +203,7 @@ BillsPCDepositFuncRelease: ; e24e0 (38:64e0)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -463,7 +463,7 @@ BillsPC_Withdraw: ; e2675 (38:6675)
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
 	ld [wCurPartyMon], a
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	call ReleasePKMN_ByePKMN
@@ -591,7 +591,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button
-	call MovePkmnWithoutMail_DPad
+	call MoveMonWithoutMail_DPad
 	jr c, .d_pad
 	and a
 	ret z
@@ -750,7 +750,7 @@ _MovePKMNWithoutMail: ; e2759
 	ld a, [hl]
 	and A_BUTTON
 	jr nz, .a_button_2
-	call MovePkmnWithoutMail_DPad_2
+	call MoveMonWithoutMail_DPad_2
 	jr c, .dpad_2
 	and a
 	ret z
@@ -862,7 +862,7 @@ Withdraw_UpDown: ; e29b5 (38:69b5)
 	jp BillsPC_JoypadDidNothing
 ; e29d0 (38:69d0)
 
-MovePkmnWithoutMail_DPad: ; e29d0
+MoveMonWithoutMail_DPad: ; e29d0
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -886,7 +886,7 @@ MovePkmnWithoutMail_DPad: ; e29d0
 	jr nz, BillsPC_PressRight
 	jr BillsPC_JoypadDidNothing
 
-MovePkmnWithoutMail_DPad_2: ; e29f4
+MoveMonWithoutMail_DPad_2: ; e29f4
 	ld hl, hJoyLast
 	ld a, [wBillsPC_NumMonsOnScreen]
 	ld d, a
@@ -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)
@@ -1819,9 +1819,9 @@ DepositPokemon: ; e307c (38:707c)
 	call GetNick
 	ld a, PC_DEPOSIT
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .asm_boxisfull
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -1874,9 +1874,9 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
 	call CloseSRAM
 	xor a
 	ld [wPokemonWithdrawDepositParameter], a
-	predef SendGetPkmnIntoFromBox
+	predef SendGetMonIntoFromBox
 	jr c, .PartyFull
-	ld a, PC_DEPOSIT
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ld a, [wCurPartySpecies]
@@ -2010,7 +2010,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 .dw_return ; e322a
 	pop af
 	ld e, a
-	farcall MovePkmnWOMail_InsertMon_SaveGame
+	farcall MoveMonWOMail_InsertMon_SaveGame
 	ret
 ; e3233
 
@@ -2095,7 +2095,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld a, [wBillsPC_BackupLoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_BackupCursorPosition]
 	ld hl, wBillsPC_BackupScrollPosition
 	add [hl]
@@ -2112,8 +2112,8 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld bc, BOXMON_STRUCT_LENGTH
 	call CopyMonToTemp
 	call CloseSRAM
-	farcall CalcwBufferMonStats
-	ld a, PC_DEPOSIT
+	farcall CalcBufferMonStats
+	ld a, REMOVE_BOX
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret
@@ -2123,7 +2123,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld a, [wBillsPC_LoadedBox]
 	dec a
 	ld e, a
-	farcall MovePkmnWOMail_SaveGame
+	farcall MoveMonWOMail_SaveGame
 	ld a, [wBillsPC_CursorPosition]
 	ld hl, wBillsPC_ScrollPosition
 	add [hl]
@@ -2146,7 +2146,7 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
 	ld hl, wPartyMon1Species
 	ld bc, PARTYMON_STRUCT_LENGTH
 	call CopyMonToTemp
-	xor a
+	xor a ; REMOVE_PARTY
 	ld [wPokemonWithdrawDepositParameter], a
 	farcall RemoveMonFromPartyOrBox
 	ret