Adds new hats & easter egg pokeballs

This commit is contained in:
chardub
2025-02-17 11:06:32 -05:00
parent cb39bac568
commit 4fa7292bdd
3421 changed files with 501 additions and 278 deletions

BIN
.DS_Store vendored

Binary file not shown.

1
.gitignore vendored
View File

@@ -1,6 +1,7 @@
Graphics/CustomBattlers/local_sprites/* Graphics/CustomBattlers/local_sprites/*
Graphics/Pokemon/FusionIcons/* Graphics/Pokemon/FusionIcons/*
Graphics/CustomBattlers/spritesheets Graphics/CustomBattlers/spritesheets
Graphics/CustomBattlers/*
Data/sprites/* Data/sprites/*
Data/VERSION Data/VERSION
infinitefusion.sh infinitefusion.sh

BIN
315.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

BIN
Data/.DS_Store vendored

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.

View File

@@ -114,8 +114,13 @@ def getEasterEggHeldItem()
return "secrets/MAGIKARP" if [394,471,189,].include?(map) #Fishing huts return "secrets/MAGIKARP" if [394,471,189,].include?(map) #Fishing huts
return "secrets/AZUREFLUTE" if [694,].include?(map) && $PokemonBag.pbQuantity(:AZUREFLUTE)>=1 #Ice Mountain peak return "secrets/AZUREFLUTE" if [694,].include?(map) && $PokemonBag.pbQuantity(:AZUREFLUTE)>=1 #Ice Mountain peak
return "secrets/BIGSODA" if [436,].include?(map) && $PokemonBag.pbQuantity(:SODAPOP)>=1 #Celadon dept. store top return "secrets/BIGSODA" if [436,].include?(map) && $PokemonBag.pbQuantity(:SODAPOP)>=1 #Celadon dept. store top
return "secrets/EGG" if [13,406,214,].include?(map) #Celadon Café return "secrets/EGG" if [13,406,214,].include?(map) #Day care
return "secrets/STICK" if [266,].include?(map) #Ilex forest return "secrets/STICK" if [266,].include?(map) #Ilex forest
return "secrets/BANANA" if [600,].include?(map) #Bond Bridge
return "secrets/BERRY" if [619,620,].include?(map) #Berry forest
return "secrets/COIN" if [357].include?(map) #Pokemart
return "secrets/LATTE" if [406].include?(map) #Celadon Café
return nil return nil
end end

View File

@@ -52,6 +52,8 @@ HAT_FROG = "froghat"
HAT_SANTA = "santa" HAT_SANTA = "santa"
HAT_QMARKS = "glitzerset" HAT_QMARKS = "glitzerset"
HAT_CLOWN = "clownnose"
HAT_BREEDER_1="breedervisor" HAT_BREEDER_1="breedervisor"
HAT_BREEDER_2="breederbandana" HAT_BREEDER_2="breederbandana"
HAT_BREEDER_2_2="PKMBreeder" HAT_BREEDER_2_2="PKMBreeder"

View File

@@ -1,4 +1,4 @@
#todo: make the flower disappear from the tileset somehow? # todo: make the flower disappear from the tileset somehow?
def oricorioEventPickFlower(flower_color) def oricorioEventPickFlower(flower_color)
quest_progression = pbGet(VAR_ORICORIO_FLOWERS) quest_progression = pbGet(VAR_ORICORIO_FLOWERS)
if flower_color == :PINK if flower_color == :PINK
@@ -138,7 +138,7 @@ def getFossilsGuyTeam(level)
team = [] team = []
team << Pokemon.new(base_poke, level) team << Pokemon.new(base_poke, level)
#Mt. Moon fossil # Mt. Moon fossil
if $game_switches[SWITCH_PICKED_HELIC_FOSSIL] if $game_switches[SWITCH_PICKED_HELIC_FOSSIL]
fossils << :KABUTO if level < fossils_evolution_level_1 fossils << :KABUTO if level < fossils_evolution_level_1
fossils << :KABUTOPS if level >= fossils_evolution_level_1 fossils << :KABUTOPS if level >= fossils_evolution_level_1
@@ -147,7 +147,7 @@ def getFossilsGuyTeam(level)
fossils << :OMASTAR if level >= fossils_evolution_level_1 fossils << :OMASTAR if level >= fossils_evolution_level_1
end end
#S.S. Anne fossil # S.S. Anne fossil
if $game_switches[SWITCH_PICKED_LILEEP_FOSSIL] if $game_switches[SWITCH_PICKED_LILEEP_FOSSIL]
fossils << :ANORITH if level < fossils_evolution_level_1 fossils << :ANORITH if level < fossils_evolution_level_1
fossils << :ARMALDO if level >= fossils_evolution_level_1 fossils << :ARMALDO if level >= fossils_evolution_level_1
@@ -156,7 +156,7 @@ def getFossilsGuyTeam(level)
fossils << :LILEEP if level < fossils_evolution_level_1 fossils << :LILEEP if level < fossils_evolution_level_1
fossils << :CRADILY if level >= fossils_evolution_level_1 fossils << :CRADILY if level >= fossils_evolution_level_1
end end
#Celadon fossil # Celadon fossil
if $game_switches[SWITCH_PICKED_ARMOR_FOSSIL] if $game_switches[SWITCH_PICKED_ARMOR_FOSSIL]
fossils << :CRANIDOS if level < fossils_evolution_level_2 fossils << :CRANIDOS if level < fossils_evolution_level_2
fossils << :RAMPARDOS if level >= fossils_evolution_level_2 fossils << :RAMPARDOS if level >= fossils_evolution_level_2
@@ -207,10 +207,10 @@ end
def setDifficulty(index) def setDifficulty(index)
$Trainer.selected_difficulty = index $Trainer.selected_difficulty = index
case index case index
when 0 #EASY when 0 # EASY
$game_switches[SWITCH_GAME_DIFFICULTY_EASY] = true $game_switches[SWITCH_GAME_DIFFICULTY_EASY] = true
$game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false $game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false
when 1 #NORMAL when 1 # NORMAL
$game_switches[SWITCH_GAME_DIFFICULTY_EASY] = false $game_switches[SWITCH_GAME_DIFFICULTY_EASY] = false
$game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false $game_switches[SWITCH_GAME_DIFFICULTY_HARD] = false
when 2 # HARD when 2 # HARD
@@ -219,7 +219,7 @@ def setDifficulty(index)
end end
end end
#Old menu for changing difficulty - unused # Old menu for changing difficulty - unused
def change_game_difficulty(down_only = false) def change_game_difficulty(down_only = false)
message = "The game is currently on " + get_difficulty_text() + " difficulty." message = "The game is currently on " + get_difficulty_text() + " difficulty."
pbMessage(message) pbMessage(message)
@@ -357,10 +357,10 @@ def getGenericPokemonCryText(pokemonSpecies)
case pokemonSpecies case pokemonSpecies
when 25 when 25
return "Pika!" return "Pika!"
when 16, 17, 18, 21, 22, 144, 145, 146, 227, 417, 418, 372 #birds when 16, 17, 18, 21, 22, 144, 145, 146, 227, 417, 418, 372 # birds
return "Squawk!" return "Squawk!"
when 163, 164 when 163, 164
return "Hoot!" #owl return "Hoot!" # owl
else else
return "Guaugh!" return "Guaugh!"
end end
@@ -381,159 +381,159 @@ def obtainBadgeMessage(badgeName)
end end
KANTO_OUTDOOR_MAPS = [ KANTO_OUTDOOR_MAPS = [
78, #Route 1 78, # Route 1
185, #Secret Garden 185, # Secret Garden
86, #Route 2 86, # Route 2
90, #Route 2 (north) 90, # Route 2 (north)
655, #Hidden Forest 655, # Hidden Forest
40, #Viridian River 40, # Viridian River
490, #Route 3 490, # Route 3
106, #Route 4 106, # Route 4
12, #Route 5 12, # Route 5
16, #Route 6 16, # Route 6
413, # Route 7 413, # Route 7
409, # Route 8 409, # Route 8
351, #Route 9 (east) 351, # Route 9 (east)
495, #Route 9 (west) 495, # Route 9 (west)
154, #Route 10 154, # Route 10
155, #Route 11 155, # Route 11
159, #Route 12 159, # Route 12
440, #Route 14 440, # Route 14
444, #Route 15 444, # Route 15
712, #Creepy house 712, # Creepy house
438, #Route 16 438, # Route 16
146, #Route 17 146, # Route 17
517, #Route 18 517, # Route 18
437, #Route 13 437, # Route 13
57, # Route 19 57, # Route 19
227, #Route 19 (underwater) 227, # Route 19 (underwater)
56, #Route 19 (surf race) 56, # Route 19 (surf race)
58, #Route 20 58, # Route 20
480, #Route 20 underwater 1 480, # Route 20 underwater 1
228, #Route 20 underwater 2 228, # Route 20 underwater 2
171, #Route 22 171, # Route 22
8, #Route 24 8, # Route 24
9, #Route 25 9, # Route 25
143, #Route 23 143, # Route 23
145, #Route 26 145, # Route 26
147, #Route 27 147, # Route 27
58, #Route 21 58, # Route 21
#CITIES # CITIES
42, #Pallet Town 42, # Pallet Town
79, #Viridian City 79, # Viridian City
1, #Cerulean City 1, # Cerulean City
387, #Cerulean City (race) 387, # Cerulean City (race)
19, #Vermillion City 19, # Vermillion City
36, #S.S. Anne deck 36, # S.S. Anne deck
95, #Celadon city 95, # Celadon city
436, #Celadon city dept store (roof) 436, # Celadon city dept store (roof)
472, #Fuchsia city 472, # Fuchsia city
50, #Lavender town 50, # Lavender town
108, #Saffron city 108, # Saffron city
98, #Cinnabar island 98, # Cinnabar island
167, #Crimson city 167, # Crimson city
303, #indigo plateau 303, # indigo plateau
380, #Pewter city 380, # Pewter city
827, #Mt. Moon summit 827, # Mt. Moon summit
# #
# DUNGEONS # DUNGEONS
# #
102, #Mt. Moon 102, # Mt. Moon
103, #Mt. Moon 103, # Mt. Moon
105, #Mt. Moon 105, # Mt. Moon
496, #Mt Moon 496, # Mt Moon
104, #Mt. Moon 104, # Mt. Moon
494, #Mt. Moon Square 494, # Mt. Moon Square
140, #Diglett cave 140, # Diglett cave
398, #Diglett cave 398, # Diglett cave
399, #Diglett cave 399, # Diglett cave
349, #Rock tunnel 349, # Rock tunnel
350, #Rock tunnel 350, # Rock tunnel
512, #Rock tunnel (outdoor) 512, # Rock tunnel (outdoor)
445, #Safari Zone 1 445, # Safari Zone 1
484, #Safari Zone 2 484, # Safari Zone 2
485, #Safari Zone 3 485, # Safari Zone 3
486, #Safari Zone 4 486, # Safari Zone 4
487, #Safari Zone 5 487, # Safari Zone 5
491, #Viridian Forest 491, # Viridian Forest
529, #Mt. Silver entrance 529, # Mt. Silver entrance
777, #Mt. Silver outdoor 1 777, # Mt. Silver outdoor 1
781, #Mt. Silver outdoor 2 781, # Mt. Silver outdoor 2
782, #Mt. Silver 782, # Mt. Silver
783, #Mt. Silver summit 783, # Mt. Silver summit
400, #Pokemon Tower 400, # Pokemon Tower
401, #Pokemon Tower 401, # Pokemon Tower
402, #Pokemon Tower 402, # Pokemon Tower
403, #Pokemon Tower 403, # Pokemon Tower
467, #Pokemon Tower 467, # Pokemon Tower
468, #Pokemon Tower 468, # Pokemon Tower
469, #Pokemon Tower 469, # Pokemon Tower
] ]
KANTO_DARKNESS_STAGE_1 = [ KANTO_DARKNESS_STAGE_1 = [
50, #Lavender town 50, # Lavender town
409, # Route 8 409, # Route 8
351, #Route 9 (east) 351, # Route 9 (east)
495, #Route 9 (west) 495, # Route 9 (west)
154, #Route 10 154, # Route 10
108, #Saffron city 108, # Saffron city
1, #Cerulean City 1, # Cerulean City
387, #Cerulean City (race) 387, # Cerulean City (race)
106, #Route 4 106, # Route 4
8, #Route 24 8, # Route 24
9, #Route 25 9, # Route 25
400, #Pokemon Tower 400, # Pokemon Tower
401, #Pokemon Tower 401, # Pokemon Tower
402, #Pokemon Tower 402, # Pokemon Tower
403, #Pokemon Tower 403, # Pokemon Tower
467, #Pokemon Tower 467, # Pokemon Tower
468, #Pokemon Tower 468, # Pokemon Tower
469, #Pokemon Tower 469, # Pokemon Tower
159, #Route 12 159, # Route 12
349, #Rock tunnel 349, # Rock tunnel
350, #Rock tunnel 350, # Rock tunnel
512, #Rock tunnel (outdoor) 512, # Rock tunnel (outdoor)
12, #Route 5 12, # Route 5
] ]
KANTO_DARKNESS_STAGE_2 = [ KANTO_DARKNESS_STAGE_2 = [
95, #Celadon city 95, # Celadon city
436, #Celadon city dept store (roof) 436, # Celadon city dept store (roof)
143, #Route 23 143, # Route 23
167, #Crimson city 167, # Crimson city
413, # Route 7 413, # Route 7
438, #Route 16 438, # Route 16
146, #Route 17 146, # Route 17
106, #Route 4 106, # Route 4
19, #Vermillion City 19, # Vermillion City
36, #S.S. Anne deck 36, # S.S. Anne deck
16, #Route 6 16, # Route 6
437, #Route 13 437, # Route 13
155, #Route 11 155, # Route 11
140, #Diglett cave 140, # Diglett cave
398, #Diglett cave 398, # Diglett cave
399, #Diglett cave 399, # Diglett cave
] ]
KANTO_DARKNESS_STAGE_3 = [ KANTO_DARKNESS_STAGE_3 = [
472, #Fuchsia city 472, # Fuchsia city
445, #Safari Zone 1 445, # Safari Zone 1
484, #Safari Zone 2 484, # Safari Zone 2
485, #Safari Zone 3 485, # Safari Zone 3
486, #Safari Zone 4 486, # Safari Zone 4
487, #Safari Zone 5 487, # Safari Zone 5
444, #Route 15 444, # Route 15
440, #Route 14 440, # Route 14
712, #Creepy house 712, # Creepy house
517, #Route 18 517, # Route 18
57, # Route 19 57, # Route 19
227, #Route 19 (underwater) 227, # Route 19 (underwater)
56, #Route 19 (surf race) 56, # Route 19 (surf race)
58, #Route 20 58, # Route 20
480, #Route 20 underwater 1 480, # Route 20 underwater 1
228, #Route 20 underwater 2 228, # Route 20 underwater 2
98, #Cinnabar island 98, # Cinnabar island
58, #Route 21 58, # Route 21
827, #Mt. Moon summit 827, # Mt. Moon summit
] ]
KANTO_DARKNESS_STAGE_4 = KANTO_OUTDOOR_MAPS KANTO_DARKNESS_STAGE_4 = KANTO_OUTDOOR_MAPS
@@ -576,36 +576,36 @@ def isInMtMoon()
end end
def getMtMoonDirection() def getMtMoonDirection()
maps_east = [380, #Pewter city maps_east = [380, # Pewter city
490, #Route 3 490, # Route 3
303, #indigo plateau 303, # indigo plateau
145, #Route 26 145, # Route 26
147, #Route 27 147, # Route 27
] ]
maps_south = [ maps_south = [
8, #Route 24 8, # Route 24
9, #Route 25 9, # Route 25
143, #Route 23 143, # Route 23
167, #Crimson city 167, # Crimson city
] ]
maps_west = [ maps_west = [
106, #route 4 106, # route 4
1, #cerulean 1, # cerulean
495, #route 9 495, # route 9
351, #route 9 351, # route 9
10 #cerulean cape 10 # cerulean cape
] ]
return 2 if maps_south.include?($game_map.map_id) return 2 if maps_south.include?($game_map.map_id)
return 4 if maps_west.include?($game_map.map_id) return 4 if maps_west.include?($game_map.map_id)
return 6 if maps_east.include?($game_map.map_id) return 6 if maps_east.include?($game_map.map_id)
return 8 #north (most maps) return 8 # north (most maps)
end end
def has_species_or_fusion?(species, form = -1) def has_species_or_fusion?(species, form = -1)
return $Trainer.pokemon_party.any? { |p| p && p.isSpecies?(species) || p.isFusionOf(species) } return $Trainer.pokemon_party.any? { |p| p && p.isSpecies?(species) || p.isFusionOf(species) }
end end
#Solution: position of boulders [[x,y],[x,y],etc.] # Solution: position of boulders [[x,y],[x,y],etc.]
def validate_regirock_ice_puzzle(solution) def validate_regirock_ice_puzzle(solution)
for boulder_position in solution for boulder_position in solution
x = boulder_position[0] x = boulder_position[0]
@@ -655,7 +655,7 @@ end
def registeel_ice_press_switch(letter) def registeel_ice_press_switch(letter)
order = pbGet(1) order = pbGet(1)
solution = "ssBSBGG" #GGSBBss" solution = "ssBSBGG" # GGSBBss"
registeel_ice_reset_switches() if !order.is_a?(String) registeel_ice_reset_switches() if !order.is_a?(String)
order << letter order << letter
pbSet(1, order) pbSet(1, order)
@@ -713,7 +713,7 @@ def displayRandomizerErrorMessage()
Kernel.pbMessage(_INTL("You can do this on the top floor of Pokémon Centers.")) Kernel.pbMessage(_INTL("You can do this on the top floor of Pokémon Centers."))
end end
#ex:Game_Event.new # ex:Game_Event.new
# forced_sprites = {"1.133" => "a"} # forced_sprites = {"1.133" => "a"}
# setForcedAltSprites(forced_sprites) # setForcedAltSprites(forced_sprites)
# #
@@ -740,14 +740,14 @@ def setupStartingOutfit()
if gender == GENDER_FEMALE if gender == GENDER_FEMALE
$Trainer.unlock_clothes(DEFAULT_OUTFIT_FEMALE, true) $Trainer.unlock_clothes(DEFAULT_OUTFIT_FEMALE, true)
$Trainer.unlock_hat(DEFAULT_OUTFIT_FEMALE, true) $Trainer.unlock_hat(DEFAULT_OUTFIT_FEMALE, true)
$Trainer.hair = "3_" + DEFAULT_OUTFIT_FEMALE if !$Trainer.hair #when migrating old savefiles $Trainer.hair = "3_" + DEFAULT_OUTFIT_FEMALE if !$Trainer.hair # when migrating old savefiles
elsif gender == GENDER_MALE elsif gender == GENDER_MALE
$Trainer.unlock_clothes(DEFAULT_OUTFIT_MALE, true) $Trainer.unlock_clothes(DEFAULT_OUTFIT_MALE, true)
$Trainer.unlock_hat(DEFAULT_OUTFIT_MALE, true) $Trainer.unlock_hat(DEFAULT_OUTFIT_MALE, true)
echoln $Trainer.hair echoln $Trainer.hair
$Trainer.hair = ("3_" + DEFAULT_OUTFIT_MALE) if !$Trainer.hair #when migrating old savefiles $Trainer.hair = ("3_" + DEFAULT_OUTFIT_MALE) if !$Trainer.hair # when migrating old savefiles
echoln $Trainer.hair echoln $Trainer.hair
end end
$Trainer.unlock_hair(DEFAULT_OUTFIT_MALE, true) $Trainer.unlock_hair(DEFAULT_OUTFIT_MALE, true)
@@ -757,6 +757,7 @@ end
def give_date_specific_hats() def give_date_specific_hats()
current_date = Time.new current_date = Time.new
# Christmas
if (current_date.day == 24 || current_date.day == 25) && current_date.month == 12 if (current_date.day == 24 || current_date.day == 25) && current_date.month == 12
if !$Trainer.unlocked_hats.include?(HAT_SANTA) if !$Trainer.unlocked_hats.include?(HAT_SANTA)
pbCallBub(2, @event_id, true) pbCallBub(2, @event_id, true)
@@ -764,6 +765,15 @@ def give_date_specific_hats()
obtainHat(HAT_SANTA) obtainHat(HAT_SANTA)
end end
end end
# April's fool
if (current_date.day == 17 && current_date.month == 2)
if !$Trainer.unlocked_hats.include?(HAT_CLOWN)
pbCallBub(2, @event_id, true)
pbMessage("Hi! We're giving out this fun accessory for this special day. Enjoy!")
obtainHat(HAT_CLOWN)
end
end
end end
def playMeloettaBandMusic() def playMeloettaBandMusic()
@@ -936,13 +946,13 @@ def promptCaughtPokemonAction(pokemon)
[_INTL("Add to your party"), _INTL("Store to PC"),], 2) [_INTL("Add to your party"), _INTL("Store to PC"),], 2)
echoln ("command " + command.to_s) echoln ("command " + command.to_s)
case command case command
when 0 #SWAP when 0 # SWAP
if swapCaughtPokemon(pokemon) if swapCaughtPokemon(pokemon)
echoln pickedOption echoln pickedOption
pickedOption = true pickedOption = true
end end
else else
#STORE # STORE
pbStorePokemon(pokemon) pbStorePokemon(pokemon)
echoln pickedOption echoln pickedOption
pickedOption = true pickedOption = true
@@ -958,7 +968,7 @@ def promptKeepOrRelease(pokemon)
[_INTL("Release a party member"), _INTL("Release this #{pokemon.name}"),], 2) [_INTL("Release a party member"), _INTL("Release this #{pokemon.name}"),], 2)
echoln ("command " + command.to_s) echoln ("command " + command.to_s)
case command case command
when 0 #SWAP when 0 # SWAP
if swapReleaseCaughtPokemon(pokemon) if swapReleaseCaughtPokemon(pokemon)
pickedOption = true pickedOption = true
end end
@@ -968,7 +978,7 @@ def promptKeepOrRelease(pokemon)
end end
end end
#def pbChoosePokemon(variableNumber, nameVarNumber, ableProc = nil, allowIneligible = false) # def pbChoosePokemon(variableNumber, nameVarNumber, ableProc = nil, allowIneligible = false)
def swapCaughtPokemon(caughtPokemon) def swapCaughtPokemon(caughtPokemon)
pbChoosePokemon(1, 2, pbChoosePokemon(1, 2,
proc { |poke| proc { |poke|
@@ -1016,7 +1026,7 @@ end
def clear_all_images() def clear_all_images()
for i in 1..99 for i in 1..99
#echoln i.to_s + " : " + $game_screen.pictures[i].name # echoln i.to_s + " : " + $game_screen.pictures[i].name
$game_screen.pictures[i].erase $game_screen.pictures[i].erase
end end
end end
@@ -1159,14 +1169,14 @@ def obtainStarter(starterIndex = 0)
return GameData::Species.get(starter) return GameData::Species.get(starter)
end end
#body0 # body0
# head 1 # head 1
def setRivalStarter(starterIndex1, starterIndex2) def setRivalStarter(starterIndex1, starterIndex2)
starter1 = obtainStarter(starterIndex1) starter1 = obtainStarter(starterIndex1)
starter2 = obtainStarter(starterIndex2) starter2 = obtainStarter(starterIndex2)
ensureRandomHashInitialized() ensureRandomHashInitialized()
if $game_switches[SWITCH_RANDOM_WILD_TO_FUSION] #if fused starters, only take index 1 if $game_switches[SWITCH_RANDOM_WILD_TO_FUSION] # if fused starters, only take index 1
starter = obtainStarter(starterIndex1) starter = obtainStarter(starterIndex1)
else else
starter_body = starter1.id_number starter_body = starter1.id_number
@@ -1192,7 +1202,7 @@ def ensureRandomHashInitialized()
end end
end end
#Get difficulty for displaying in-game # Get difficulty for displaying in-game
def getDisplayDifficulty def getDisplayDifficulty
if $game_switches[SWITCH_GAME_DIFFICULTY_EASY] || $Trainer.lowest_difficulty <= 0 if $game_switches[SWITCH_GAME_DIFFICULTY_EASY] || $Trainer.lowest_difficulty <= 0
return getDisplayDifficultyFromIndex(0) return getDisplayDifficultyFromIndex(0)
@@ -1222,7 +1232,7 @@ def getGameModeFromIndex(index)
return "" return ""
end end
#time in seconds # time in seconds
def idleHatEvent(hatId, time, switchToActivate = nil) def idleHatEvent(hatId, time, switchToActivate = nil)
map = $game_map.map_id map = $game_map.map_id
i = 0 i = 0
@@ -1238,7 +1248,7 @@ def idleHatEvent(hatId, time, switchToActivate = nil)
obtainHat(hatId) obtainHat(hatId)
end end
#Necessary dor setting the various events within the pokemart map, uses the numbers as wondertrade # Necessary dor setting the various events within the pokemart map, uses the numbers as wondertrade
def get_city_numerical_id(city_sym) def get_city_numerical_id(city_sym)
current_city_numerical = { current_city_numerical = {
:PEWTER => 1, :PEWTER => 1,
@@ -1269,7 +1279,7 @@ end
POKEMART_MAP_ID = 357 POKEMART_MAP_ID = 357
POKEMART_DOOR_POS = [12, 12] POKEMART_DOOR_POS = [12, 12]
#city -> Symbol # city -> Symbol
def enter_pokemart(city) def enter_pokemart(city)
pbSet(VAR_CURRENT_MART, city) pbSet(VAR_CURRENT_MART, city)
pbSet(VAR_CURRENT_CITY_NUMERICAL_ID, get_city_numerical_id(city)) pbSet(VAR_CURRENT_CITY_NUMERICAL_ID, get_city_numerical_id(city))
@@ -1290,17 +1300,17 @@ def exit_pokemart()
:CERULEAN => [1, 19, 22], :CERULEAN => [1, 19, 22],
:VERMILLION => [19, 32, 13], :VERMILLION => [19, 32, 13],
:LAVENDER => [50, 20, 23], :LAVENDER => [50, 20, 23],
:CELADON => [95, 18, 15], #not a real pokemart :CELADON => [95, 18, 15], # not a real pokemart
:FUCHSIA => [472, 7, 17], :FUCHSIA => [472, 7, 17],
:SAFFRON => [108, 53, 24], :SAFFRON => [108, 53, 24],
:CINNABAR => [98, 30, 30], :CINNABAR => [98, 30, 30],
:CRIMSON => [167, 21, 36], :CRIMSON => [167, 21, 36],
:GOLDENROD => [237, 36, 33], #not a real pokemart :GOLDENROD => [237, 36, 33], # not a real pokemart
:AZALEA => [278, 34, 17], :AZALEA => [278, 34, 17],
:AZALEA_FLOODED => [338, 34, 17], :AZALEA_FLOODED => [338, 34, 17],
:VIOLET => [230, 20, 31], :VIOLET => [230, 20, 31],
:BLACKTHORN => [329, 16, 36], :BLACKTHORN => [329, 16, 36],
:MAHOGANY => [631, 19, 19], #not a real pokemart :MAHOGANY => [631, 19, 19], # not a real pokemart
:ECRUTEAK => [359, 46, 38], :ECRUTEAK => [359, 46, 38],
:OLIVINE => [138, 33, 23], :OLIVINE => [138, 33, 23],
:CIANWOOD => [709.8, 46], :CIANWOOD => [709.8, 46],
@@ -1438,11 +1448,11 @@ def calculate_pokemon_weight(pokemon, nerf = 0)
return weight.round(2) # Round to 2 decimal places return weight.round(2) # Round to 2 decimal places
end end
#nerf: remove x kg from each generated pokemon # nerf: remove x kg from each generated pokemon
def generate_weight_contest_entries(species, level, resultsVariable, nerf = 0) def generate_weight_contest_entries(species, level, resultsVariable, nerf = 0)
#echoln "Generating Pokemon" # echoln "Generating Pokemon"
pokemon1 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level) pokemon1 = pbGenerateWildPokemon(species, level) # Pokemon.new(species,level)
pokemon2 = pbGenerateWildPokemon(species, level) #Pokemon.new(species,level) pokemon2 = pbGenerateWildPokemon(species, level) # Pokemon.new(species,level)
new_weights = [] new_weights = []
new_weights << calculate_pokemon_weight(pokemon1, nerf) new_weights << calculate_pokemon_weight(pokemon1, nerf)
new_weights << calculate_pokemon_weight(pokemon2, nerf) new_weights << calculate_pokemon_weight(pokemon2, nerf)
@@ -1452,7 +1462,7 @@ def generate_weight_contest_entries(species, level, resultsVariable, nerf = 0)
end end
#todo: implement # todo: implement
def getMappedKeyFor(internalKey) def getMappedKeyFor(internalKey)
keybinding_fileName = "keybindings.mkxp1" keybinding_fileName = "keybindings.mkxp1"
@@ -1460,10 +1470,10 @@ def getMappedKeyFor(internalKey)
parse_keybindings(path) parse_keybindings(path)
#echoln Keybindings.new(path).bindings # echoln Keybindings.new(path).bindings
end end
#if need to play animation from event route # if need to play animation from event route
def playAnimation(animationId, x, y) def playAnimation(animationId, x, y)
return if !$scene.is_a?(Scene_Map) return if !$scene.is_a?(Scene_Map)
$scene.spriteset.addUserAnimation(animationId, x, y, true) $scene.spriteset.addUserAnimation(animationId, x, y, true)
@@ -1478,7 +1488,7 @@ def playCry(pokemonSpeciesSymbol)
GameData::Species.play_cry_from_species(species) GameData::Species.play_cry_from_species(species)
end end
#chance: out of 100 # chance: out of 100
def lilypadEncounter(pokemon, minLevel, maxLevel, chance = 10) def lilypadEncounter(pokemon, minLevel, maxLevel, chance = 10)
minLevel, maxLevel = [minLevel, maxLevel].minmax minLevel, maxLevel = [minLevel, maxLevel].minmax
level = rand(minLevel..maxLevel) level = rand(minLevel..maxLevel)
@@ -1519,7 +1529,7 @@ def getHiddenPowerName(pokemon)
return PBTypes.getName(hiddenPowerType) return PBTypes.getName(hiddenPowerType)
end end
#Returns if the current map is an outdoor map # Returns if the current map is an outdoor map
def isOutdoor() def isOutdoor()
current_map = $game_map.map_id current_map = $game_map.map_id
map_metadata = GameData::MapMetadata.try_get(current_map) map_metadata = GameData::MapMetadata.try_get(current_map)
@@ -1598,47 +1608,47 @@ SWITCH_GOT_ROCK_CLIMB = 661
SWITCH_GOT_WATERFALL = 388 SWITCH_GOT_WATERFALL = 388
def fixMissedHMs() def fixMissedHMs()
#Flash # Flash
if $PokemonBag.pbQuantity(:HM08) < 1 && $PokemonGlobal.questRewardsObtained.include?(:HM08) if $PokemonBag.pbQuantity(:HM08) < 1 && $PokemonGlobal.questRewardsObtained.include?(:HM08)
pbReceiveItem(:HM08) pbReceiveItem(:HM08)
end end
#Cut # Cut
if $PokemonBag.pbQuantity(:HM01) < 1 && $game_switches[SWITCH_SS_ANNE_DEPARTED] if $PokemonBag.pbQuantity(:HM01) < 1 && $game_switches[SWITCH_SS_ANNE_DEPARTED]
pbReceiveItem(:HM01) pbReceiveItem(:HM01)
end end
#Strength # Strength
if $PokemonBag.pbQuantity(:HM04) < 1 && $game_switches[SWITCH_SNORLAX_GONE_ROUTE_12] if $PokemonBag.pbQuantity(:HM04) < 1 && $game_switches[SWITCH_SNORLAX_GONE_ROUTE_12]
pbReceiveItem(:HM04) pbReceiveItem(:HM04)
end end
#Surf # Surf
if $PokemonBag.pbQuantity(:HM03) < 1 && $game_self_switches[[107, 1, "A"]] if $PokemonBag.pbQuantity(:HM03) < 1 && $game_self_switches[[107, 1, "A"]]
pbReceiveItem(:HM03) pbReceiveItem(:HM03)
end end
#Teleport # Teleport
if $PokemonBag.pbQuantity(:HM07) < 1 && $game_switches[SWITCH_TELEPORT_NPC] if $PokemonBag.pbQuantity(:HM07) < 1 && $game_switches[SWITCH_TELEPORT_NPC]
pbReceiveItem(:HM07) pbReceiveItem(:HM07)
end end
#Fly # Fly
if $PokemonBag.pbQuantity(:HM02) < 1 && $game_self_switches[[439, 1, "B"]] if $PokemonBag.pbQuantity(:HM02) < 1 && $game_self_switches[[439, 1, "B"]]
pbReceiveItem(:HM02) pbReceiveItem(:HM02)
end end
#Waterfall # Waterfall
if $PokemonBag.pbQuantity(:HM05) < 1 && $game_switches[SWITCH_GOT_WATERFALL] if $PokemonBag.pbQuantity(:HM05) < 1 && $game_switches[SWITCH_GOT_WATERFALL]
pbReceiveItem(:HM05) pbReceiveItem(:HM05)
end end
#Dive # Dive
if $PokemonBag.pbQuantity(:HM06) < 1 && $game_switches[SWITCH_GOT_DIVE] if $PokemonBag.pbQuantity(:HM06) < 1 && $game_switches[SWITCH_GOT_DIVE]
pbReceiveItem(:HM06) pbReceiveItem(:HM06)
end end
#Rock Climb # Rock Climb
if $PokemonBag.pbQuantity(:HM10) < 1 && $game_switches[SWITCH_GOT_ROCK_CLIMB] if $PokemonBag.pbQuantity(:HM10) < 1 && $game_switches[SWITCH_GOT_ROCK_CLIMB]
pbReceiveItem(:HM10) pbReceiveItem(:HM10)
end end
@@ -1674,7 +1684,7 @@ end
def fix_broken_TR_quests() def fix_broken_TR_quests()
for trainer_quest in $Trainer.quests for trainer_quest in $Trainer.quests
if trainer_quest.id == 0 #tr quests were all set to ID 0 instead of their real ID in v 6.4.0 if trainer_quest.id == 0 # tr quests were all set to ID 0 instead of their real ID in v 6.4.0
for rocket_quest_id in TR_QUESTS.keys for rocket_quest_id in TR_QUESTS.keys
rocket_quest = TR_QUESTS[rocket_quest_id] rocket_quest = TR_QUESTS[rocket_quest_id]
next if !rocket_quest next if !rocket_quest

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -176,6 +176,12 @@
"tags": "headband,pokemon-clefairy,pokemon-cleffa,pokemon-clefable", "tags": "headband,pokemon-clefairy,pokemon-cleffa,pokemon-clefable",
"howToGet": "gym reward" "howToGet": "gym reward"
}, },
{
"id": "clownnose",
"name": "Clown Nose",
"price": 1500,
"tags": "mask,pokemon-mimejr,pokemon-mrmime,"
},
{ {
"id": "cloak", "id": "cloak",
"name": "Cloak Hood", "name": "Cloak Hood",
@@ -250,6 +256,12 @@
"tags": "hat", "tags": "hat",
"howToGet": "type trainer" "howToGet": "type trainer"
}, },
{
"id": "dragonitehorns",
"name": "Dragonite Horns",
"price": 4500,
"tags": "hat,pokemon-dratini,pokemon-dragonair,pokemon-dragonite,"
},
{ {
"id": "drifloon", "id": "drifloon",
"name": "Drifloon Hat", "name": "Drifloon Hat",
@@ -1013,7 +1025,7 @@
"description": "A warm, snug stocking cap worn during a festive holiday season.", "description": "A warm, snug stocking cap worn during a festive holiday season.",
"done": "yes", "done": "yes",
"price": 25000, "price": 25000,
"tags": "hat," "tags": "hat,pokemon-delibird,"
}, },
{ {
"id": "seacaptain", "id": "seacaptain",

View File

@@ -1,4 +1,3 @@
1739029866 1739807996
1739029866 1739807997
1739029866 1739807997
1739029871

View File

@@ -1,79 +1,273 @@
Graphics/CustomBattlers/spritesheets/spritesheets_base/4.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/16.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/475.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/250.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/250/250.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/420/420.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/25/25.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/135.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/209.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/209/209a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/232/232.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/47/47b.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/227/227.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/137/137.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/47/47a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/47/47.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/248.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/449.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/449/449.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/137/137a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/222/222a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/43.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/301.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/114.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/114/114.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/294/294.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/25.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/199.png Graphics/CustomBattlers/spritesheets/spritesheets_base/199.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/321.png Graphics/CustomBattlers/spritesheets/spritesheets_base/222.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/321/321.png Graphics/CustomBattlers/spritesheets/spritesheets_base/72.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/451/451.png Graphics/CustomBattlers/spritesheets/spritesheets_base/325.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/287.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/325/325.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/374.png Graphics/CustomBattlers/spritesheets/spritesheets_base/501.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/374/374b.png Graphics/CustomBattlers/spritesheets/spritesheets_base/41.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/233/233.png Graphics/CustomBattlers/spritesheets/spritesheets_base/35.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/161/161.png Graphics/CustomBattlers/spritesheets/spritesheets_base/347.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/260/260.png Graphics/CustomBattlers/spritesheets/spritesheets_base/25.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/240.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/25/25.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/46.png Graphics/CustomBattlers/spritesheets/spritesheets_base/98.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/46/46.png Graphics/CustomBattlers/spritesheets/spritesheets_base/252.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/418.png Graphics/CustomBattlers/spritesheets/spritesheets_base/313.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/412.png Graphics/CustomBattlers/spritesheets/spritesheets_base/175.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/412/412.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/175/175.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/315.png Graphics/CustomBattlers/spritesheets/spritesheets_base/320.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/371.png Graphics/CustomBattlers/spritesheets/spritesheets_base/232.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/371/371.png Graphics/CustomBattlers/spritesheets/spritesheets_base/391.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/386.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/391/391.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/1.png Graphics/CustomBattlers/spritesheets/spritesheets_base/47.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1.png Graphics/CustomBattlers/spritesheets/spritesheets_base/351.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/254.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/351/351.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/255.png Graphics/CustomBattlers/spritesheets/spritesheets_base/166.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/170.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/398.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/398/398.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/413.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/263.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/263/263.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/242.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/411.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/411/411.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/19.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/163.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/255.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/34.png Graphics/CustomBattlers/spritesheets/spritesheets_base/34.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/34/34.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/34/34.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/163/163.png Graphics/CustomBattlers/spritesheets/spritesheets_base/287.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/233/233.png Graphics/CustomBattlers/spritesheets/spritesheets_base/1.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/185.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/344.png Graphics/CustomBattlers/spritesheets/spritesheets_base/6.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/344/344.png Graphics/CustomBattlers/spritesheets/spritesheets_base/223.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/184.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/223/223.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/12.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/61.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/61/61.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/427.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/100.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/319.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/402.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/402/402.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/46.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/321.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/199/199.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/96.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/130.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/17.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/17/17.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/385.png Graphics/CustomBattlers/spritesheets/spritesheets_base/385.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/424.png Graphics/CustomBattlers/spritesheets/spritesheets_base/56.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/339.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/117/117.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/339/339.png Graphics/CustomBattlers/spritesheets/spritesheets_base/211.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/83.png Graphics/CustomBattlers/spritesheets/spritesheets_base/188.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/468.png Graphics/CustomBattlers/spritesheets/spritesheets_custom/188/188.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/382.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/181/181.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/285.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/226.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/226/226.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/120.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/241.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/102.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/410.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/126.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/126/126.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/122/122c.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/94.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/421/421.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/258/258.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/258.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/454.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/370.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/370/370a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/417.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/220.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/220/220.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/296.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/390.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/390/390.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/452.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/305.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/189.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/189/189.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/97.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/397.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/421.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/75.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/62.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/62/62.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/27.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/240.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/240/240a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/492.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/489.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/489/489.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/343.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/462.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/462/462.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/259.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/126/126b.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/303.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/303/303.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/112.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/53.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/53/53.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/251.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/251/251.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/374.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/342.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/342/342.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/132.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/39.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/39/39.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/439.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/255.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/289.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/466.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/466/466.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/29.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/140.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/140/140.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/460.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/198.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/198/198.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/307.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/228.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/225.png Graphics/CustomBattlers/spritesheets/spritesheets_base/225.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/225/225.png Graphics/CustomBattlers/spritesheets/spritesheets_base/203.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/203/203.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/4.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/330.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/49.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/446.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/446/446.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/256/256.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/160.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/265.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/265/265.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/384.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/384/384.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/164.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/310.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/286.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/286/286.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/178.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/11.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/175/175b.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/3.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/82.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/82/82.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/5.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/5/5.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/7.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/173.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/173/173.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/233.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/233/233.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/335.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/333.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/333/333.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/33/33a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/232/232.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/470.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/10.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/13/13.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/10/10.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/279.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/163.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/163/163.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/422.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/13.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/108.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/218.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/218/218.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/18.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/346.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/346/346.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/428.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/207.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/207/207.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/294.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/294/294.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/468.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/171.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/171/171.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/77.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/227/227.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/228/228.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/136/136.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/137/137.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/138/138.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/134.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/358/358.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/290.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/290/290a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/341.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/196.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/196/196.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/444.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/40.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/40/40.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/165.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/363.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/339.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/339/339a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/276.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/152.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/152/152.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/295.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/295/295.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/231.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/236.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/238.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/8/8a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/27/27b.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/70/70.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/101/101.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/1/1e.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/74/74.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/41/41a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/14/14.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/15/15c.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/35/35.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/10/10a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/100/100.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/174/174.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/104/104.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/13/13a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/19/19.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/54/54a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/79/79.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/109/109.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/11/11a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/23/23.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/81/81.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/102/102.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/120/120c.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/93/93.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/4/4.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/72/72.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/80/80.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/127/127.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/212/212.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/67/67a.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/7/7.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/42/42.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/93/93c.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/96/96.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/36/36a.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/91.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/81.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/65.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/204.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/204/204.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/280.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/241/241.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/113.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/260.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/260/260.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/266.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/363/363.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/407.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/43.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/43/43.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/245.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/429.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/312.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/312/312.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/449.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/449/449.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/412.png
Graphics/CustomBattlers/spritesheets/spritesheets_base/392.png
Graphics/CustomBattlers/spritesheets/spritesheets_custom/392/392a.png

BIN
Graphics/.DS_Store vendored

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 223 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 301 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 466 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 290 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 B

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 598 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

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