diff --git a/Data/Actors.rxdata b/Data/Actors.rxdata index 7967a5432..41edc8e26 100644 Binary files a/Data/Actors.rxdata and b/Data/Actors.rxdata differ diff --git a/Data/Animations.rxdata b/Data/Animations.rxdata index 8e67182ba..826e1e8a6 100644 Binary files a/Data/Animations.rxdata and b/Data/Animations.rxdata differ diff --git a/Data/Armors.rxdata b/Data/Armors.rxdata index 2249bec14..901f2bb2b 100644 Binary files a/Data/Armors.rxdata and b/Data/Armors.rxdata differ diff --git a/Data/CommonEvents.rxdata b/Data/CommonEvents.rxdata index b48f96eaf..907609ba6 100644 Binary files a/Data/CommonEvents.rxdata and b/Data/CommonEvents.rxdata differ diff --git a/Data/Enemies.rxdata b/Data/Enemies.rxdata index 004ee903d..be622f513 100644 Binary files a/Data/Enemies.rxdata and b/Data/Enemies.rxdata differ diff --git a/Data/Items.rxdata b/Data/Items.rxdata index 3e62ba6d2..fe767fa0b 100644 Binary files a/Data/Items.rxdata and b/Data/Items.rxdata differ diff --git a/Data/Map619.rxdata b/Data/Map619.rxdata index c6d449054..2c2c6a1df 100644 Binary files a/Data/Map619.rxdata and b/Data/Map619.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index 4a0a80d2d..f3334b54d 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/013_Items/002_Item_Effects.rb b/Data/Scripts/013_Items/002_Item_Effects.rb index 8832c04ec..bb706bf80 100644 --- a/Data/Scripts/013_Items/002_Item_Effects.rb +++ b/Data/Scripts/013_Items/002_Item_Effects.rb @@ -789,6 +789,7 @@ ItemHandlers::UseOnPokemon.add(:RARECANDY, proc { |item, pkmn, scene| scene.pbDisplay(_INTL("It won't have any effect.")) next false end + pbSet(VAR_STAT_RARE_CANDY,pbGet(VAR_STAT_RARE_CANDY)+1) pbChangeLevel(pkmn, pkmn.level + 1, scene) scene.pbHardRefresh next true diff --git a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb index 6b43d7d46..8400e8f12 100644 --- a/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb +++ b/Data/Scripts/025-Randomizer/randomizer gym leader edit.rb @@ -214,29 +214,30 @@ def Kernel.sumGameStats() stringStats << "Seen " << $Trainer.pokedexSeen.to_s << " Pokémon" stringStats << "\nCaught " << $Trainer.pokedexOwned.to_s << " Pokémon" - stringStats << "\nBeaten the Elite Four " << $game_variables[174].to_s << " times" - stringStats << "\nFused " << $game_variables[126].to_s << " Pokémon" + stringStats << "\nBeaten the Elite Four " << $game_variables[VAR_STAT_NB_ELITE_FOUR].to_s << " times" + stringStats << "\nFused " << $game_variables[VAR_STAT_NB_FUSIONS].to_s << " Pokémon" - stringStats << "\nRematched " << $game_variables[162].to_s << " Gym Leaders" + stringStats << "\nRematched " << $game_variables[VAR_STAT_LEADER_REMATCH].to_s << " Gym Leaders" stringStats << "\nTook " << $PokemonGlobal.stepcount.to_s << " steps" stringStats << "\nVisited " << countVisitedMaps.to_s << " different areas" + stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY] << " Rare Candies" if $game_switches[910] - stringStats << "\nMade " << $game_variables[164].to_s << " Wonder Trades" + stringStats << "\nMade " << $game_variables[VAR_STAT_NB_WONDERTRADES].to_s << " Wonder Trades" end - stringStats << "\nTipped $" << $game_variables[100].to_s << " to clowns" - stringStats << "\nDestroyed " << $game_variables[163].to_s << " sandcastles" + stringStats << "\nTipped $" << $game_variables[VAR_STAT_CLOWN_TIP_TOTAL].to_s << " to clowns" + stringStats << "\nDestroyed " << $game_variables[VAR_STAT_NB_SANDCASTLES].to_s << " sandcastles" - if $game_variables[43] > 0 || $game_variables[44] > 0 - stringStats << "\nWon $" << $game_variables[43].to_s << " against gamblers" - stringStats << "\nLost $" << $game_variables[44].to_s << " against gamblers" + if $game_variables[VAR_STAT_GAMBLER_WINS] > 0 || $game_variables[VAR_STAT_GAMBLER_LOSSES] > 0 + stringStats << "\nWon $" << $game_variables[VAR_STAT_GAMBLER_WINS].to_s << " against gamblers" + stringStats << "\nLost $" << $game_variables[VAR_STAT_GAMBLER_LOSSES].to_s << " against gamblers" end - stringStats << "\nSpent $" << $game_variables[225].to_s << " at hotels" + stringStats << "\nSpent $" << $game_variables[VAR_STAT_HOTELS_SPENT].to_s << " at hotels" - stringStats << "\nAccepted " << $game_variables[96].to_s << " quests" - stringStats << "\nCompleted " << $game_variables[98].to_s << " quests" - stringStats << "\nDiscovered " << $game_variables[193].to_s << " secrets" + stringStats << "\nAccepted " << $game_variables[VAR_STAT_QUESTS_ACCEPTED].to_s << " quests" + stringStats << "\nCompleted " << $game_variables[VAR_STAT_QUESTS_COMPLETED].to_s << " quests" + stringStats << "\nDiscovered " << $game_variables[VAR_STAT_NB_SECRETS].to_s << " secrets" if $game_switches[912] stringStats << "\nDied " << $game_variables[191].to_s << " times in Pikachu's adventure" diff --git a/Data/Scripts/049_Compatibility/Constants.rb b/Data/Scripts/049_Compatibility/Constants.rb index 231bb1508..cffbaf949 100644 --- a/Data/Scripts/049_Compatibility/Constants.rb +++ b/Data/Scripts/049_Compatibility/Constants.rb @@ -121,6 +121,22 @@ VAR_SHINY_HUE_OFFSET=275 VAR_CURRENT_HIDDEN_MAP = 226 VAR_FUSE_COUNTER = 126 +VAR_STAT_RARE_CANDY=265 +VAR_STAT_LEADER_REMATCH=162 +VAR_STAT_NB_FUSIONS=126 +VAR_STAT_NB_ELITE_FOUR=174 +VAR_STAT_NB_WONDERTRADES=164 +VAR_STAT_CLOWN_TIP_TOTAL=100 +VAR_STAT_NB_SANDCASTLES=163 +VAR_STAT_GAMBLER_WINS=43 +VAR_STAT_GAMBLER_LOSSES=44 +VAR_STAT_HOTELS_SPENT=225 +VAR_STAT_QUESTS_ACCEPTED=96 +VAR_STAT_QUESTS_COMPLETED=98 +VAR_STAT_NB_SECRETS=193 + + + VAR_BATTLE_TOWER_MIN_BST = 257 VAR_BATTLE_TOWER_MAX_BST = 258 diff --git a/Data/Skills.rxdata b/Data/Skills.rxdata index 61cba7ea2..a45219f5e 100644 Binary files a/Data/Skills.rxdata and b/Data/Skills.rxdata differ diff --git a/Data/States.rxdata b/Data/States.rxdata index 0f9b4ae5d..868d49e59 100644 Binary files a/Data/States.rxdata and b/Data/States.rxdata differ diff --git a/Data/System.rxdata b/Data/System.rxdata index ee7d5b5bc..d3606c589 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 0ce401add..b5372acec 100644 Binary files a/Data/Tilesets.rxdata and b/Data/Tilesets.rxdata differ diff --git a/Data/Weapons.rxdata b/Data/Weapons.rxdata index d9bd35260..c7ea19a7a 100644 Binary files a/Data/Weapons.rxdata and b/Data/Weapons.rxdata differ