68 Commits

Author SHA1 Message Date
infinitefusion
6ba975ac51 removed broken character in randomzier sprites list 2023-11-06 19:08:22 -05:00
infinitefusion
2dd2a5d33b removed non-sprite lines in randomizer custom sprites list 2023-11-04 21:14:18 -04:00
infinitefusion
1ea6b531c2 updates randomizer custom sprites list 2023-11-03 18:14:22 -04:00
infinitefusion
b600e126bc reverts new version notification to 5.3.1.2 2023-10-26 15:09:08 -04:00
infinitefusion
2411a0c9fc updates new versin notification 2023-10-21 10:42:20 -04:00
infinitefusion
2f4d26a68f Minor map fixes 2023-10-19 22:39:56 -04:00
infinitefusion
0e0969b3d8 updated sprites managers list in credits 2023-10-18 17:13:45 -04:00
infinitefusion
5d59804d51 Merge remote-tracking branch 'origin/main' 2023-09-30 09:19:19 -04:00
infinitefusion
e918744613 fixes head pokemon not being registered in pokedex after fusion 2023-09-30 09:16:41 -04:00
infinitefusion
e280bf2460 Merge pull request #104 from xfix/backup-save-on-save
Backup save when saving
2023-09-30 09:14:16 -04:00
infinitefusion
1f1780cee4 creates backup when saving (original commit: infinitefusion-e18/pull/104/commits/c4ef959e47facac7ac883865ec71f3c3b0907ec1) 2023-09-30 09:13:27 -04:00
infinitefusion
d05e4569ea changed new version available text 2023-09-27 22:00:30 -04:00
infinitefusion
18758b007c updated custom sprites list for august pack 2023-09-27 21:18:48 -04:00
infinitefusion
1ea0934c19 changed url for fetching credits file 2023-09-27 21:02:54 -04:00
infinitefusion
24760804e1 Adds shiny chance to downloaded settings file 2023-09-18 21:33:56 -04:00
infinitefusion
581bdf3ca8 increases version number 2023-09-18 17:32:06 -04:00
infinitefusion
eba115202d Fixes water effect bug 2023-09-17 20:28:51 -04:00
infinitefusion
09f9f20468 Fixes water effect bug 2023-09-17 20:28:25 -04:00
infinitefusion
71409b6698 updates version number 2023-09-17 19:51:11 -04:00
infinitefusion
e448583222 fixes infinite splicers bug 2023-09-17 19:45:02 -04:00
infinitefusion
7b08544828 Fixes settings url 2023-09-17 19:44:52 -04:00
infinitefusion
b5bdac6775 fixed infinite splicers bug 2023-09-17 19:42:12 -04:00
infinitefusion
70e605ae79 re-enabled automatic url file download 2023-09-17 19:39:57 -04:00
infinitefusion
bd7b6bfa43 fixes crash when downloading base pokemon sprites 2023-09-17 19:39:26 -04:00
infinitefusion
84648ad7b5 increased version number 2023-09-17 19:01:13 -04:00
infinitefusion
0bb4ba944c automatically download remote urls settings 2023-09-17 19:00:39 -04:00
infinitefusion
bb7072d4cc changes sprites repo to gitlab 2 2023-09-17 18:06:55 -04:00
infinitefusion
9c560c7daf changes sprites repo to gitlab 2023-09-17 18:06:36 -04:00
infinitefusion
ecb0d4d2c3 minor game changes 2023-09-17 17:42:59 -04:00
infinitefusion
fa1bbc8728 updates july spritepack credits 2023-09-01 06:34:22 -04:00
infinitefusion
7f217583d0 updates randomizer file list with new spritepack 2023-09-01 06:30:31 -04:00
infinitefusion
9473fea8b9 updates sprite credits 2023-08-10 08:48:48 -04:00
infinitefusion
64923e1a0d updates custom sprites index with june spritepack 2023-08-10 07:53:06 -04:00
infinitefusion
ab24b9eb11 updates sprite credits file 2023-08-09 23:27:09 -04:00
infinitefusion
6378971055 fixes missing pixel line in outdoor tileset 2023-08-09 21:43:24 -04:00
infinitefusion
0f54173c05 updates some tilesets tiles 2023-08-09 21:26:47 -04:00
infinitefusion
05f9a7ec84 updates new version notification to 5.3.1 2023-08-07 18:57:30 -04:00
infinitefusion
8f15e963f1 updates version number 2023-08-07 18:43:56 -04:00
infinitefusion
9c5ca890f3 updates url for autogen sprites 2023-08-07 18:36:15 -04:00
infinitefusion
178d61eec0 fixed sprite managers section in game credits 2023-08-05 08:42:21 -04:00
infinitefusion
390fd72d2d Fixes lag in sinnoh trio portals 2023-08-04 18:14:36 -04:00
infinitefusion
6f8d4f9a9d mt. silver screen effects bugfix & portal animation 2023-08-04 11:20:10 -04:00
infinitefusion
b2d5e8c533 increases number of points for box link to 5000 2023-08-04 09:23:05 -04:00
infinitefusion
7e3610b365 adds missing ressources for puddle and shadows 2023-08-03 18:00:15 -04:00
infinitefusion
d4b882ff96 Adds water animation for surfing and puddles 2023-08-03 17:53:55 -04:00
infinitefusion
ba07453021 Adds water animation for surfing and puddles 2023-08-03 17:53:30 -04:00
infinitefusion
dca4118898 Adds overworld shadows 2023-08-03 14:29:42 -04:00
Konrad Borowski
c4ef959e47 Backup save when saving 2023-07-26 17:53:55 +02:00
infinitefusion
1247c1f43d Fixes kin island pokemon club trainers not using fusions 2023-07-25 20:16:53 -04:00
infinitefusion
38ea210de7 Fixes corrupt savefile issue with fusion quiz + update to v5.3.0.7 2023-07-16 20:15:54 -04:00
infinitefusion
d38c3f65f4 Adds spriter credits to evolution screen 2023-07-16 15:09:07 -04:00
infinitefusion
321f89282c deactivates arrows quick scroll outside of long lists and pokedex 2023-07-16 11:55:10 -04:00
infinitefusion
17a2d9b97a Makes it possible to jump up and down 1 colomn lists with the left and right arrows 2023-07-16 09:31:00 -04:00
infinitefusion
ba6b1b47d4 creates customBattlers folder if missing 2023-07-15 17:33:36 -04:00
infinitefusion
9106833a9d updates game version to 5.3.0.6 2023-07-11 20:10:41 -04:00
infinitefusion
c615791bad Fixes bad egg resize in pc 2023-07-11 20:09:06 -04:00
infinitefusion
e7778b72b9 Fixes crash when can't copy file when generating fusion icon 2023-07-11 19:53:55 -04:00
infinitefusion
e663541a88 fixes route 1 music 2023-07-09 16:51:15 -04:00
infinitefusion
172797184e Fixes crash when sending bait in safari zone 2023-07-09 16:04:54 -04:00
infinitefusion
172180790b Eusine give back stolen pokemon in goldenrod 2023-07-09 10:52:35 -04:00
infinitefusion
fc243c6ac7 Removes option to fuse from PC while holding a pokemon (the option did nothing) 2023-07-08 12:18:27 -04:00
infinitefusion
95779bfccb adds missing several sound effects 2023-07-08 10:09:11 -04:00
infinitefusion
78caa8fc21 Fixes crash when trying to revive fossil after updating from older version 2023-07-08 09:07:18 -04:00
infinitefusion
0bbbbea686 Added more prizes to fusion quiz and adjusted prize exchange prices 2023-07-04 20:41:24 -04:00
infinitefusion
45bb8d5946 Fix fusion icons 2023-07-03 18:41:46 -04:00
infinitefusion
6e1dd22df8 FIxes mareanie doll not working 2023-07-03 12:42:40 -04:00
infinitefusion
0fca95c637 Fixes boon island warps 2023-07-03 07:48:27 -04:00
infinitefusion
dbfaf352bc Fixes abilities activating twice 2023-07-02 22:26:07 -04:00
139 changed files with 115605 additions and 68831 deletions

3
.gitignore vendored
View File

@@ -1,3 +0,0 @@
/*
!/Data/Scripts/
!/Data/Scripts/**

Binary file not shown.

BIN
Audio/BGM/route1.mp3 Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Battle flee.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Battle recall.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Battle throw.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Exclaim.wav Normal file

Binary file not shown.

BIN
Audio/SE/GUI menu close.ogg Normal file

Binary file not shown.

BIN
Audio/SE/GUI menu open.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/GUI sel buzzer.ogg Normal file

Binary file not shown.

BIN
Audio/SE/GUI sel cancel.ogg Normal file

Binary file not shown.

BIN
Audio/SE/GUI sel cursor.ogg Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Mart buy item.ogg Normal file

Binary file not shown.

BIN
Audio/SE/PC access.ogg Normal file

Binary file not shown.

BIN
Audio/SE/PC close.ogg Normal file

Binary file not shown.

BIN
Audio/SE/PC open.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Pkmn exp full.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Pkmn exp gain.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Pkmn faint.ogg Normal file

Binary file not shown.

Binary file not shown.

BIN
Audio/SE/Player bump.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Player jump.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Rock Smash.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Vs flash.ogg Normal file

Binary file not shown.

BIN
Audio/SE/Vs sword.ogg Normal file

Binary file not shown.

BIN
Audio/SE/puddle.ogg Normal file

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Data/Map799.rxdata Normal file

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -6,7 +6,7 @@
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 = "5.3.0"
GAME_VERSION_NUMBER = "5.3.1.3"
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
@@ -31,9 +31,9 @@ module Settings
VERSION_FILE_PATH = "Data/VERSION"
CUSTOM_SPRITES_FILE_PATH = "Data/CUSTOM_SPRITES"
CREDITS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/sprites/main/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"
HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.rb"
HTTP_CONFIGS_FILE_PATH = "Data/Scripts/RemoteUrls.rb"
FRONTSPRITE_POSITION_OFFSET = 20
FRONTSPRITE_SCALE = 0.6666666666

View File

@@ -32,7 +32,7 @@ class Game_Player < Game_Character
def bump_into_object
return if @bump_se && @bump_se>0
pbSEPlay("Player bump")
@bump_se = Graphics.frame_rate/4
@bump_se = Graphics.frame_rate/2
end
def move_generic(dir, turn_enabled = true)

View File

@@ -741,6 +741,7 @@ class SpriteWindow_Selectable < SpriteWindow_Base
@row_height = 32
@column_spacing = 32
@ignore_input = false
@allow_arrows_jump=false
end
def itemCount
@@ -767,6 +768,10 @@ class SpriteWindow_Selectable < SpriteWindow_Base
end
end
def setAllowArrowsJump(value)
@allow_arrows_jump=value
end
def columns
return @column_max || 1
end
@@ -848,63 +853,89 @@ class SpriteWindow_Selectable < SpriteWindow_Base
super
if self.active && @item_max > 0 && @index >= 0 && !@ignore_input
if Input.repeat?(Input::UP)
if @index >= @column_max ||
(Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
oldindex = @index
@index = (@index - @column_max + @item_max) % @item_max
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
scroll_up()
elsif Input.repeat?(Input::DOWN)
if @index < @item_max - @column_max ||
(Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
oldindex = @index
@index = (@index + @column_max) % @item_max
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
elsif Input.repeat?(Input::LEFT)
if @column_max >= 2 && @index > 0
oldindex = @index
@index -= 1
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
elsif Input.repeat?(Input::RIGHT)
if @column_max >= 2 && @index < @item_max - 1
oldindex = @index
@index += 1
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
elsif Input.repeat?(Input::JUMPUP)
if @index > 0
oldindex = @index
@index = [self.index-self.page_item_max, 0].max
if @index!=oldindex
pbPlayCursorSE()
self.top_row -= self.page_row_max
update_cursor_rect
end
end
elsif Input.repeat?(Input::JUMPDOWN)
if @index < @item_max-1
oldindex = @index
@index = [self.index+self.page_item_max, @item_max-1].min
if @index!=oldindex
pbPlayCursorSE()
self.top_row += self.page_row_max
update_cursor_rect
end
end
scroll_down()
elsif Input.repeat?(Input::LEFT) && !@allow_arrows_jump
scroll_left()
elsif Input.repeat?(Input::RIGHT) && !@allow_arrows_jump
scroll_right()
elsif Input.repeat?(Input::JUMPUP) || (Input.repeat?(Input::LEFT) && @allow_arrows_jump)
jump_up()
elsif Input.repeat?(Input::JUMPDOWN) || (Input.repeat?(Input::RIGHT) && @allow_arrows_jump)
jump_down()
end
end
end
def scroll_up()
if @index >= @column_max ||
(Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
oldindex = @index
@index = (@index - @column_max + @item_max) % @item_max
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
end
def scroll_down()
if @index < @item_max - @column_max ||
(Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
oldindex = @index
@index = (@index + @column_max) % @item_max
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
end
def scroll_left()
if @column_max >= 2 && @index < @item_max - 1
oldindex = @index
@index += 1
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
end
def scroll_right()
if @column_max >= 2 && @index > 0
oldindex = @index
@index -= 1
if @index!=oldindex
pbPlayCursorSE()
update_cursor_rect
end
end
end
def jump_up()
if @index > 0
oldindex = @index
@index = [self.index-self.page_item_max, 0].max
if @index!=oldindex
pbPlayCursorSE()
self.top_row -= self.page_row_max
update_cursor_rect
end
end
end
def jump_down()
if @index < @item_max-1
oldindex = @index
@index = [self.index+self.page_item_max, @item_max-1].min
if @index!=oldindex
pbPlayCursorSE()
self.top_row += self.page_row_max
update_cursor_rect
end
end
end

Some files were not shown because too many files have changed in this diff Show More