Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FLAG_RECEIVED_POKEDEX_FROM_BIRCH to FLAG_SYS_POKEDEX_GET

voloved 2023-03-11 08:25:29 -05:00
parent cc8c059bbf
commit c99aa92a17
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Add-Nuzlocke-Challenge.md

@ -265,7 +265,7 @@ index ddda34eba..554a75d69 100644
end end
+EventScript_LostNuzlocke:: +EventScript_LostNuzlocke::
+ call_if_unset FLAG_RECEIVED_POKEDEX_FROM_BIRCH, EventScript_FieldWhiteOutCont + call_if_unset FLAG_SYS_POKEDEX_GET, EventScript_FieldWhiteOutCont
+ clearflag FLAG_NUZLOCKE + clearflag FLAG_NUZLOCKE
+ message gText_PlayerNuzlockeFailed + message gText_PlayerNuzlockeFailed
+ waitmessage + waitmessage
@ -394,7 +394,7 @@ index 54ff4d614..4f82d8d75 100644
else else
{ {
gBattlescriptCurrInstr = BattleScript_LocalBattleLost; gBattlescriptCurrInstr = BattleScript_LocalBattleLost;
+ if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_RECEIVED_POKEDEX_FROM_BIRCH)){ + if (FlagGet(FLAG_NUZLOCKE) && FlagGet(FLAG_SYS_POKEDEX_GET)){
+ gBattleMainFunc = BattleLostNuzlocke; + gBattleMainFunc = BattleLostNuzlocke;
+ return; + return;
+ } + }
@ -514,7 +514,7 @@ index b18202096..056e1c5db 100755
{ {
+ u16 maxHP; + u16 maxHP;
+ if (GetMonData(&gPlayerParty[i], MON_DATA_DEAD)){ + 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; + bool8 dead = FALSE;
+ SetMonData(&gPlayerParty[i], MON_DATA_DEAD, &dead); + SetMonData(&gPlayerParty[i], MON_DATA_DEAD, &dead);
+ } + }
@ -535,7 +535,7 @@ index 7bbb5e186..adbe50754 100644
gBattlescriptCurrInstr = BS_ptr; gBattlescriptCurrInstr = BS_ptr;
if (GetBattlerSide(gActiveBattler) == B_SIDE_PLAYER) 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; + bool8 dead = TRUE;
+ SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_DEAD, &dead); + SetMonData(&gPlayerParty[gBattlerPartyIndexes[gActiveBattler]], MON_DATA_DEAD, &dead);
+ } + }
@ -726,7 +726,7 @@ index b503f8d65..36da06845 100644
+ VAR_WILD_PKMN_ROUTE_SEEN_4, + VAR_WILD_PKMN_ROUTE_SEEN_4,
+ }; + };
+ currLocation = currLocConvertForNuzlocke(currLocation); + 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_0, 0);
+ VarSet(VAR_WILD_PKMN_ROUTE_SEEN_1, 0); + VarSet(VAR_WILD_PKMN_ROUTE_SEEN_1, 0);
+ VarSet(VAR_WILD_PKMN_ROUTE_SEEN_2, 0); + VarSet(VAR_WILD_PKMN_ROUTE_SEEN_2, 0);