mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
fixes hats
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,7 +1,6 @@
|
|||||||
Graphics/CustomBattlers/local_sprites/*
|
Graphics/CustomBattlers/local_sprites/*
|
||||||
Graphics/Pokemon/FusionIcons/*
|
|
||||||
Graphics/Battlers/Shiny/*
|
Graphics/Battlers/Shiny/*
|
||||||
|
Graphics/Pokemon/FusionIcons/*
|
||||||
Graphics/CustomBattlers/spritesheets/*
|
Graphics/CustomBattlers/spritesheets/*
|
||||||
Graphics/CustomBattlers/*
|
Graphics/CustomBattlers/*
|
||||||
Data/sprites/*
|
Data/sprites/*
|
||||||
|
|||||||
BIN
Data/.DS_Store
vendored
BIN
Data/.DS_Store
vendored
Binary file not shown.
Binary file not shown.
Submodule Data/Scripts updated: 8db78c0f91...70d09393cb
Binary file not shown.
@@ -89,12 +89,6 @@
|
|||||||
"tags": "celadon",
|
"tags": "celadon",
|
||||||
"howToGet": "city exclusive outfit"
|
"howToGet": "city exclusive outfit"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "breloomcap",
|
|
||||||
"name": "Breloom Cap",
|
|
||||||
"price": 8000,
|
|
||||||
"tags": "pokemon-shroomish,pokemon-breloom"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "bughakama",
|
"id": "bughakama",
|
||||||
"name": "Bug Hakama Dress",
|
"name": "Bug Hakama Dress",
|
||||||
@@ -551,13 +545,6 @@
|
|||||||
"tags": "azalea,",
|
"tags": "azalea,",
|
||||||
"howToGet": "city-exclusive outfit"
|
"howToGet": "city-exclusive outfit"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "pumpkaboohelmet",
|
|
||||||
"name": "Pumpkaboo Helmet",
|
|
||||||
"description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
|
|
||||||
"price": 1031,
|
|
||||||
"tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "Ramos",
|
"id": "Ramos",
|
||||||
"name": "Gardener Outfit",
|
"name": "Gardener Outfit",
|
||||||
@@ -658,13 +645,6 @@
|
|||||||
"price": 12000,
|
"price": 12000,
|
||||||
"tags": "pokemon-slowpoke,pokemon-slowbro,pokemon-slowking"
|
"tags": "pokemon-slowpoke,pokemon-slowbro,pokemon-slowking"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"id": "sneaselfeather",
|
|
||||||
"name": "Sharp Feather",
|
|
||||||
"description": "A feather worn on the head that ressembles the ear of a Sneasel.",
|
|
||||||
"price": 4000,
|
|
||||||
"tags": "pokemon-sneasel,pokemon-weavile,"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"id": "SnowCoatFemale",
|
"id": "SnowCoatFemale",
|
||||||
"name": "Blue Snow Coat (F)",
|
"name": "Blue Snow Coat (F)",
|
||||||
|
|||||||
@@ -95,6 +95,12 @@
|
|||||||
"tags": "headband,",
|
"tags": "headband,",
|
||||||
"howToGet": "reward for hatching x number of eggs? for getting every baby mon?"
|
"howToGet": "reward for hatching x number of eggs? for getting every baby mon?"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "breloomcap",
|
||||||
|
"name": "Breloom Cap",
|
||||||
|
"price": 8000,
|
||||||
|
"tags": "pokemon-shroomish,pokemon-breloom"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "brendanORAS",
|
"id": "brendanORAS",
|
||||||
"name": "Sporty Cap",
|
"name": "Sporty Cap",
|
||||||
@@ -1031,6 +1037,13 @@
|
|||||||
"tags": "mask,pokemon-glalie,type-ice,weather-cold,",
|
"tags": "mask,pokemon-glalie,type-ice,weather-cold,",
|
||||||
"howToGet": "gym reward"
|
"howToGet": "gym reward"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "pumpkaboohelmet",
|
||||||
|
"name": "Pumpkaboo Helmet",
|
||||||
|
"description": "A hollowed out pumpkin that looks like a Pumpkaboo!",
|
||||||
|
"price": 1031,
|
||||||
|
"tags": "pokemon-pumpkaboo,pokemon-gourgeist,"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "Ramos",
|
"id": "Ramos",
|
||||||
"name": "Green Flat cap",
|
"name": "Green Flat cap",
|
||||||
@@ -1287,6 +1300,13 @@
|
|||||||
"price": 15000,
|
"price": 15000,
|
||||||
"tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder"
|
"tags": "hat,pokemon-slowbro,pokemon-slowking,pokemon-shellder"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"id": "sneaselfeather",
|
||||||
|
"name": "Sharp Feather",
|
||||||
|
"description": "A feather worn on the head that ressembles the ear of a Sneasel.",
|
||||||
|
"price": 4000,
|
||||||
|
"tags": "pokemon-sneasel,pokemon-weavile,"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"id": "snorlaxhat",
|
"id": "snorlaxhat",
|
||||||
"name": "Snorlax Hat",
|
"name": "Snorlax Hat",
|
||||||
|
|||||||
37557
Data/pokedex/dex.json
37557
Data/pokedex/dex.json
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB After Width: | Height: | Size: 4.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
Reference in New Issue
Block a user