From c99aa92a174ccd4259cfee2f46d075ac21b1fffb Mon Sep 17 00:00:00 2001 From: voloved <36523934+voloved@users.noreply.github.com> Date: Sat, 11 Mar 2023 08:25:29 -0500 Subject: [PATCH] FLAG_RECEIVED_POKEDEX_FROM_BIRCH to FLAG_SYS_POKEDEX_GET --- Add-Nuzlocke-Challenge.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Add-Nuzlocke-Challenge.md b/Add-Nuzlocke-Challenge.md index 9aea69b..02bc47a 100644 --- a/Add-Nuzlocke-Challenge.md +++ b/Add-Nuzlocke-Challenge.md @@ -265,7 +265,7 @@ index ddda34eba..554a75d69 100644 end +EventScript_LostNuzlocke:: -+ call_if_unset FLAG_RECEIVED_POKEDEX_FROM_BIRCH, EventScript_FieldWhiteOutCont ++ call_if_unset FLAG_SYS_POKEDEX_GET, EventScript_FieldWhiteOutCont + clearflag FLAG_NUZLOCKE + message gText_PlayerNuzlockeFailed + waitmessage @@ -394,7 +394,7 @@ index 54ff4d614..4f82d8d75 100644 else { gBattlescriptCurrInstr = BattleScript_LocalBattleLost; -+ if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_RECEIVED_POKEDEX_FROM_BIRCH)){ ++ if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_SYS_POKEDEX_GET)){ + gBattleMainFunc = BattleLostNuzlocke; + return; + } @@ -514,7 +514,7 @@ index b18202096..056e1c5db 100755 { + u16 maxHP; + if (GetMonData(&gPlayerParty[i], MON_DATA_DEAD)){ -+ if (!FlagGet(FLAG_NUZLOCKE) || !FlagGet(FLAG_RECEIVED_POKEDEX_FROM_BIRCH)){ ++ if (!FlagGet(FLAG_NUZLOCKE) || !FlagGet(FLAG_SYS_POKEDEX_GET)){ + bool8 dead = FALSE; + SetMonData(&gPlayerParty[i], MON_DATA_DEAD, &dead); + } @@ -535,7 +535,7 @@ index 7bbb5e186..adbe50754 100644 gBattlescriptCurrInstr = BS_ptr; if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) { -+ if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_RECEIVED_POKEDEX_FROM_BIRCH)){ ++ if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_SYS_POKEDEX_GET)){ + bool8 dead = TRUE; + SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_DEAD, &dead); + } @@ -726,7 +726,7 @@ index b503f8d65..36da06845 100644 + VAR_WILD_PKMN_ROUTE_SEEN_4, + }; + currLocation = currLocConvertForNuzlocke(currLocation); -+ if (!FlagGet(FLAG_NUZLOCKE) || !FlagGet(FLAG_RECEIVED_POKEDEX_FROM_BIRCH)){ ++ if (!FlagGet(FLAG_NUZLOCKE) || !FlagGet(FLAG_SYS_POKEDEX_GET)){ + VarSet(VAR_WILD_PKMN_ROUTE_SEEN_0, 0); + VarSet(VAR_WILD_PKMN_ROUTE_SEEN_1, 0); + VarSet(VAR_WILD_PKMN_ROUTE_SEEN_2, 0);