diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index a36d05622..aa8618839 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Map121.rxdata b/Data/Map121.rxdata index 3ada4f9b0..5a53359d2 100644 Binary files a/Data/Map121.rxdata and b/Data/Map121.rxdata differ diff --git a/Data/Map423.rxdata b/Data/Map423.rxdata index 290fc2981..f51b14514 100644 Binary files a/Data/Map423.rxdata and b/Data/Map423.rxdata differ diff --git a/Data/Map783.rxdata b/Data/Map783.rxdata index 3d2094f71..13acfcbc3 100644 Binary files a/Data/Map783.rxdata and b/Data/Map783.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 9fa31c9c1..c24173525 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb index 1797c45b9..78d486ce0 100644 --- a/Data/Scripts/001_Settings.rb +++ b/Data/Scripts/001_Settings.rb @@ -33,6 +33,7 @@ module Settings BACKSPRITE_POSITION_OFFSET = 20 FRONTSPRITE_POSITION = 200 SHINY_HUE_OFFSET = 75 + NO_LEVEL_MODE_LEVEL = 25 RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW) VAR_1_PLACEHOLDER_SPECIES = :DIALGA diff --git a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb index 292b6eb86..31b0f499f 100644 --- a/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb +++ b/Data/Scripts/011_Battle/005_Battle scene/004_PokeBattle_SceneElements.rb @@ -230,8 +230,8 @@ class PokemonDataBox < SpriteWrapper end pbDrawTextPositions(self.bitmap,textPos) # Draw Pokémon's level - imagePos.push(["Graphics/Pictures/Battle/overlay_lv",@spriteBaseX+140,16]) - pbDrawNumber(@battler.level,self.bitmap,@spriteBaseX+162,16) + imagePos.push(["Graphics/Pictures/Battle/overlay_lv",@spriteBaseX+140,16]) if !$game_switches[SWITCH_NO_LEVELS_MODE] + pbDrawNumber(@battler.level,self.bitmap,@spriteBaseX+162,16) if !$game_switches[SWITCH_NO_LEVELS_MODE] # Draw shiny icon if @battler.shiny? shinyX = (@battler.opposes?(0)) ? 206 : -6 # Foe's/player's diff --git a/Data/Scripts/014_Pokemon/001_Pokemon.rb b/Data/Scripts/014_Pokemon/001_Pokemon.rb index 1d3317d53..2210569c0 100644 --- a/Data/Scripts/014_Pokemon/001_Pokemon.rb +++ b/Data/Scripts/014_Pokemon/001_Pokemon.rb @@ -1136,6 +1136,11 @@ class Pokemon base_stats = self.baseStats this_level = self.level this_IV = self.calcIV + + if $game_switches[SWITCH_NO_LEVELS_MODE] + this_level = Settings::NO_LEVEL_MODE_LEVEL + end + # Format stat multipliers due to nature nature_mod = {} GameData::Stat.each_main { |s| nature_mod[s.id] = 100 } diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index c684f5e8e..341252364 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -22,6 +22,7 @@ SWITCH_GAME_DIFFICULTY_EASY = 665 SWITCH_GAME_DIFFICULTY_HARD = 666 SWITCH_MODERN_MODE=974 SWITCH_V5_1=825 +SWITCH_NO_LEVELS_MODE=774 #Game progression switches SWITCH_DURING_INTRO = 917 diff --git a/Data/Scripts/050_AddOns/HttpCalls.rb b/Data/Scripts/050_AddOns/HttpCalls.rb index bc0ec8585..40edb3ea7 100644 --- a/Data/Scripts/050_AddOns/HttpCalls.rb +++ b/Data/Scripts/050_AddOns/HttpCalls.rb @@ -32,6 +32,7 @@ def download_sprite(base_path, head_id, body_id) end def download_autogen_sprite(head_id, body_id) + return nil if !$PokemonSystem.download_sprites base_path = "https://raw.githubusercontent.com/Aegide/autogen-fusion-sprites/master/Battlers/{1}/{1}.{2}.png" sprite = download_sprite(_INTL(base_path,head_id,body_id),head_id,body_id) return sprite if sprite @@ -39,6 +40,7 @@ def download_autogen_sprite(head_id, body_id) end def download_custom_sprite(head_id, body_id) + return nil if !$PokemonSystem.download_sprites base_path = "https://raw.githubusercontent.com/Aegide/custom-fusion-sprites/main/CustomBattlers/{1}.{2}.png" sprite = download_sprite(_INTL(base_path,head_id,body_id),head_id,body_id) return sprite if sprite diff --git a/Data/System.rxdata b/Data/System.rxdata index 9ca4214f1..f87e9f572 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/PBS/items.txt b/PBS/items.txt index 8bafb83cb..f99388b5d 100644 --- a/PBS/items.txt +++ b/PBS/items.txt @@ -595,7 +595,7 @@ 587,POISONMUSHROOM,PoisonMushroom,PoisonMushrooms,1,50,A common poisonous mushroom. It can be sold for a small price.,1,1,0, 588,EXPALLOFF,Exp. All,Exp. Alls,8,0,"An item that can be used to share experience gained with every party member.",2,0,6, 589,GASMASK,Gas Mask,Gas Masks,8,0,"A mask that lets you breathe in areas filled with poisonous gas.",0,0,6, -590,MANKEYPAW,Mankey Paw,Mankey Paws,1,19600,"Guarantees Critical-Hits, but halves accuracy.",0,0,0, +590,MANKEYPAW,Mankey Paw,Mankey Paws,1,19600,"Guarantees Critical-Hits, but makes the user miss half the time.",0,0,0, 591,ICEPICK,Ice Pick,Ice Picks,8,0,"An Ice Pick that lets you climb vertical walls of ice.",0,0,6, 592,RACEBIKE,Racing Bicycle,Racing Bicycles,8,0,A folding Bicycle that enables much faster movement than a regular bicycle,2,0,6, 593,DIAMOND,Diamond,Diamonds,1,20000,A rare gem that is used for making jewelry. It sells for a high price.,0,0,0,