diff --git a/main.asm b/main.asm
index cb77e5a..abcac00 100755
--- a/main.asm
+++ b/main.asm
@@ -3535,6 +3535,19 @@ ResetBoulderPushFlags: ; f2dd (3:72dd)
 	ret
 
 _AddPartyMon: ; f2e5 (3:72e5)
+	call AddPartyMon_NoNick
+	call NicknamePartyMon
+	ret
+
+NicknamePartyMon:
+	ld hl, wPartyMonNicks
+	ld a, [$ffe4]
+	dec a
+	call SkipFixedLengthTextEntries
+	predef AskName
+	ret
+
+AddPartyMon_NoNick::
 	ld de, wPartyCount ; wPartyCount
 	ld a, [wcc49]
 	and $f
@@ -3572,17 +3585,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
 	ld hl, wPlayerName ; wd158
 	ld bc, $b
 	call CopyData
-	ld a, [wcc49]
-	and a
-	jr nz, .asm_f33f
-	ld hl, wPartyMonNicks ; wPartyMonNicks
-	ld a, [$ffe4]
-	dec a
-	call SkipFixedLengthTextEntries
-	ld a, $2
-	ld [wd07d], a
-	predef AskName
-.asm_f33f
+
 	ld hl, wPartyMons
 	ld a, [wcc49]
 	and $f