DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-07 13:15:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed support for ID numbers in species/item/trainer graphics filenames

Browse Source
This commit is contained in:
Maruno17
2021-02-07 15:06:21 +00:00
parent eda301b57b
commit 6bf749d3f3
11 changed files with 21 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Data/Scripts/011_Data/001_PBS data/003_Item.rb
View File

@@ -25,16 +25,12 @@ module GameData
# Check for files
ret = sprintf("Graphics/Items/%s", item_data.id)
return ret if pbResolveBitmap(ret)
ret = sprintf("Graphics/Items/%03d", item_data.id_number)
return ret if pbResolveBitmap(ret)
# Check for TM/HM type icons
if item_data.is_machine?
move_type = GameData::Move.get(item_data.move).type
type_data = GameData::Type.get(move_type)
ret = sprintf("Graphics/Items/machine_%s", type_data.id)
return ret if pbResolveBitmap(ret)
ret = sprintf("Graphics/Items/machine_%03d", type_data.id_number)
return ret if pbResolveBitmap(ret)
end
return "Graphics/Items/000"
end
@@ -46,8 +42,6 @@ module GameData
# Check for files
ret = sprintf("Graphics/Pictures/Party/icon_%s_%s", name_base, item_data.id)
return ret if pbResolveBitmap(ret)
ret = sprintf("Graphics/Pictures/Party/icon_%s_%03d", name_base, item_data.id_number)
return ret if pbResolveBitmap(ret)
return sprintf("Graphics/Pictures/Party/icon_%s", name_base)
end
@@ -56,8 +50,6 @@ module GameData
return nil if !item_data
# Check for files
ret = sprintf("Graphics/Pictures/Mail/mail_%s", item_data.id)
return ret if pbResolveBitmap(ret)
ret = sprintf("Graphics/Pictures/Mail/mail_%03d", item_data.id_number)
return pbResolveBitmap(ret) ? ret : nil
end

4
Data/Scripts/011_Data/001_PBS data/008_Trainer type.rb
View File

@@ -24,12 +24,8 @@ module GameData
if !optional_suffix.empty?
ret = path + tr_type_data.id.to_s + optional_suffix + suffix
return ret if pbResolveBitmap(ret)
ret = path + sprintf("%03d", tr_type_data.id_number) + optional_suffix + suffix
return ret if pbResolveBitmap(ret)
end
ret = path + tr_type_data.id.to_s + suffix
return ret if pbResolveBitmap(ret)
ret = path + sprintf("%03d", tr_type_data.id_number) + suffix
return (pbResolveBitmap(ret)) ? ret : nil
end

40
Data/Scripts/011_Data/001_PBS data/011_Species files.rb
View File

@@ -2,8 +2,6 @@ module GameData
class Species
def self.check_graphic_file(path, species, form = 0, gender = 0, shiny = false, shadow = false, subfolder = "")
try_subfolder = sprintf("%s/", subfolder)
# species_data = self.get_species_form(species, form)
# species_id = sprintf("%03d", (species_data) ? self.get(species_data.species).id_number : 0)
try_species = species
try_form = (form > 0) ? sprintf("_%d", form) : ""
try_gender = (gender == 1) ? "_female" : ""
@@ -28,14 +26,10 @@ module GameData
end
end
# Look for a graphic matching this combination's parameters
# for j in 0...2 # Try using the species' ID symbol and then its ID number
# next if !try_species || (try_species == "000" && j == 1)
# try_species_text = (j == 0) ? try_species : species_id
try_species_text = try_species
ret = pbResolveBitmap(sprintf("%s%s%s%s%s%s", path, try_subfolder,
try_species_text, try_form, try_gender, try_shadow))
return ret if ret
# end
try_species_text = try_species
ret = pbResolveBitmap(sprintf("%s%s%s%s%s%s", path, try_subfolder,
try_species_text, try_form, try_gender, try_shadow))
return ret if ret
end
return nil
end
@@ -43,17 +37,11 @@ module GameData
def self.check_egg_graphic_file(path, species, form, suffix = "")
species_data = self.get_species_form(species, form)
return nil if species_data.nil?
# species_id = self.get(species_data.species).id_number
if form > 0
ret = pbResolveBitmap(sprintf("%s%s_%d%s", path, species_data.species, form, suffix))
return ret if ret
# ret = pbResolveBitmap(sprintf("%s%03d_%d%s", path, species_id, form, suffix))
# return ret if ret
end
ret = pbResolveBitmap(sprintf("%s%s%s", path, species_data.species, suffix))
return ret
# return ret if ret
# return pbResolveBitmap(sprintf("%s%03d%s", path, species_id, suffix))
return pbResolveBitmap(sprintf("%s%s%s", path, species_data.species, suffix))
end
def self.front_sprite_filename(species, form = 0, gender = 0, shiny = false, shadow = false)
@@ -150,17 +138,11 @@ module GameData
def self.footprint_filename(species, form = 0)
species_data = self.get_species_form(species, form)
return nil if species_data.nil?
# species_id = self.get(species_data.species).id_number
if form > 0
ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Footprints/%s_%d", species_data.species, form))
return ret if ret
# ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Footprints/%03d_%d", species_id, form))
# return ret if ret
end
ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Footprints/%s", species_data.species))
return ret
# return ret if ret
# return pbResolveBitmap(sprintf("Graphics/Pokemon/Footprints/%03d", species_id))
return pbResolveBitmap(sprintf("Graphics/Pokemon/Footprints/%s", species_data.species))
end
#===========================================================================
@@ -168,18 +150,13 @@ module GameData
def self.shadow_filename(species, form = 0)
species_data = self.get_species_form(species, form)
return nil if species_data.nil?
# species_id = self.get(species_data.species).id_number
# Look for species-specific shadow graphic
if form > 0
ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%s_%d", species_data.species, form))
return ret if ret
# ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%03d_%d", species_id, form))
# return ret if ret
end
ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%s", species_data.species))
return ret if ret
# ret = pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%03d", species_id))
# return ret if ret
# Use general shadow graphic
return pbResolveBitmap(sprintf("Graphics/Pokemon/Shadow/%d", species_data.shadow_size))
end
@@ -199,16 +176,11 @@ module GameData
def self.check_cry_file(species, form)
species_data = self.get_species_form(species, form)
return nil if species_data.nil?
# species_id = self.get(species_data.species).id_number
if form > 0
ret = sprintf("Cries/%s_%d", species_data.species, form)
return ret if pbResolveAudioSE(ret)
# ret = sprintf("Cries/%03d_%d", species_id, form)
# return ret if pbResolveAudioSE(ret)
end
ret = sprintf("Cries/%s", species_data.species)
# return ret if pbResolveAudioSE(ret)
# ret = sprintf("Cries/%03d", species_id)
return (pbResolveAudioSE(ret)) ? ret : nil
end