mirror of https://github.com/pret/pokeemerald.git
specific Nuzlocke flag check removed
parent
a80b3c400e
commit
08585ef776
|
@ -177,8 +177,6 @@ EWRAM_DATA u16 gBattle_BG0_X = 0;
|
||||||
|
|
||||||
+static u8 IsTrainerCantRunFrom(void){
|
+static u8 IsTrainerCantRunFrom(void){
|
||||||
+ u8 trainerClass;
|
+ u8 trainerClass;
|
||||||
+ if (FlagGet(FLAG_NUZLOCKE))
|
|
||||||
+ return BATTLE_RUN_FORBIDDEN;
|
|
||||||
+ if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL))
|
+ if (gBattleTypeFlags & (BATTLE_TYPE_FRONTIER | BATTLE_TYPE_TRAINER_HILL))
|
||||||
+ return BATTLE_RUN_FORBIDDEN;
|
+ return BATTLE_RUN_FORBIDDEN;
|
||||||
+ trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
|
+ trainerClass = gTrainers[gTrainerBattleOpponent_A].trainerClass;
|
||||||
|
|
Loading…
Reference in New Issue