removes pokemon.txt

Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases
reverts shiny settings
2025-12-06 06:01:46 +00:00 · 2024-04-02 11:53:47 -04:00 · 2024-04-02 11:53:21 -04:00 · 2024-04-02 11:02:23 -04:00 · 2024-04-02 10:43:34 -04:00 · 2024-04-02 10:42:40 -04:00
190 changed files with 168094 additions and 130111 deletions
--- a/Data/Actors.rxdata
+++ b/Data/Actors.rxdata
--- a/Data/Animations.rxdata
+++ b/Data/Animations.rxdata
--- a/Data/Armors.rxdata
+++ b/Data/Armors.rxdata
--- a/Data/CUSTOM_SPRITES
+++ b/Data/CUSTOM_SPRITES
--- a/Data/CommonEvents.rxdata
+++ b/Data/CommonEvents.rxdata
--- a/Data/Enemies.rxdata
+++ b/Data/Enemies.rxdata
--- a/Data/Items.rxdata
+++ b/Data/Items.rxdata
--- a/Data/Map019.rxdata
+++ b/Data/Map019.rxdata
--- a/Data/Map105.rxdata
+++ b/Data/Map105.rxdata
--- a/Data/Map237.rxdata
+++ b/Data/Map237.rxdata
--- a/Data/Map240.rxdata
+++ b/Data/Map240.rxdata
--- a/Data/Map241.rxdata
+++ b/Data/Map241.rxdata
--- a/Data/Map242.rxdata
+++ b/Data/Map242.rxdata
--- a/Data/Map246.rxdata
+++ b/Data/Map246.rxdata
--- a/Data/Map359.rxdata
+++ b/Data/Map359.rxdata
--- a/Data/Map526.rxdata
+++ b/Data/Map526.rxdata
--- a/Data/Map638.rxdata
+++ b/Data/Map638.rxdata
--- a/Data/Map819.rxdata
+++ b/Data/Map819.rxdata
--- a/Data/Map821.rxdata
+++ b/Data/Map821.rxdata
--- a/Data/Map825.rxdata
+++ b/Data/Map825.rxdata
--- a/Data/Map826.rxdata
+++ b/Data/Map826.rxdata
--- a/Data/MapInfos.rxdata
+++ b/Data/MapInfos.rxdata
--- a/Data/SPRITE_CREDS
+++ b/Data/SPRITE_CREDS
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -5,8 +5,8 @@
 #==============================================================================#
 module Settings
  # The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
-  GAME_VERSION = '5.0.0'
-  GAME_VERSION_NUMBER = "6.1.1"
+  GAME_VERSION = '6.1.0'
+  GAME_VERSION_NUMBER = "6.1.3"

  POKERADAR_LIGHT_ANIMATION_RED_ID = 17
  POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
--- a/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
+++ b/Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
@@ -593,6 +593,7 @@ end
        oldindex = @index
        pbGoToPrevious
        if @index != oldindex
+          @selected_index=0
          pbUpdateDummyPokemon
          @available = pbGetAvailableForms
          pbSEStop
@@ -603,6 +604,7 @@ end
        oldindex = @index
        pbGoToNext
        if @index != oldindex
+          @selected_index=0
          pbUpdateDummyPokemon
          @available = pbGetAvailableForms
          pbSEStop
--- a/Data/Scripts/048_Fusion/SplitNames.rb
+++ b/Data/Scripts/048_Fusion/SplitNames.rb
@@ -122,7 +122,7 @@ module GameData
    ["Sea", "king"],
    ["Star", "yu"],
    ["Star", "mie"],
-    ["Mr.", "mime"],
+    ["Mr. ", "mime"],
    ["Scy", "ther"],
    ["Jyn", "nx"],
    ["Electa", "buzz"],
--- a/Data/Scripts/DownloadedSettings.rb
+++ b/Data/Scripts/DownloadedSettings.rb
@@ -1,6 +1,6 @@

 module Settings
-  SHINY_POKEMON_CHANCE = 16
+  SHINY_POKEMON_CHANCE = 32#16
  CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Sprite Credits.csv"
  SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
  VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
--- a/Data/Skills.rxdata
+++ b/Data/Skills.rxdata
--- a/Data/States.rxdata
+++ b/Data/States.rxdata
--- a/Data/System.rxdata
+++ b/Data/System.rxdata
--- a/Data/Tilesets.rxdata
+++ b/Data/Tilesets.rxdata
--- a/Data/Weapons.rxdata
+++ b/Data/Weapons.rxdata
--- a/Data/messages.dat
+++ b/Data/messages.dat
--- a/Data/species.dat
+++ b/Data/species.dat
--- a/Data/trainers_expert.dat
+++ b/Data/trainers_expert.dat
--- a/Graphics/127.png
+++ b/Graphics/127.png
--- a/Graphics/127_nightmare.png
+++ b/Graphics/127_nightmare.png
--- a/animations/ball_ABILITYBALL.png
+++ b/animations/ball_ABILITYBALL.png
--- a/animations/ball_ABILITYBALL_open.png
+++ b/animations/ball_ABILITYBALL_open.png
--- a/animations/ball_BEASTBALL.png
+++ b/animations/ball_BEASTBALL.png
--- a/animations/ball_BEASTBALL_open.png
+++ b/animations/ball_BEASTBALL_open.png
--- a/animations/ball_CANDYBALL.png
+++ b/animations/ball_CANDYBALL.png
--- a/animations/ball_CANDYBALL_open.png
+++ b/animations/ball_CANDYBALL_open.png
--- a/animations/ball_CHERISHBALL.png
+++ b/animations/ball_CHERISHBALL.png
--- a/animations/ball_CHERISHBALL_open.png
+++ b/animations/ball_CHERISHBALL_open.png
--- a/animations/ball_DIVEBALL.png
+++ b/animations/ball_DIVEBALL.png
--- a/animations/ball_DIVEBALL_open.png
+++ b/animations/ball_DIVEBALL_open.png
--- a/animations/ball_DREAMBALL.png
+++ b/animations/ball_DREAMBALL.png
--- a/animations/ball_DREAMBALL_open.png
+++ b/animations/ball_DREAMBALL_open.png
--- a/animations/ball_DUSKBALL.png
+++ b/animations/ball_DUSKBALL.png
--- a/animations/ball_DUSKBALL_open.png
+++ b/animations/ball_DUSKBALL_open.png
--- a/animations/ball_FASTBALL.png
+++ b/animations/ball_FASTBALL.png
--- a/animations/ball_FASTBALL_open.png
+++ b/animations/ball_FASTBALL_open.png
--- a/animations/ball_FIRECRACKER.png
+++ b/animations/ball_FIRECRACKER.png
--- a/animations/ball_FIRECRACKER_open.png
+++ b/animations/ball_FIRECRACKER_open.png
--- a/animations/ball_FRIENDBALL.png
+++ b/animations/ball_FRIENDBALL.png
--- a/animations/ball_FRIENDBALL_open.png
+++ b/animations/ball_FRIENDBALL_open.png
--- a/animations/ball_FROSTBALL.png
+++ b/animations/ball_FROSTBALL.png
--- a/animations/ball_FROSTBALL_open.png
+++ b/animations/ball_FROSTBALL_open.png
--- a/animations/ball_FUSIONBALL.png
+++ b/animations/ball_FUSIONBALL.png
--- a/animations/ball_FUSIONBALL_open.png
+++ b/animations/ball_FUSIONBALL_open.png
--- a/animations/ball_GENDERBALL.png
+++ b/animations/ball_GENDERBALL.png
--- a/animations/ball_GENDERBALL_open.png
+++ b/animations/ball_GENDERBALL_open.png
--- a/animations/ball_GREATBALL.png
+++ b/animations/ball_GREATBALL.png
--- a/animations/ball_GREATBALL_open.png
+++ b/animations/ball_GREATBALL_open.png
--- a/animations/ball_HEALBALL.png
+++ b/animations/ball_HEALBALL.png
--- a/animations/ball_HEALBALL_open.png
+++ b/animations/ball_HEALBALL_open.png
--- a/animations/ball_HEAVYBALL.png
+++ b/animations/ball_HEAVYBALL.png
--- a/animations/ball_HEAVYBALL_open.png
+++ b/animations/ball_HEAVYBALL_open.png
--- a/animations/ball_LEVELBALL.png
+++ b/animations/ball_LEVELBALL.png
--- a/animations/ball_LEVELBALL_open.png
+++ b/animations/ball_LEVELBALL_open.png
--- a/animations/ball_LOVEBALL.png
+++ b/animations/ball_LOVEBALL.png
--- a/animations/ball_LOVEBALL_open.png
+++ b/animations/ball_LOVEBALL_open.png
--- a/animations/ball_LUREBALL.png
+++ b/animations/ball_LUREBALL.png
--- a/animations/ball_LUREBALL_open.png
+++ b/animations/ball_LUREBALL_open.png
--- a/animations/ball_LUXURYBALL.png
+++ b/animations/ball_LUXURYBALL.png
--- a/animations/ball_LUXURYBALL_open.png
+++ b/animations/ball_LUXURYBALL_open.png
--- a/animations/ball_MASTERBALL.png
+++ b/animations/ball_MASTERBALL.png
--- a/animations/ball_MASTERBALL_open.png
+++ b/animations/ball_MASTERBALL_open.png
--- a/animations/ball_MOONBALL.png
+++ b/animations/ball_MOONBALL.png
--- a/animations/ball_MOONBALL_open.png
+++ b/animations/ball_MOONBALL_open.png
--- a/animations/ball_NESTBALL.png
+++ b/animations/ball_NESTBALL.png
--- a/animations/ball_NESTBALL_open.png
+++ b/animations/ball_NESTBALL_open.png
--- a/animations/ball_NETBALL.png
+++ b/animations/ball_NETBALL.png
--- a/animations/ball_NETBALL_open.png
+++ b/animations/ball_NETBALL_open.png
--- a/animations/ball_PERFECTBALL.png
+++ b/animations/ball_PERFECTBALL.png
--- a/animations/ball_PERFECTBALL_open.png
+++ b/animations/ball_PERFECTBALL_open.png
--- a/animations/ball_POKEBALL.png
+++ b/animations/ball_POKEBALL.png
--- a/animations/ball_POKEBALL_open.png
+++ b/animations/ball_POKEBALL_open.png
--- a/animations/ball_PREMIERBALL.png
+++ b/animations/ball_PREMIERBALL.png
--- a/animations/ball_PREMIERBALL_open.png
+++ b/animations/ball_PREMIERBALL_open.png
--- a/animations/ball_PUREBALL.png
+++ b/animations/ball_PUREBALL.png
--- a/animations/ball_PUREBALL_open.png
+++ b/animations/ball_PUREBALL_open.png
--- a/animations/ball_QUICKBALL.png
+++ b/animations/ball_QUICKBALL.png
--- a/animations/ball_QUICKBALL_open.png
+++ b/animations/ball_QUICKBALL_open.png
--- a/animations/ball_REPEATBALL.png
+++ b/animations/ball_REPEATBALL.png
--- a/animations/ball_REPEATBALL_open.png
+++ b/animations/ball_REPEATBALL_open.png
--- a/animations/ball_ROCKETBALL.png
+++ b/animations/ball_ROCKETBALL.png
--- a/animations/ball_ROCKETBALL_open.png
+++ b/animations/ball_ROCKETBALL_open.png
--- a/animations/ball_SAFARIBALL.png
+++ b/animations/ball_SAFARIBALL.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
infinitefusion	a3c4e3f80d	removes pokemon.txt	2024-04-02 11:53:47 -04:00
infinitefusion	b95c954177	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-04-02 11:53:21 -04:00
infinitefusion	f2d25381f0	reverts shiny settings	2024-04-02 11:02:23 -04:00
infinitefusion	67988d56db	increments version number	2024-04-02 10:43:34 -04:00
infinitefusion	e0fa62a4b8	updates pokeball graphucs	2024-04-02 10:42:40 -04:00
infinitefusion	99e381f018	fixes some pokemon positionings	2024-04-01 20:25:23 -04:00
infinitefusion	4eee99829d	Revert "updates ball graphics" This reverts commit `96e7ab30e9`.	2024-04-01 19:39:14 -04:00
infinitefusion	f191713cd7	missing sprites	2024-04-01 19:14:09 -04:00
infinitefusion	f788a31579	fixes triple fusion not being unlocked after lake of rage	2024-04-01 17:11:01 -04:00
infinitefusion	96e7ab30e9	updates ball graphics	2024-04-01 17:01:12 -04:00
infinitefusion	309375673d	updates custom sprites list	2024-04-01 16:14:12 -04:00
infinitefusion	4cd19750ef	(temp) increased shiny odds for 2024-04-01	2024-04-01 10:39:00 -04:00
infinitefusion	d82020f64b	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-31 20:18:28 -04:00
infinitefusion	f21bd70b9a	fixed being able to recruit electric guitarist before starting the quest	2024-03-31 20:18:13 -04:00
infinitefusion	5fac90cd91	Merge branch 'main' of https://github.com/infinitefusion/infinitefusion-e18 into releases	2024-03-31 11:19:27 -04:00
infinitefusion	5ea17c8c6e	Adds small hints for meloetta quest guitarists	2024-03-31 10:33:35 -04:00
infinitefusion	4f87fb64c7	fixes missing trainer in expert mode	2024-03-30 21:27:14 -04:00
infinitefusion	0c0a20f222	Vermillion city invisible sign	2024-03-30 21:25:56 -04:00
infinitefusion	d78c950afc	no dev files in releases	2024-03-29 21:47:57 -04:00
infinitefusion	e3bb249849	system	2024-03-29 21:47:01 -04:00
infinitefusion	3dcaaedfc9	updates version number	2024-03-29 21:42:54 -04:00
infinitefusion	5e9153a097	Fixes crash because of indexes not resetting when scrolling in sprites page	2024-03-29 21:38:57 -04:00
infinitefusion	3a307cdabf	map fixes	2024-03-29 12:57:26 -04:00