forked from pagefaultgames/pokerogue
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature] Add evil teams assets (pagefaultgames#1577)
* Fix tinted caught icon false positive * Remove unused import * Rename and optimize * Block comment * Draft of evil team grunt pokemon pools * Add graphics and music * Add grunt spawn logic * Add Giovanni * Add team leader graphics Giovanni and Ghetsis already have sprites, so they do not need added. * Add teams for other evil team bosses * Fix some typos and change hp bars to 2/2/2 * Fix sprites and add random team boss * Add forced grunt encounter and update dialogue * Update locales * also lint en trainers * More merge conflicts * Deleted some duplicate images * Correctly renamed the grunt files * Forgot about team rocket * New Magma Sprites * Adjusted the trimming. Now they dont have as huge of a shadow bbelow them * Fix grunt sprites * Add real dialogue * German Localization of the Dialogue * Changes * Tweak waves grunts spawn on * Fix some typos in dialogue * Y is canon * Disable evil team spawns * Fix another merge conflict --------- Co-authored-by: Madmadness65 <[email protected]> Co-authored-by: Jannik Tappert <[email protected]>
- Loading branch information
3 people
authored
Jun 9, 2024
1 parent
7ce209d
commit f6ad30b
Showing
44 changed files
with
1,689 additions
and
4 deletions.
There are no files selected for viewing
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "aqua_grunt_f.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 71, | ||
| "h": 71 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 22, | ||
| "y": 8, | ||
| "w": 36, | ||
| "h": 71 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 36, | ||
| "h": 71 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:6db25cb5753163d19bca8e2db45849ae:7d8f51509862bfdf8a78bf42dd0005cd:af0aa9494be37941522487032b556989$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "aqua_grunt_m.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 73, | ||
| "h": 73 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 17, | ||
| "y": 6, | ||
| "w": 46, | ||
| "h": 73 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 46, | ||
| "h": 73 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:efd07ff3ed1e610150a4b8ca18974343:d9b85b9eb11182e9e4669e2bd8b08694:72b7b50231708a9486d5f315824e4df1$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "archie.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 21, | ||
| "y": 0, | ||
| "w": 42, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 42, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:bfa7fdd7b6ac9be68dc9dc562fb8339f:06f87a279450b21b19294ba956b69c26:4b7980be4e3ac1d20c9eaf970913ec63$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "cyrus.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 15, | ||
| "y": 0, | ||
| "w": 48, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 48, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:5fc65535a23867fca7511cc9d7fc15b3:f328e97821f4faffcbca155cc2c5dc2c:55da82f1e1919212896c9c96b682cbd1$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "flare_grunt_f.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 31, | ||
| "y": 0, | ||
| "w": 23, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 23, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:c30bf82452209a923f4becf13d275a9a:a6355b09f92c9c0388d0b919010f587f:0638dbf213f8a974eb5af76eb1e5ddeb$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "flare_grunt_m.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 77, | ||
| "h": 77 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 24, | ||
| "y": 2, | ||
| "w": 31, | ||
| "h": 77 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 31, | ||
| "h": 77 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:a26606e70778f88a1a7053b2f2420dde:84abf0d0f6bc90c6a60f660567b2d641:adc35a4070bac9fe828c2605a3b15744$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "galactic_grunt_f.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 68, | ||
| "h": 68 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 10, | ||
| "y": 11, | ||
| "w": 57, | ||
| "h": 68 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 57, | ||
| "h": 68 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:3012867f03f02c4ee67a8ab3ad5a000e:77a5f60f1adc158664b3b2ee17bf30fe:7e8259b5177c0a76e5d02d6bdc66affe$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "galactic_grunt_m.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 73, | ||
| "h": 73 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 20, | ||
| "y": 6, | ||
| "w": 37, | ||
| "h": 73 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 37, | ||
| "h": 73 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:856b85bb5d7a1ea2e7a76708ebf82d21:1687dff972369c6248e4aa5b0795fe62:259dd316440c335df5dc6008166d69ca$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| { | ||
| "textures": [ | ||
| { | ||
| "image": "lysandre.png", | ||
| "format": "RGBA8888", | ||
| "size": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "scale": 1, | ||
| "frames": [ | ||
| { | ||
| "filename": "0001.png", | ||
| "rotated": false, | ||
| "trimmed": false, | ||
| "sourceSize": { | ||
| "w": 80, | ||
| "h": 80 | ||
| }, | ||
| "spriteSourceSize": { | ||
| "x": 14, | ||
| "y": 0, | ||
| "w": 52, | ||
| "h": 80 | ||
| }, | ||
| "frame": { | ||
| "x": 0, | ||
| "y": 0, | ||
| "w": 52, | ||
| "h": 80 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ], | ||
| "meta": { | ||
| "app": "https://www.codeandweb.com/texturepacker", | ||
| "version": "3.0", | ||
| "smartupdate": "$TexturePacker:SmartUpdate:6b887c8bab74885a1b05f2b382759db6:ba102d9d25ddd794a3a17f029b971daf:e6066149f6ec4ccb9fc28faea3d64a7f$" | ||
| } | ||
| } |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.