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 6450d6f5e..a5e69e497 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/Map042.rxdata b/Data/Map042.rxdata index fe8fa4082..0b53a8ae0 100644 Binary files a/Data/Map042.rxdata and b/Data/Map042.rxdata differ diff --git a/Data/Map077.rxdata b/Data/Map077.rxdata index f4c0d90ff..8a768246a 100644 Binary files a/Data/Map077.rxdata and b/Data/Map077.rxdata differ diff --git a/Data/Map102.rxdata b/Data/Map102.rxdata index 093794478..58a6d3806 100644 Binary files a/Data/Map102.rxdata and b/Data/Map102.rxdata differ diff --git a/Data/Map160.rxdata b/Data/Map160.rxdata index 295a116bb..8c409af18 100644 Binary files a/Data/Map160.rxdata and b/Data/Map160.rxdata differ diff --git a/Data/Map240.rxdata b/Data/Map240.rxdata index 40326cf62..af8e16cdf 100644 Binary files a/Data/Map240.rxdata and b/Data/Map240.rxdata differ diff --git a/Data/Map250.rxdata b/Data/Map250.rxdata index 8deab7476..acff8efae 100644 Binary files a/Data/Map250.rxdata and b/Data/Map250.rxdata differ diff --git a/Data/Map262.rxdata b/Data/Map262.rxdata index 6ee674fb6..e6dfbd2f6 100644 Binary files a/Data/Map262.rxdata and b/Data/Map262.rxdata differ diff --git a/Data/Map292.rxdata b/Data/Map292.rxdata index 727c24158..fd24cb80f 100644 Binary files a/Data/Map292.rxdata and b/Data/Map292.rxdata differ diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata index 0a509abc9..91ba0604a 100644 Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ diff --git a/Data/Map379.rxdata b/Data/Map379.rxdata index 9706a34c5..4ba90cf77 100644 Binary files a/Data/Map379.rxdata and b/Data/Map379.rxdata differ diff --git a/Data/Map380.rxdata b/Data/Map380.rxdata index ee35237cf..3be745d9f 100644 Binary files a/Data/Map380.rxdata and b/Data/Map380.rxdata differ diff --git a/Data/Map386.rxdata b/Data/Map386.rxdata index 1dd38481d..9956b3103 100644 Binary files a/Data/Map386.rxdata and b/Data/Map386.rxdata differ diff --git a/Data/Map490.rxdata b/Data/Map490.rxdata index ed780132a..659eb9dfe 100644 Binary files a/Data/Map490.rxdata and b/Data/Map490.rxdata differ diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata index b1be089bc..10431e8a8 100644 Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ diff --git a/Data/Scripts/050_AddOns/BattleLounge.rb b/Data/Scripts/050_AddOns/BattleLounge.rb index d40d7be4d..2d53591e7 100644 --- a/Data/Scripts/050_AddOns/BattleLounge.rb +++ b/Data/Scripts/050_AddOns/BattleLounge.rb @@ -95,19 +95,22 @@ def get_random_battle_lounge_egg_group return group end -GENERIC_PRIZES_MULTI = [:HEARTSCALE, :LEMONADE] -GENERIC_PRIZES_SINGLE = [:RARECANDY, :RARECANDY, :PPUP, :EJECTBUTTON, :FOCUSBAND, :FOCUSSASH, :RESETURGE, :ABILITYURGE, :ITEMURGE, :ITEMDROP, :HPUP] -MONSTER_PRIZES = [:RAREBONE, :LAGGINGTAIL, :RAZORFANG, :RAZORCLAW, :GRIPCLAW] -WATER_PRIZES = [:MYSTICWATER, :BIGPEARL] -BUG_PRIZES = [:SILVERPOWDER, :SHEDSHELL] -FLYING_PRIZES = [:AIRBALLOON, :FLOATSTONE] -FIELD_PRIZES = [:MOOMOOMILK, :IRONBALL, :RAREBONE] -FAIRY_PRIZES = [:STARPIECE, :DESTINYKNOT, :MAXELIXIR] -HUMAN_PRIZES = [:BLACKBELT, :RINGTARGET, :EXPERTBELT] +GENERIC_PRIZES_MULTI = [:HEARTSCALE, :HEARTSCALE,:HEARTSCALE,:HEARTSCALE,:HEARTSCALE, + :LEMONADE, :PERFECTBALL, :BOOSTBALL, + :GENDERBALL, :ABILITYBALL, :VIRUSBALL, :SHINYBALL, :RARECANDY] +GENERIC_PRIZES_SINGLE = [:RARECANDY, :RARECANDY, :PPUP, :EJECTBUTTON, :FOCUSBAND, :FOCUSSASH, + :RESETURGE, :ABILITYURGE, :ITEMURGE, :ITEMDROP, :HPUP, :INCUBATOR, :LUCKYEGG] +MONSTER_PRIZES = [:RAREBONE, :LAGGINGTAIL, :RAZORFANG, :RAZORCLAW, :GRIPCLAW, :MANKEYPAW] +WATER_PRIZES = [:MYSTICWATER, :BIGPEARL, :SHELLBELL] +BUG_PRIZES = [:SILVERPOWDER, :SHEDSHELL, :EVIOLITE] +FLYING_PRIZES = [:AIRBALLOON, :FLOATSTONE, :COMETSHARD] +FIELD_PRIZES = [:MOOMOOMILK, :IRONBALL, :RAREBONE, :MANKEYPAW, :FLAMEORB] +FAIRY_PRIZES = [:STARPIECE, :DESTINYKNOT, :MAXELIXIR, :LIFEORB] +HUMAN_PRIZES = [:BLACKBELT, :RINGTARGET, :EXPERTBELT, :GOLDRING, :AMULETCOIN] GRASS_PRIZES = [:REVIVALHERB, :POWERHERB, :HEALPOWDER, :ABSORBBULB, :BIGMUSHROOM] -MINERAL_PRIZES = [:CELLBATTERY, :SHINYSTONE, :BIGNUGGET, :RELICCOPPER, :RELICGOLD, :RELICSILVER] -AMORPHOUS_PRIZES = [:SPELLTAG, :WIDELENS, :ZOOMLENS, :SCOPELENS] -DRAGON_PRIZES = [:DRAGONSCALE, :DRAGONFANG, :RARECANDY] +MINERAL_PRIZES = [:CELLBATTERY, :SHINYSTONE, :BIGNUGGET, :RELICCOPPER, :RELICGOLD, :RELICSILVER, :DIAMOND, :ROCKYHELMET] +AMORPHOUS_PRIZES = [:SPELLTAG, :WIDELENS, :ZOOMLENS, :SCOPELENS, :TOXICORB] +DRAGON_PRIZES = [:DRAGONSCALE, :DRAGONFANG, :RARECANDY, :GOLDRING] UNDISCOVERED_PRIZES = [:MASTERBALL, :SACREDASH] #todo: prizes related to the group (ex: dragon fang for dragon types, TMs, etc. ) # todo: if heartscale, give a random amount from 10-20 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 ba9a840dd..e61d09fbb 100644 Binary files a/Data/System.rxdata and b/Data/System.rxdata differ diff --git a/Data/Tilesets.rxdata b/Data/Tilesets.rxdata index 2c6933d73..8d113cbfb 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 diff --git a/PBS/metadata.txt b/PBS/metadata.txt index a4bd0f611..08c7200a3 100644 --- a/PBS/metadata.txt +++ b/PBS/metadata.txt @@ -8,12 +8,12 @@ PlayerF=POKEMONTRAINER_Red,trchar006,girl_bike,girl_surf_offset,girl_run,girl_di PlayerG=POKEMONTRAINER_Red,trchar007,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset PlayerH=POKEMONTRAINER_Red,trchar008,girl_bike,girl_surf_offset,girl_run,girl_dive_offset,girl_fish_offset,girl_fishsurf_offset TrainerBattleBGM=Pokemon HeartGold and SoulSilver - Trainer Battle (Kanto) -TrainerVictoryBGM =trainer-victory +TrainerVictoryBGM =trainer-victory.mp3 SurfBGM=Surfing (Kanto) - Remastered.mp3 BicycleBGM=SSANNE.ogg Home=3,7,5,8 WildBattleBGM=Pokemon HeartGold and SoulSilver - Wild Pokemon Battle (Kanto) -WildVictoryBGM=wild-victory +WildVictoryBGM=wild-victory.mp3 [001] # Cerulean City BattleBack=Bridge