Fix: Sending a caught Pokémon to the PC asks whether to nickname in N…

…uzlocke mode. Remove some unused Nuzlocke-related code.
Rangi42 · Sep 9, 2016 · ec63b36 · ec63b36
1 parent f2bdd4e
commit ec63b36
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -212,6 +212,7 @@ These changes have been made since the previous 2.0.0 release. If you build the
 * Fix: Icicle Crash is still called Razor Shell.
 * Fix: A battle with Lyra is skippable.
 * Fix: Two trainers overlap on the S.S. Aqua.
+* Fix: Sending a caught Pokémon to the PC asks whether to nickname in Nuzlocke mode.
 * Fix: Plural trainers say "are about to use", not "is about to use".
 * Fix: Viridian Forest is dark.
 * Fix: S.S. Aqua location on Town Map.

diff --git a/engine/scripting.asm b/engine/scripting.asm
@@ -244,8 +244,6 @@ ScriptCommandTable: ; 96cb1
 	dw Script_count_unown_caught         ; ab
 	dw Script_trainerpic                 ; ac
 	dw Script_check_nuzlocke             ; ad
-	dw Script_nuzlocke_on                ; ae
-	dw Script_nuzlocke_off               ; af
 ; 96e05
 
 StartScript: ; 96e05
@@ -3276,19 +3274,3 @@ Script_check_nuzlocke:
 	bit NUZLOCKE_MODE, a
 	ld [ScriptVar], a
 	ret
-
-Script_nuzlocke_on:
-; script command 0xae
-
-	ld a, [Options2]
-	set NUZLOCKE_MODE, a
-	ld [Options2], a
-	ret
-
-Script_nuzlocke_off:
-; script command 0xaf
-
-	ld a, [Options2]
-	res NUZLOCKE_MODE, a
-	ld [Options2], a
-	ret
diff --git a/event/whiteout.asm b/event/whiteout.asm
@@ -53,9 +53,7 @@ Script_Whiteout: ; 0x124ce
 	db "@"
 
 Script_NuzlockeWhiteout:
-	nuzlocke_off
-	special HealParty
-	nuzlocke_on
+	special HealPartyEvenForNuzlocke
 	checkflag ENGINE_BUG_CONTEST_TIMER
 	iftrue .bug_contest
 	callasm GetWhiteoutSpawn

diff --git a/items/item_effects.asm b/items/item_effects.asm
@@ -686,6 +686,10 @@ endr
 .SkipBoxMonFriendBall:
 	call CloseSRAM
 
+	ld a, [Options2]
+	bit NUZLOCKE_MODE, a
+	jr nz, .AlwaysNicknameBox
+
 	ld hl, Text_AskNicknameNewlyCaughtMon
 	call PrintText
 
@@ -696,6 +700,7 @@ endr
 	call YesNoBox
 	jr c, .SkipBoxMonNickname
 
+.AlwaysNicknameBox:
 	xor a
 	ld [CurPartyMon], a
 	ld a, BOXMON

diff --git a/macros/event.asm b/macros/event.asm
@@ -1085,13 +1085,3 @@ trainerpic: macro
 check_nuzlocke: macro
 	db check_nuzlocke_command
 	endm
-
-	enum nuzlocke_on_command
-nuzlocke_on: macro
-	db nuzlocke_on_command
-	endm
-
-	enum nuzlocke_off_command
-nuzlocke_off: macro
-	db nuzlocke_off_command
-	endm
diff --git a/main.asm b/main.asm
@@ -3402,7 +3402,7 @@ CheckPartyFullAfterContest: ; 4d9e5
 
 GiveANickname_YesNo: ; 4db3b
 	ld a, [Options2]
-	and 1 << NUZLOCKE_MODE
+	bit NUZLOCKE_MODE, a
 	jr nz, .AlwaysNickname
 	ld hl, TextJump_GiveANickname
 	call PrintText