diff --git a/Data/Map266.rxdata b/Data/Map266.rxdata index e660950d5..2e0028ed1 100644 Binary files a/Data/Map266.rxdata and b/Data/Map266.rxdata differ diff --git a/Data/Map666.rxdata b/Data/Map666.rxdata index 4e0db452a..3ff1e54b7 100644 Binary files a/Data/Map666.rxdata and b/Data/Map666.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 6afbf2f5b..e1a213c13 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb b/Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb index 0c5b75491..81a70689f 100644 --- a/Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb +++ b/Data/Scripts/011_Battle/006_Other battle types/009_PokeBattle_Clauses.rb @@ -100,8 +100,7 @@ end class PokeBattle_Move_022 # Double Team - alias __clauses__pbMoveFailed? pbMoveFailed? unless method_defined?(:__clauses__pbFailsAgainstTarget?) - + alias __clauses__pbMoveFailed? pbMoveFailed? unless method_defined?(:__clauses__pbMoveFailed?) def pbMoveFailed?(user,targets) if !damagingMove? && @battle.rules["evasionclause"] @battle.pbDisplay(_INTL("But it failed!")) @@ -114,7 +113,7 @@ end class PokeBattle_Move_034 # Minimize - alias __clauses__pbMoveFailed? pbMoveFailed? unless method_defined?(:__clauses__pbFailsAgainstTarget?) + alias __clauses__pbMoveFailed? pbMoveFailed? unless method_defined?(:__clauses__pbMoveFailed?) def pbMoveFailed?(user,targets) if !damagingMove? && @battle.rules["evasionclause"] @battle.pbDisplay(_INTL("But it failed!")) diff --git a/Data/Scripts/050_Outfits/OutfitIds.rb b/Data/Scripts/050_Outfits/OutfitIds.rb index d58aeda32..abba338da 100644 --- a/Data/Scripts/050_Outfits/OutfitIds.rb +++ b/Data/Scripts/050_Outfits/OutfitIds.rb @@ -16,6 +16,7 @@ CLOTHES_BREEDER="PKMBreeder" CLOTHES_FOSSIL_M ="sado" CLOTHES_FOSSIL_F ="sada" +CLOTHES_TREVENANT= "trevenantforestkingcloak" CLOTHES_LASS_YELLOW ="lass" CLOTHES_LASS_BLUE ="lass2" @@ -56,6 +57,8 @@ HAT_SANTA = "santa" HAT_QMARKS = "glitzerset" HAT_SUDOWOODO = "sudowoodohorns" +HAT_TREVENANT="trevenantforestkingcrown" + HAT_CLOWN = "clownnose" HAT_BREEDER_1="breedervisor" diff --git a/Data/System.rxdata b/Data/System.rxdata index d4ef10af7..678768838 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ