diff --git a/.all-contributorsrc b/.all-contributorsrc index e2bb282730..f185d54866 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -597,6 +597,15 @@ "contributions": [ "design" ] + }, + { + "login": "ostomachion", + "name": "Josh Hufford", + "avatar_url": "https://avatars.githubusercontent.com/u/8021794?v=4", + "profile": "http://hufford.io", + "contributions": [ + "code" + ] } ], "contributorsPerLine": 7, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e877940643..49517cfff3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -61,8 +61,11 @@ If you have read all of this and still need help, feel free to start a thread in - If you're new to git and GitHub, [Team Aqua's Asset Repo](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/) has a [guide on forking and cloning the repository](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/wiki/The-Basics-of-GitHub). Make sure you have a [local copy](INSTALL.md) of `pokeemerald-expansion`. - Make sure your contribution is in [scope](docs/team_procedures/scope.md) - if it is not clear if something is in scope, you can start a discussion thread in the [#pr-discussions](https://discord.com/channels/419213663107416084/1102784418369785948) channel of the [the RHH Discord Server!](https://discord.gg/6CzjAG6GZk). - Choose a branch to contribute your PR to: - - **`master`**: Fixes for bugs that are currently present in the `master` branch. - - **`upcoming`**: All other pull requests. + - **`master`**: If your PR contains meets any of the following criteria, it should go to `master`: + - Fixes for bugs that are currently present in the `master` branch + - PR is only documentation updates / changes + - PR is only tests + - **`upcoming`**: All other pull requests go to `upcoming`. - Create a new branch from the most recent version of the branch you've chosen. - If your contribution introduces, removes, or changes a lot of existing code, we reccomend getting a maintainer to agree to review it before you start on the work! We have a table that lists all [current maintainers and their areas of expertise](#maintainers). diff --git a/CREDITS.md b/CREDITS.md index 38d03ba139..da5324b2b8 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -85,6 +85,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d Jaizu
Jaizu
💻 Kildemal
Kildemal
💻 Skeli
Skeli
🎨 + Josh Hufford
Josh Hufford
💻 diff --git a/graphics/items/icon_palettes/absorb_bulb.pal b/graphics/items/icon_palettes/absorb_bulb.pal index 8551b917b1..421325bf5a 100755 --- a/graphics/items/icon_palettes/absorb_bulb.pal +++ b/graphics/items/icon_palettes/absorb_bulb.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -128 0 255 -49 49 49 -222 222 115 -189 140 66 -156 99 41 -181 173 115 -132 74 33 -214 173 115 -90 66 41 +211 211 211 +48 48 48 +216 216 112 +184 136 64 +152 96 40 +176 168 112 +128 72 32 +208 168 112 +88 64 40 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/balm_mushroom.pal b/graphics/items/icon_palettes/balm_mushroom.pal index 7802b4b8d5..d26d7dbd5f 100644 --- a/graphics/items/icon_palettes/balm_mushroom.pal +++ b/graphics/items/icon_palettes/balm_mushroom.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -128 248 248 -208 232 208 -152 200 152 +211 211 211 +88 88 88 +240 192 96 +232 152 40 248 248 80 -224 200 8 -248 200 96 -240 152 40 48 48 48 -0 0 0 +216 192 8 +152 192 152 +200 224 200 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/big_root.pal b/graphics/items/icon_palettes/big_root.pal index a93aa2ed77..bfc79af68a 100644 --- a/graphics/items/icon_palettes/big_root.pal +++ b/graphics/items/icon_palettes/big_root.pal @@ -1,13 +1,13 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -126 77 11 -168 117 46 -220 194 117 -203 151 77 -247 220 151 +211 211 211 +48 48 48 +136 88 16 +176 128 56 +224 200 128 +208 160 88 +248 224 160 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/thick_club.pal b/graphics/items/icon_palettes/bone.pal old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icon_palettes/thick_club.pal rename to graphics/items/icon_palettes/bone.pal diff --git a/graphics/items/icon_palettes/bottle_cap.pal b/graphics/items/icon_palettes/bottle_cap.pal index 412b2967ba..97abe537b3 100644 --- a/graphics/items/icon_palettes/bottle_cap.pal +++ b/graphics/items/icon_palettes/bottle_cap.pal @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +240 240 240 diff --git a/graphics/items/icon_palettes/bug_gem.pal b/graphics/items/icon_palettes/bug_gem.pal index 4e8af47265..4bc9724350 100644 --- a/graphics/items/icon_palettes/bug_gem.pal +++ b/graphics/items/icon_palettes/bug_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 184 216 104 224 232 176 152 184 32 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/casteliacone.pal b/graphics/items/icon_palettes/casteliacone.pal index 438dff0441..2d105d3fd5 100644 --- a/graphics/items/icon_palettes/casteliacone.pal +++ b/graphics/items/icon_palettes/casteliacone.pal @@ -1,16 +1,16 @@ JASC-PAL 0100 16 -120 192 168 +211 211 211 +88 88 88 248 248 248 -180 224 240 -96 192 224 -16 152 200 -248 208 72 -208 176 72 -184 112 0 +176 216 232 +96 184 216 48 48 48 -0 0 0 +16 152 192 +248 200 72 +200 168 72 +176 112 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/choice_specs.pal b/graphics/items/icon_palettes/choice_specs.pal index 95c5ebab30..93725cd13d 100644 --- a/graphics/items/icon_palettes/choice_specs.pal +++ b/graphics/items/icon_palettes/choice_specs.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -255 0 128 -117 117 117 -39 39 39 -229 185 54 -212 117 18 -247 238 203 -159 93 11 -247 247 77 -247 126 54 -238 185 77 -238 18 18 +211 211 211 +128 128 128 +48 48 48 +232 192 64 +216 128 24 +248 240 208 +168 104 16 +248 248 88 +248 136 64 +240 192 88 +240 24 24 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/comet_shard.pal b/graphics/items/icon_palettes/comet_shard.pal index fcd9d28040..582dbf2270 100644 --- a/graphics/items/icon_palettes/comet_shard.pal +++ b/graphics/items/icon_palettes/comet_shard.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -120 192 168 -240 248 248 -200 224 232 -128 176 232 -96 144 224 -72 80 184 +211 211 211 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +128 168 224 +96 136 216 +192 216 224 +72 80 176 +232 248 240 64 56 120 -48 48 48 -0 0 0 -0 0 0 -0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/cover_fossil.pal b/graphics/items/icon_palettes/cover_fossil.pal index 17aca6ea29..57c8b04188 100755 --- a/graphics/items/icon_palettes/cover_fossil.pal +++ b/graphics/items/icon_palettes/cover_fossil.pal @@ -1,16 +1,16 @@ JASC-PAL 0100 16 -128 0 255 -49 49 49 -123 123 165 -140 140 181 -115 115 165 -82 82 140 -99 99 156 -165 165 198 -66 66 115 -198 198 214 +211 211 211 +48 48 48 +120 120 160 +136 136 176 +112 112 160 +80 80 136 +96 96 152 +160 160 192 +64 64 112 +192 192 208 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/dark_gem.pal b/graphics/items/icon_palettes/dark_gem.pal index 1183d7db18..f0f6805d49 100644 --- a/graphics/items/icon_palettes/dark_gem.pal +++ b/graphics/items/icon_palettes/dark_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 72 72 72 120 120 120 56 56 56 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/destiny_knot.pal b/graphics/items/icon_palettes/destiny_knot.pal index 080e8a7f04..ae91dfc5a5 100644 --- a/graphics/items/icon_palettes/destiny_knot.pal +++ b/graphics/items/icon_palettes/destiny_knot.pal @@ -1,13 +1,13 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -194 69 69 -247 101 101 -247 85 85 -185 61 61 -134 54 54 +211 211 211 +48 48 48 +200 80 80 +248 112 112 +248 96 96 +192 72 72 +144 64 64 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/dragon_gem.pal b/graphics/items/icon_palettes/dragon_gem.pal index 10fed280fd..39f6712406 100644 --- a/graphics/items/icon_palettes/dragon_gem.pal +++ b/graphics/items/icon_palettes/dragon_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 160 128 200 168 184 232 128 96 224 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/electric_gem.pal b/graphics/items/icon_palettes/electric_gem.pal index 88de6e42ae..18be637cc3 100644 --- a/graphics/items/icon_palettes/electric_gem.pal +++ b/graphics/items/icon_palettes/electric_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 248 224 0 248 248 160 224 200 0 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/expert_belt.pal b/graphics/items/icon_palettes/expert_belt.pal index cfb6c6a926..07de4a47bb 100644 --- a/graphics/items/icon_palettes/expert_belt.pal +++ b/graphics/items/icon_palettes/expert_belt.pal @@ -1,11 +1,11 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -61 54 61 -117 109 117 -85 77 85 +211 211 211 +72 64 72 +48 48 48 +128 120 128 +96 88 96 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/fairy_gem.pal b/graphics/items/icon_palettes/fairy_gem.pal index 4bf316f572..f7ef540898 100644 --- a/graphics/items/icon_palettes/fairy_gem.pal +++ b/graphics/items/icon_palettes/fairy_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -49 49 49 +48 48 48 215 149 192 251 230 239 210 120 173 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/fighting_gem.pal b/graphics/items/icon_palettes/fighting_gem.pal index 324a6870c6..a107ed870e 100644 --- a/graphics/items/icon_palettes/fighting_gem.pal +++ b/graphics/items/icon_palettes/fighting_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 184 112 120 224 152 136 144 72 120 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/fire_gem.pal b/graphics/items/icon_palettes/fire_gem.pal index f98f9e16ca..ce4b435404 100644 --- a/graphics/items/icon_palettes/fire_gem.pal +++ b/graphics/items/icon_palettes/fire_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 248 144 72 248 200 104 240 64 48 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/flying_gem.pal b/graphics/items/icon_palettes/flying_gem.pal index 16d9334346..e2cf402064 100644 --- a/graphics/items/icon_palettes/flying_gem.pal +++ b/graphics/items/icon_palettes/flying_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 184 200 248 216 224 248 152 168 240 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/focus_sash.pal b/graphics/items/icon_palettes/focus_sash.pal index 08b56485e0..0b9a14d120 100644 --- a/graphics/items/icon_palettes/focus_sash.pal +++ b/graphics/items/icon_palettes/focus_sash.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -77 77 77 -212 101 61 -247 117 117 -247 151 69 -177 39 39 -229 69 69 -247 220 69 +211 211 211 +48 48 48 +88 88 88 +216 112 72 +248 128 128 +248 160 80 +184 48 48 +232 80 80 +248 224 80 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/ghost_gem.pal b/graphics/items/icon_palettes/ghost_gem.pal index 6068c4d2b0..d27ad1d725 100644 --- a/graphics/items/icon_palettes/ghost_gem.pal +++ b/graphics/items/icon_palettes/ghost_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 104 80 184 104 104 216 80 64 152 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/gold_bottle_cap.pal b/graphics/items/icon_palettes/gold_bottle_cap.pal index 2420b2d4c7..bc87d438da 100644 --- a/graphics/items/icon_palettes/gold_bottle_cap.pal +++ b/graphics/items/icon_palettes/gold_bottle_cap.pal @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +248 248 248 diff --git a/graphics/items/icon_palettes/grass_gem.pal b/graphics/items/icon_palettes/grass_gem.pal index 02412f988e..0e98973670 100644 --- a/graphics/items/icon_palettes/grass_gem.pal +++ b/graphics/items/icon_palettes/grass_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 96 248 120 184 248 176 64 200 80 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/ground_gem.pal b/graphics/items/icon_palettes/ground_gem.pal index cbdd4efd6d..d5a86d7184 100644 --- a/graphics/items/icon_palettes/ground_gem.pal +++ b/graphics/items/icon_palettes/ground_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 184 128 56 200 160 80 160 104 32 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/heal_ball.pal b/graphics/items/icon_palettes/heal_ball.pal index 86f7876651..0d04f8f5af 100644 --- a/graphics/items/icon_palettes/heal_ball.pal +++ b/graphics/items/icon_palettes/heal_ball.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -180 180 180 -255 255 255 -246 139 180 -255 180 230 -255 106 213 -238 82 197 -213 16 172 -106 98 197 -123 148 205 -139 172 222 -90 139 205 -255 246 213 -230 180 115 -255 205 172 -0 0 0 -49 49 49 +211 211 211 +48 48 48 +248 104 208 +232 80 192 +248 176 224 +248 248 248 +240 136 176 +248 240 208 +224 176 112 +248 200 168 +136 168 216 +88 136 200 +120 152 208 +136 128 200 +104 96 192 +208 16 168 diff --git a/graphics/items/icon_palettes/honey.pal b/graphics/items/icon_palettes/honey.pal index 062722fc51..cc25ae8f60 100644 --- a/graphics/items/icon_palettes/honey.pal +++ b/graphics/items/icon_palettes/honey.pal @@ -1,16 +1,16 @@ JASC-PAL 0100 16 -163 73 164 -248 240 184 -248 184 72 -232 144 0 -200 112 0 -120 80 32 -216 248 248 -96 184 192 -80 152 152 +211 211 211 48 48 48 +216 248 248 +248 184 72 +248 240 184 +80 152 152 +96 184 192 +120 80 32 +200 112 0 +232 144 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/ice_gem.pal b/graphics/items/icon_palettes/ice_gem.pal index dda74d5894..8fe6b397e3 100644 --- a/graphics/items/icon_palettes/ice_gem.pal +++ b/graphics/items/icon_palettes/ice_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 104 232 232 168 248 248 48 208 248 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/kee_berry.pal b/graphics/items/icon_palettes/kee_berry.pal index 7d25b433ac..e56e84b3d6 100755 --- a/graphics/items/icon_palettes/kee_berry.pal +++ b/graphics/items/icon_palettes/kee_berry.pal @@ -1,7 +1,7 @@ JASC-PAL 0100 16 -128 0 255 +255 255 255 49 49 49 156 222 115 115 189 82 @@ -14,6 +14,6 @@ JASC-PAL 148 123 99 255 222 189 230 189 165 -0 0 0 189 156 132 0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/light_clay.pal b/graphics/items/icon_palettes/light_clay.pal index 02a4a90fbd..bc5ea9be30 100644 --- a/graphics/items/icon_palettes/light_clay.pal +++ b/graphics/items/icon_palettes/light_clay.pal @@ -1,13 +1,13 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -126 177 69 -177 220 109 -93 117 54 -212 238 185 -247 247 247 +211 211 211 +48 48 48 +136 184 80 +184 224 120 +104 128 64 +216 240 192 +248 248 248 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/metal_powder.pal b/graphics/items/icon_palettes/metal_powder.pal index 68d14765d4..545b06e32b 100755 --- a/graphics/items/icon_palettes/metal_powder.pal +++ b/graphics/items/icon_palettes/metal_powder.pal @@ -12,8 +12,8 @@ JASC-PAL 238 197 246 115 65 123 255 255 255 -0 0 0 -0 0 0 -0 0 0 +255 255 255 +238 197 246 +205 148 213 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/metronome.pal b/graphics/items/icon_palettes/metronome.pal index 0294d8b6cb..b87bb6b7da 100644 --- a/graphics/items/icon_palettes/metronome.pal +++ b/graphics/items/icon_palettes/metronome.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -39 69 85 -159 203 229 -109 177 220 -77 142 168 -54 93 61 -77 126 93 -177 229 229 -247 247 247 -126 185 220 +211 211 211 +48 48 48 +48 80 96 +168 208 232 +120 184 224 +88 152 176 +64 104 72 +88 136 104 +184 232 232 +248 248 248 +136 192 224 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/moon_ball.pal b/graphics/items/icon_palettes/moon_ball.pal index 0f1f671786..b8b12f14fa 100644 --- a/graphics/items/icon_palettes/moon_ball.pal +++ b/graphics/items/icon_palettes/moon_ball.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -180 180 180 -255 255 255 -222 205 246 -164 164 197 -123 123 131 -98 115 148 -123 139 156 -74 197 238 -65 148 172 -156 255 255 -74 82 82 -189 172 106 -246 205 65 -255 230 164 -0 0 0 -49 49 49 +211 211 211 +48 48 48 +184 168 104 +240 200 64 +120 136 152 +96 112 144 +72 192 232 +248 224 160 +152 248 248 +248 248 248 +64 144 168 +88 104 120 +72 80 80 +160 160 192 +120 120 128 +216 200 240 diff --git a/graphics/items/icon_palettes/muscle_band.pal b/graphics/items/icon_palettes/muscle_band.pal index e93f6f6ddf..fd3a6430cd 100644 --- a/graphics/items/icon_palettes/muscle_band.pal +++ b/graphics/items/icon_palettes/muscle_band.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -168 142 32 -247 247 151 -229 203 39 -126 109 61 -56 56 56 -247 109 109 -203 177 18 -203 93 18 -203 25 25 -238 54 54 +211 211 211 +48 48 48 +176 152 40 +248 248 160 +232 208 48 +136 120 72 +248 120 120 +208 184 24 +208 104 24 +208 32 32 +240 64 64 +0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/n_lunarizer.pal b/graphics/items/icon_palettes/n_lunarizer.pal index a8c12d9751..f1ccd912f3 100644 --- a/graphics/items/icon_palettes/n_lunarizer.pal +++ b/graphics/items/icon_palettes/n_lunarizer.pal @@ -8,6 +8,7 @@ JASC-PAL 88 88 88 48 48 48 32 176 240 +32 176 240 16 120 200 240 104 64 0 0 0 @@ -16,4 +17,3 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 diff --git a/graphics/items/icon_palettes/normal_gem.pal b/graphics/items/icon_palettes/normal_gem.pal index 8cd17447e6..89965d2c78 100644 --- a/graphics/items/icon_palettes/normal_gem.pal +++ b/graphics/items/icon_palettes/normal_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 224 184 184 240 208 208 192 176 176 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/oval_charm.pal b/graphics/items/icon_palettes/oval_charm.pal index 5f5afd15c5..6cded15051 100644 --- a/graphics/items/icon_palettes/oval_charm.pal +++ b/graphics/items/icon_palettes/oval_charm.pal @@ -3,13 +3,13 @@ JASC-PAL 16 239 228 176 48 48 48 -248 192 224 128 80 216 -168 104 248 128 208 192 -248 248 216 +248 192 224 216 136 160 +248 248 216 184 88 96 +168 104 248 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/park_ball.pal b/graphics/items/icon_palettes/park_ball.pal index 5817b9997f..ad7609bde5 100644 --- a/graphics/items/icon_palettes/park_ball.pal +++ b/graphics/items/icon_palettes/park_ball.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -180 180 180 -255 255 255 -123 115 131 -164 164 197 -123 123 131 -32 123 222 -115 131 123 -213 213 205 -246 213 82 -255 230 139 -222 156 41 -255 139 49 -0 0 0 -49 49 49 +211 211 211 +48 48 48 +240 208 80 +216 152 40 +248 224 136 +248 248 248 +144 112 152 +40 104 200 +168 88 24 +248 136 48 +120 120 128 +216 200 240 +160 160 192 +0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/pearl_string.pal b/graphics/items/icon_palettes/pearl_string.pal index b754262ce7..ca175ecd5f 100644 --- a/graphics/items/icon_palettes/pearl_string.pal +++ b/graphics/items/icon_palettes/pearl_string.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -0 248 0 -248 248 248 -232 232 232 -192 192 192 -168 168 168 -248 248 200 -176 232 224 -152 208 200 -120 144 144 -216 172 172 +211 211 211 +80 80 80 48 48 48 -0 0 0 -0 0 0 -0 0 0 +184 184 184 +248 248 200 +176 224 216 +120 136 136 +224 224 224 +232 232 184 +248 248 248 +152 200 192 +144 160 160 +208 168 168 +160 160 160 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/pink_nectar.pal b/graphics/items/icon_palettes/pink_nectar.pal index e6167ec00f..93ed4418c7 100755 --- a/graphics/items/icon_palettes/pink_nectar.pal +++ b/graphics/items/icon_palettes/pink_nectar.pal @@ -8,6 +8,7 @@ JASC-PAL 255 90 90 255 246 246 90 65 65 +255 246 246 123 90 82 148 98 82 189 148 156 @@ -16,4 +17,3 @@ JASC-PAL 255 197 189 255 123 115 189 90 90 -0 0 0 diff --git a/graphics/items/icon_palettes/poison_gem.pal b/graphics/items/icon_palettes/poison_gem.pal index da63d2f248..0e88e28faa 100644 --- a/graphics/items/icon_palettes/poison_gem.pal +++ b/graphics/items/icon_palettes/poison_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 152 104 168 192 176 200 104 96 136 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/poke_toy.pal b/graphics/items/icon_palettes/poke_toy.pal index 4ee38edd34..1efcf11260 100644 --- a/graphics/items/icon_palettes/poke_toy.pal +++ b/graphics/items/icon_palettes/poke_toy.pal @@ -1,13 +1,13 @@ JASC-PAL 0100 16 -0 248 0 -248 248 248 -200 200 200 -168 168 168 -248 240 144 -248 208 104 +211 211 211 48 48 48 +200 200 200 +248 248 248 +160 160 160 +248 232 136 +240 200 104 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/premier_ball.pal b/graphics/items/icon_palettes/premier_ball.pal new file mode 100644 index 0000000000..696a4b385e --- /dev/null +++ b/graphics/items/icon_palettes/premier_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +49 49 49 +74 82 82 +123 123 131 +164 164 197 +222 205 246 +255 255 255 +156 74 57 +180 82 57 +222 90 57 +255 148 57 +255 213 57 +230 180 106 +255 255 148 +213 156 49 +255 238 82 diff --git a/graphics/items/icon_palettes/pretty_feather.pal b/graphics/items/icon_palettes/pretty_feather.pal index e2e1b3ed78..1595bae756 100644 --- a/graphics/items/icon_palettes/pretty_feather.pal +++ b/graphics/items/icon_palettes/pretty_feather.pal @@ -1,13 +1,13 @@ JASC-PAL 0100 16 -255 0 128 -90 90 90 -206 239 255 -239 255 255 -49 49 49 -156 214 231 -140 165 173 +211 211 211 +88 88 88 +200 232 248 +232 248 248 +48 48 48 +152 208 224 +136 160 168 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/prism_scale.pal b/graphics/items/icon_palettes/prism_scale.pal index 15d3698bff..e93ad0a49a 100755 --- a/graphics/items/icon_palettes/prism_scale.pal +++ b/graphics/items/icon_palettes/prism_scale.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -128 0 255 -82 82 82 -189 239 255 -132 206 239 -173 173 222 -49 49 49 -206 140 206 -239 107 189 -255 156 214 +211 211 211 +80 80 80 +184 232 248 +128 200 232 +168 168 216 +48 48 48 +200 136 200 +232 104 184 +248 152 208 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/psychic_gem.pal b/graphics/items/icon_palettes/psychic_gem.pal index c9f2839e65..73ff919bd3 100644 --- a/graphics/items/icon_palettes/psychic_gem.pal +++ b/graphics/items/icon_palettes/psychic_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 248 104 176 248 160 192 208 56 136 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/purple_nectar.pal b/graphics/items/icon_palettes/purple_nectar.pal index 7b6def78c8..3da67fdec6 100755 --- a/graphics/items/icon_palettes/purple_nectar.pal +++ b/graphics/items/icon_palettes/purple_nectar.pal @@ -8,6 +8,7 @@ JASC-PAL 197 90 255 255 246 255 90 65 65 +255 246 255 123 90 82 148 98 82 189 148 156 @@ -16,4 +17,3 @@ JASC-PAL 255 197 189 255 123 115 189 90 90 -0 0 0 diff --git a/graphics/items/icon_palettes/quick_powder.pal b/graphics/items/icon_palettes/quick_powder.pal index 39410ad529..3c4e0c7dbd 100644 --- a/graphics/items/icon_palettes/quick_powder.pal +++ b/graphics/items/icon_palettes/quick_powder.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -255 0 128 +180 180 180 49 49 49 +213 213 213 156 156 156 -214 214 214 -255 255 255 -239 239 239 90 90 90 -181 214 255 -123 189 239 -74 107 173 -115 156 206 -0 0 0 -0 0 0 -0 0 0 +238 238 238 +120 184 232 +112 152 200 +176 208 248 +72 104 168 +255 255 255 +255 255 255 +176 208 248 +120 184 232 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/rage_candy_bar.pal b/graphics/items/icon_palettes/rage_candy_bar.pal index 985c80da69..6cfc78270d 100644 --- a/graphics/items/icon_palettes/rage_candy_bar.pal +++ b/graphics/items/icon_palettes/rage_candy_bar.pal @@ -1,18 +1,18 @@ JASC-PAL 0100 16 -128 248 248 -176 208 144 -144 196 88 +211 211 211 +48 48 48 +144 192 88 104 152 64 -64 104 48 +224 232 208 +176 200 144 176 112 80 -152 56 48 168 144 80 152 128 64 -224 232 208 +152 64 48 +64 104 48 136 136 136 -48 48 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/rare_bone.pal b/graphics/items/icon_palettes/rare_bone.pal deleted file mode 100755 index 2ba2fbbb18..0000000000 --- a/graphics/items/icon_palettes/rare_bone.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -128 0 255 -48 48 48 -224 232 200 -184 192 160 -128 128 96 -208 208 168 -152 152 128 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/items/icon_palettes/relics.pal b/graphics/items/icon_palettes/relics.pal index b095aa950f..afacfadb94 100644 --- a/graphics/items/icon_palettes/relics.pal +++ b/graphics/items/icon_palettes/relics.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -248 248 0 -216 216 208 -200 200 192 -176 176 176 +211 211 211 +48 48 48 +168 168 168 144 152 152 -120 144 144 +120 136 136 88 120 120 +192 192 184 64 104 104 +208 208 200 56 96 96 48 72 80 72 72 72 -48 48 48 -0 0 0 +48 80 88 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/ring_target.pal b/graphics/items/icon_palettes/ring_target.pal index 4773d5912c..ee0bbeb5bb 100755 --- a/graphics/items/icon_palettes/ring_target.pal +++ b/graphics/items/icon_palettes/ring_target.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -128 0 255 -49 49 49 -66 66 66 -173 140 66 -148 115 49 -115 115 123 -206 206 214 -255 255 255 -123 99 49 +211 211 211 +48 48 48 +64 64 64 +168 136 64 +144 112 48 +112 112 120 +200 200 208 +248 248 248 +120 96 48 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/rock_gem.pal b/graphics/items/icon_palettes/rock_gem.pal index 3821017666..bd4fae9f8d 100644 --- a/graphics/items/icon_palettes/rock_gem.pal +++ b/graphics/items/icon_palettes/rock_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 184 144 120 216 200 176 136 112 88 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/sacred_ash.pal b/graphics/items/icon_palettes/sacred_ash.pal index 4b7ec0b8cb..09c29286aa 100755 --- a/graphics/items/icon_palettes/sacred_ash.pal +++ b/graphics/items/icon_palettes/sacred_ash.pal @@ -13,7 +13,7 @@ JASC-PAL 82 82 82 222 222 222 255 255 255 -0 0 0 -0 0 0 +156 156 156 +156 156 156 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/spooky_plate.pal b/graphics/items/icon_palettes/spooky_plate.pal index fffede5bc1..4c086d02c3 100644 --- a/graphics/items/icon_palettes/spooky_plate.pal +++ b/graphics/items/icon_palettes/spooky_plate.pal @@ -3,12 +3,12 @@ JASC-PAL 16 255 0 128 40 40 40 -112 122 138 -165 173 182 -192 192 209 -138 130 165 -104 104 104 -88 88 88 +154 121 154 +195 170 203 +211 186 219 +170 146 178 +138 89 146 +113 73 130 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/stable_mulch.pal b/graphics/items/icon_palettes/stable_mulch.pal index a0a98aabcb..1afb680457 100644 --- a/graphics/items/icon_palettes/stable_mulch.pal +++ b/graphics/items/icon_palettes/stable_mulch.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -120 192 168 -240 248 208 -152 224 200 -48 184 192 -232 200 152 -216 184 104 -180 136 72 -128 96 56 +211 211 211 48 48 48 +224 200 152 +208 176 104 +176 136 72 +128 96 56 +240 248 208 +48 184 192 +152 224 200 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/star.pal b/graphics/items/icon_palettes/star.pal index d37358e905..286e2d9264 100755 --- a/graphics/items/icon_palettes/star.pal +++ b/graphics/items/icon_palettes/star.pal @@ -13,7 +13,7 @@ JASC-PAL 156 74 74 255 255 255 131 49 49 -0 0 0 +246 164 164 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/steel_gem.pal b/graphics/items/icon_palettes/steel_gem.pal index bd03865343..b2e3d38b05 100644 --- a/graphics/items/icon_palettes/steel_gem.pal +++ b/graphics/items/icon_palettes/steel_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 136 136 152 184 184 200 96 96 96 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/ultranecrozium_z.pal b/graphics/items/icon_palettes/ultranecrozium_z.pal index 366b1ba2d1..7cb3197d1a 100644 --- a/graphics/items/icon_palettes/ultranecrozium_z.pal +++ b/graphics/items/icon_palettes/ultranecrozium_z.pal @@ -4,16 +4,16 @@ JASC-PAL 200 191 231 32 32 32 255 246 205 -255 255 238 -180 156 98 -222 205 156 -255 255 230 -180 180 172 -156 148 115 -131 115 82 230 222 172 -164 131 65 +255 255 230 +255 255 238 +180 180 172 180 180 148 +156 148 115 +222 205 156 +180 156 98 +131 115 82 +164 131 65 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/water_gem.pal b/graphics/items/icon_palettes/water_gem.pal index 586db9a6e4..e1686478f6 100644 --- a/graphics/items/icon_palettes/water_gem.pal +++ b/graphics/items/icon_palettes/water_gem.pal @@ -2,7 +2,7 @@ JASC-PAL 0100 16 255 0 128 -32 32 32 +48 48 48 64 160 248 120 200 248 48 144 248 @@ -16,4 +16,4 @@ JASC-PAL 0 0 0 0 0 0 0 0 0 -0 0 0 +88 88 88 diff --git a/graphics/items/icon_palettes/white_apricorn.pal b/graphics/items/icon_palettes/white_apricorn.pal index 53472131bb..009d48350a 100755 --- a/graphics/items/icon_palettes/white_apricorn.pal +++ b/graphics/items/icon_palettes/white_apricorn.pal @@ -9,11 +9,11 @@ JASC-PAL 255 255 255 181 198 214 206 148 99 +255 255 255 +255 255 255 214 222 231 115 123 132 0 0 0 0 0 0 0 0 0 0 0 0 -0 0 0 -0 0 0 diff --git a/graphics/items/icon_palettes/wide_lens.pal b/graphics/items/icon_palettes/wide_lens.pal index cedef34fa0..ed17c6ddab 100644 --- a/graphics/items/icon_palettes/wide_lens.pal +++ b/graphics/items/icon_palettes/wide_lens.pal @@ -1,17 +1,17 @@ JASC-PAL 0100 16 -255 0 128 -39 39 39 -220 151 101 -212 101 39 -117 39 18 -247 247 247 -85 85 85 -11 126 151 -18 194 247 -151 151 151 -168 54 25 +211 211 211 +48 48 48 +224 160 112 +216 112 48 +128 48 24 +248 248 248 +96 96 96 +16 136 160 +24 200 248 +160 160 160 +176 64 32 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/x_special_defense.pal b/graphics/items/icon_palettes/x_special_defense.pal index 548816d06b..0479f95da6 100755 --- a/graphics/items/icon_palettes/x_special_defense.pal +++ b/graphics/items/icon_palettes/x_special_defense.pal @@ -2,16 +2,16 @@ JASC-PAL 0100 16 128 0 255 +49 49 49 +92 176 176 64 134 134 -42 42 42 +148 198 198 +255 255 255 127 134 134 184 198 198 -219 219 219 -191 219 219 -92 176 176 -78 141 141 28 92 92 -148 198 198 +191 219 219 +78 141 141 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/yellow_nectar.pal b/graphics/items/icon_palettes/yellow_nectar.pal index bebf85a5ff..9a46979ea8 100755 --- a/graphics/items/icon_palettes/yellow_nectar.pal +++ b/graphics/items/icon_palettes/yellow_nectar.pal @@ -8,6 +8,7 @@ JASC-PAL 197 139 0 255 246 213 90 65 65 +255 246 213 123 90 82 148 98 82 189 148 156 @@ -16,4 +17,3 @@ JASC-PAL 255 197 189 255 123 115 189 90 90 -0 0 0 diff --git a/graphics/items/icon_palettes/z_power_ring.pal b/graphics/items/icon_palettes/z_power_ring.pal index 2c3b5951af..27391f7339 100644 --- a/graphics/items/icon_palettes/z_power_ring.pal +++ b/graphics/items/icon_palettes/z_power_ring.pal @@ -1,15 +1,15 @@ JASC-PAL 0100 16 -120 192 168 -240 248 248 -176 176 176 -136 136 136 -128 128 128 +255 255 255 +32 32 32 +168 168 168 +232 240 240 +80 80 88 104 104 104 -96 96 96 -80 80 80 -64 64 64 +64 64 72 +128 128 128 +120 120 128 48 48 48 0 0 0 0 0 0 diff --git a/graphics/items/icon_palettes/zygarde_cube.pal b/graphics/items/icon_palettes/zygarde_cube.pal index 3358a67c8c..caf5836fd7 100644 --- a/graphics/items/icon_palettes/zygarde_cube.pal +++ b/graphics/items/icon_palettes/zygarde_cube.pal @@ -1,19 +1,19 @@ JASC-PAL 0100 16 -120 192 168 -232 248 232 -152 216 48 -128 152 32 +255 255 255 +32 32 32 +128 160 32 +152 208 48 +120 152 32 104 120 48 +160 208 48 152 144 144 +248 248 248 +120 136 64 120 104 104 88 80 80 64 56 56 -48 48 48 -0 0 0 -0 0 0 -0 0 0 0 0 0 0 0 0 0 0 0 diff --git a/graphics/items/icons/absorb_bulb.png b/graphics/items/icons/absorb_bulb.png index a63f7a8bcc..9a726d579f 100755 Binary files a/graphics/items/icons/absorb_bulb.png and b/graphics/items/icons/absorb_bulb.png differ diff --git a/graphics/items/icons/antidote.png b/graphics/items/icons/antidote.png deleted file mode 100755 index e577fdc290..0000000000 Binary files a/graphics/items/icons/antidote.png and /dev/null differ diff --git a/graphics/items/icons/red_apricorn.png b/graphics/items/icons/apricorn.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/red_apricorn.png rename to graphics/items/icons/apricorn.png diff --git a/graphics/items/icons/balm_mushroom.png b/graphics/items/icons/balm_mushroom.png index ba4373faad..579ab5b813 100644 Binary files a/graphics/items/icons/balm_mushroom.png and b/graphics/items/icons/balm_mushroom.png differ diff --git a/graphics/items/icons/big_root.png b/graphics/items/icons/big_root.png index ef20e8ea54..69d85de713 100644 Binary files a/graphics/items/icons/big_root.png and b/graphics/items/icons/big_root.png differ diff --git a/graphics/items/icons/black_apricorn.png b/graphics/items/icons/black_apricorn.png deleted file mode 100755 index 470e77fcfc..0000000000 Binary files a/graphics/items/icons/black_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/blue_apricorn.png b/graphics/items/icons/blue_apricorn.png deleted file mode 100755 index 9e1b19fb30..0000000000 Binary files a/graphics/items/icons/blue_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/thick_club.png b/graphics/items/icons/bone.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/thick_club.png rename to graphics/items/icons/bone.png diff --git a/graphics/items/icons/bottle_cap.png b/graphics/items/icons/bottle_cap.png index b3f52c4221..2cd15a49a5 100644 Binary files a/graphics/items/icons/bottle_cap.png and b/graphics/items/icons/bottle_cap.png differ diff --git a/graphics/items/icons/bug_gem.png b/graphics/items/icons/bug_gem.png deleted file mode 100644 index 4d69046687..0000000000 Binary files a/graphics/items/icons/bug_gem.png and /dev/null differ diff --git a/graphics/items/icons/burn_drive.png b/graphics/items/icons/burn_drive.png deleted file mode 100644 index 9486eff484..0000000000 Binary files a/graphics/items/icons/burn_drive.png and /dev/null differ diff --git a/graphics/items/icons/casteliacone.png b/graphics/items/icons/casteliacone.png index 47691d6238..c2d7f96703 100644 Binary files a/graphics/items/icons/casteliacone.png and b/graphics/items/icons/casteliacone.png differ diff --git a/graphics/items/icons/chill_drive.png b/graphics/items/icons/chill_drive.png deleted file mode 100644 index d3d5e019c2..0000000000 Binary files a/graphics/items/icons/chill_drive.png and /dev/null differ diff --git a/graphics/items/icons/choice_specs.png b/graphics/items/icons/choice_specs.png index 7c90bdcff3..82fb71251d 100644 Binary files a/graphics/items/icons/choice_specs.png and b/graphics/items/icons/choice_specs.png differ diff --git a/graphics/items/icons/clever_feather.png b/graphics/items/icons/clever_feather.png deleted file mode 100644 index 3cc0a3d5f4..0000000000 Binary files a/graphics/items/icons/clever_feather.png and /dev/null differ diff --git a/graphics/items/icons/comet_shard.png b/graphics/items/icons/comet_shard.png deleted file mode 100644 index 7d6788b614..0000000000 Binary files a/graphics/items/icons/comet_shard.png and /dev/null differ diff --git a/graphics/items/icons/cover_fossil.png b/graphics/items/icons/cover_fossil.png index 1202bb4556..49ca51182d 100755 Binary files a/graphics/items/icons/cover_fossil.png and b/graphics/items/icons/cover_fossil.png differ diff --git a/graphics/items/icons/dark_gem.png b/graphics/items/icons/dark_gem.png deleted file mode 100644 index 8999ca25ac..0000000000 Binary files a/graphics/items/icons/dark_gem.png and /dev/null differ diff --git a/graphics/items/icons/destiny_knot.png b/graphics/items/icons/destiny_knot.png index ce8b18f937..899a6b530e 100644 Binary files a/graphics/items/icons/destiny_knot.png and b/graphics/items/icons/destiny_knot.png differ diff --git a/graphics/items/icons/ditto_powder.png b/graphics/items/icons/ditto_powder.png new file mode 100644 index 0000000000..f1e820fe06 Binary files /dev/null and b/graphics/items/icons/ditto_powder.png differ diff --git a/graphics/items/icons/douse_drive.png b/graphics/items/icons/douse_drive.png deleted file mode 100644 index f59616159a..0000000000 Binary files a/graphics/items/icons/douse_drive.png and /dev/null differ diff --git a/graphics/items/icons/draco_plate.png b/graphics/items/icons/draco_plate.png deleted file mode 100644 index 21339c0482..0000000000 Binary files a/graphics/items/icons/draco_plate.png and /dev/null differ diff --git a/graphics/items/icons/dragon_gem.png b/graphics/items/icons/dragon_gem.png deleted file mode 100644 index f071726a13..0000000000 Binary files a/graphics/items/icons/dragon_gem.png and /dev/null differ diff --git a/graphics/items/icons/dread_plate.png b/graphics/items/icons/dread_plate.png deleted file mode 100644 index 8679df524d..0000000000 Binary files a/graphics/items/icons/dread_plate.png and /dev/null differ diff --git a/graphics/items/icons/drive.png b/graphics/items/icons/drive.png new file mode 100644 index 0000000000..3b8b1d480c Binary files /dev/null and b/graphics/items/icons/drive.png differ diff --git a/graphics/items/icons/earth_plate.png b/graphics/items/icons/earth_plate.png deleted file mode 100644 index e79dff33ce..0000000000 Binary files a/graphics/items/icons/earth_plate.png and /dev/null differ diff --git a/graphics/items/icons/electric_gem.png b/graphics/items/icons/electric_gem.png deleted file mode 100644 index e17e3f4d13..0000000000 Binary files a/graphics/items/icons/electric_gem.png and /dev/null differ diff --git a/graphics/items/icons/ev_feather.png b/graphics/items/icons/ev_feather.png new file mode 100644 index 0000000000..e0c9dcd4b8 Binary files /dev/null and b/graphics/items/icons/ev_feather.png differ diff --git a/graphics/items/icons/eviolite.png b/graphics/items/icons/eviolite.png index b8bc613f8f..454308b2ff 100644 Binary files a/graphics/items/icons/eviolite.png and b/graphics/items/icons/eviolite.png differ diff --git a/graphics/items/icons/expert_belt.png b/graphics/items/icons/expert_belt.png index 62d4b8bc26..71a3260a56 100644 Binary files a/graphics/items/icons/expert_belt.png and b/graphics/items/icons/expert_belt.png differ diff --git a/graphics/items/icons/fairy_gem.png b/graphics/items/icons/fairy_gem.png deleted file mode 100644 index 5fe8f6ed99..0000000000 Binary files a/graphics/items/icons/fairy_gem.png and /dev/null differ diff --git a/graphics/items/icons/fighting_gem.png b/graphics/items/icons/fighting_gem.png deleted file mode 100644 index 2293767794..0000000000 Binary files a/graphics/items/icons/fighting_gem.png and /dev/null differ diff --git a/graphics/items/icons/fire_gem.png b/graphics/items/icons/fire_gem.png deleted file mode 100644 index d6caa7d3d1..0000000000 Binary files a/graphics/items/icons/fire_gem.png and /dev/null differ diff --git a/graphics/items/icons/fist_plate.png b/graphics/items/icons/fist_plate.png deleted file mode 100644 index 7e6cb2b92d..0000000000 Binary files a/graphics/items/icons/fist_plate.png and /dev/null differ diff --git a/graphics/items/icons/float_stone.png b/graphics/items/icons/float_stone.png index a421d553fb..f78c3871e9 100644 Binary files a/graphics/items/icons/float_stone.png and b/graphics/items/icons/float_stone.png differ diff --git a/graphics/items/icons/flying_gem.png b/graphics/items/icons/flying_gem.png deleted file mode 100644 index eb328c85ee..0000000000 Binary files a/graphics/items/icons/flying_gem.png and /dev/null differ diff --git a/graphics/items/icons/focus_sash.png b/graphics/items/icons/focus_sash.png index a09d2d26bd..8db64fbe2d 100644 Binary files a/graphics/items/icons/focus_sash.png and b/graphics/items/icons/focus_sash.png differ diff --git a/graphics/items/icons/genius_feather.png b/graphics/items/icons/genius_feather.png deleted file mode 100644 index 5b27a029e0..0000000000 Binary files a/graphics/items/icons/genius_feather.png and /dev/null differ diff --git a/graphics/items/icons/ghost_gem.png b/graphics/items/icons/ghost_gem.png deleted file mode 100644 index c4813ee299..0000000000 Binary files a/graphics/items/icons/ghost_gem.png and /dev/null differ diff --git a/graphics/items/icons/grass_gem.png b/graphics/items/icons/grass_gem.png deleted file mode 100644 index 756a769cab..0000000000 Binary files a/graphics/items/icons/grass_gem.png and /dev/null differ diff --git a/graphics/items/icons/grassy_seed.png b/graphics/items/icons/grassy_seed.png deleted file mode 100644 index 31f30aeb59..0000000000 Binary files a/graphics/items/icons/grassy_seed.png and /dev/null differ diff --git a/graphics/items/icons/green_apricorn.png b/graphics/items/icons/green_apricorn.png deleted file mode 100755 index da60f8544a..0000000000 Binary files a/graphics/items/icons/green_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/ground_gem.png b/graphics/items/icons/ground_gem.png deleted file mode 100644 index 21fab57b0f..0000000000 Binary files a/graphics/items/icons/ground_gem.png and /dev/null differ diff --git a/graphics/items/icons/heal_ball.png b/graphics/items/icons/heal_ball.png index 765c7326c0..535fbd5a42 100644 Binary files a/graphics/items/icons/heal_ball.png and b/graphics/items/icons/heal_ball.png differ diff --git a/graphics/items/icons/health_feather.png b/graphics/items/icons/health_feather.png deleted file mode 100644 index 584cc4f134..0000000000 Binary files a/graphics/items/icons/health_feather.png and /dev/null differ diff --git a/graphics/items/icons/honey.png b/graphics/items/icons/honey.png index 386b520950..fcea37efce 100644 Binary files a/graphics/items/icons/honey.png and b/graphics/items/icons/honey.png differ diff --git a/graphics/items/icons/ice_gem.png b/graphics/items/icons/ice_gem.png deleted file mode 100644 index e9c28f0503..0000000000 Binary files a/graphics/items/icons/ice_gem.png and /dev/null differ diff --git a/graphics/items/icons/icicle_plate.png b/graphics/items/icons/icicle_plate.png deleted file mode 100644 index 7a74d45a55..0000000000 Binary files a/graphics/items/icons/icicle_plate.png and /dev/null differ diff --git a/graphics/items/icons/insect_plate.png b/graphics/items/icons/insect_plate.png deleted file mode 100644 index 23bee90932..0000000000 Binary files a/graphics/items/icons/insect_plate.png and /dev/null differ diff --git a/graphics/items/icons/iron_plate.png b/graphics/items/icons/iron_plate.png deleted file mode 100644 index d4a778e4df..0000000000 Binary files a/graphics/items/icons/iron_plate.png and /dev/null differ diff --git a/graphics/items/icons/kee_berry.png b/graphics/items/icons/kee_berry.png index bbd6c53cf2..b8ecaa97d7 100755 Binary files a/graphics/items/icons/kee_berry.png and b/graphics/items/icons/kee_berry.png differ diff --git a/graphics/items/icons/light_clay.png b/graphics/items/icons/light_clay.png index 0007ea8c89..23688d6e7a 100644 Binary files a/graphics/items/icons/light_clay.png and b/graphics/items/icons/light_clay.png differ diff --git a/graphics/items/icons/meadow_plate.png b/graphics/items/icons/meadow_plate.png deleted file mode 100644 index 6571446bb5..0000000000 Binary files a/graphics/items/icons/meadow_plate.png and /dev/null differ diff --git a/graphics/items/icons/metal_powder.png b/graphics/items/icons/metal_powder.png deleted file mode 100755 index 654b07da77..0000000000 Binary files a/graphics/items/icons/metal_powder.png and /dev/null differ diff --git a/graphics/items/icons/metronome.png b/graphics/items/icons/metronome.png index 4270fcaeda..8001aafb11 100644 Binary files a/graphics/items/icons/metronome.png and b/graphics/items/icons/metronome.png differ diff --git a/graphics/items/icons/mind_plate.png b/graphics/items/icons/mind_plate.png deleted file mode 100644 index 12af8f9ea8..0000000000 Binary files a/graphics/items/icons/mind_plate.png and /dev/null differ diff --git a/graphics/items/icons/misty_seed.png b/graphics/items/icons/misty_seed.png deleted file mode 100644 index 58764aca50..0000000000 Binary files a/graphics/items/icons/misty_seed.png and /dev/null differ diff --git a/graphics/items/icons/moon_ball.png b/graphics/items/icons/moon_ball.png index cc67522d46..c45100facf 100644 Binary files a/graphics/items/icons/moon_ball.png and b/graphics/items/icons/moon_ball.png differ diff --git a/graphics/items/icons/mulch.png b/graphics/items/icons/mulch.png index 6e470a1086..9ab205355c 100644 Binary files a/graphics/items/icons/mulch.png and b/graphics/items/icons/mulch.png differ diff --git a/graphics/items/icons/muscle_band.png b/graphics/items/icons/muscle_band.png index 1954f8a56b..24d402fd3e 100644 Binary files a/graphics/items/icons/muscle_band.png and b/graphics/items/icons/muscle_band.png differ diff --git a/graphics/items/icons/muscle_feather.png b/graphics/items/icons/muscle_feather.png deleted file mode 100644 index 5ebf263b25..0000000000 Binary files a/graphics/items/icons/muscle_feather.png and /dev/null differ diff --git a/graphics/items/icons/red_nectar.png b/graphics/items/icons/nectar.png old mode 100755 new mode 100644 similarity index 100% rename from graphics/items/icons/red_nectar.png rename to graphics/items/icons/nectar.png diff --git a/graphics/items/icons/normal_gem.png b/graphics/items/icons/normal_gem.png deleted file mode 100644 index 5d8cbf7bfd..0000000000 Binary files a/graphics/items/icons/normal_gem.png and /dev/null differ diff --git a/graphics/items/icons/oval_charm.png b/graphics/items/icons/oval_charm.png index 25809907a5..482bd630fd 100644 Binary files a/graphics/items/icons/oval_charm.png and b/graphics/items/icons/oval_charm.png differ diff --git a/graphics/items/icons/park_ball.png b/graphics/items/icons/park_ball.png index c527ac1cc8..538e43b876 100644 Binary files a/graphics/items/icons/park_ball.png and b/graphics/items/icons/park_ball.png differ diff --git a/graphics/items/icons/pearl_string.png b/graphics/items/icons/pearl_string.png index a61a9aa66b..f552bd961f 100644 Binary files a/graphics/items/icons/pearl_string.png and b/graphics/items/icons/pearl_string.png differ diff --git a/graphics/items/icons/pink_apricorn.png b/graphics/items/icons/pink_apricorn.png deleted file mode 100755 index 817e0140c3..0000000000 Binary files a/graphics/items/icons/pink_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/pink_nectar.png b/graphics/items/icons/pink_nectar.png deleted file mode 100755 index 9fbe0f76b3..0000000000 Binary files a/graphics/items/icons/pink_nectar.png and /dev/null differ diff --git a/graphics/items/icons/pixie_plate.png b/graphics/items/icons/pixie_plate.png deleted file mode 100644 index 4c34f22aba..0000000000 Binary files a/graphics/items/icons/pixie_plate.png and /dev/null differ diff --git a/graphics/items/icons/flame_plate.png b/graphics/items/icons/plate.png similarity index 100% rename from graphics/items/icons/flame_plate.png rename to graphics/items/icons/plate.png diff --git a/graphics/items/icons/poison_gem.png b/graphics/items/icons/poison_gem.png deleted file mode 100644 index 8e78855276..0000000000 Binary files a/graphics/items/icons/poison_gem.png and /dev/null differ diff --git a/graphics/items/icons/poke_toy.png b/graphics/items/icons/poke_toy.png index be6091d3f5..e5b9626b58 100644 Binary files a/graphics/items/icons/poke_toy.png and b/graphics/items/icons/poke_toy.png differ diff --git a/graphics/items/icons/premier_ball.png b/graphics/items/icons/premier_ball.png old mode 100755 new mode 100644 diff --git a/graphics/items/icons/pretty_feather.png b/graphics/items/icons/pretty_feather.png index 69c66306d2..ca305e11a9 100644 Binary files a/graphics/items/icons/pretty_feather.png and b/graphics/items/icons/pretty_feather.png differ diff --git a/graphics/items/icons/prism_scale.png b/graphics/items/icons/prism_scale.png index f992c3bd84..fe9827bedb 100755 Binary files a/graphics/items/icons/prism_scale.png and b/graphics/items/icons/prism_scale.png differ diff --git a/graphics/items/icons/psychic_gem.png b/graphics/items/icons/psychic_gem.png deleted file mode 100644 index b73184955e..0000000000 Binary files a/graphics/items/icons/psychic_gem.png and /dev/null differ diff --git a/graphics/items/icons/psychic_seed.png b/graphics/items/icons/psychic_seed.png deleted file mode 100644 index 4c90afb9c9..0000000000 Binary files a/graphics/items/icons/psychic_seed.png and /dev/null differ diff --git a/graphics/items/icons/purple_nectar.png b/graphics/items/icons/purple_nectar.png deleted file mode 100755 index f792b5ff55..0000000000 Binary files a/graphics/items/icons/purple_nectar.png and /dev/null differ diff --git a/graphics/items/icons/quick_powder.png b/graphics/items/icons/quick_powder.png deleted file mode 100644 index fa56dcca7c..0000000000 Binary files a/graphics/items/icons/quick_powder.png and /dev/null differ diff --git a/graphics/items/icons/rage_candy_bar.png b/graphics/items/icons/rage_candy_bar.png index feb5b82cce..7d2e08cf8f 100644 Binary files a/graphics/items/icons/rage_candy_bar.png and b/graphics/items/icons/rage_candy_bar.png differ diff --git a/graphics/items/icons/rare_bone.png b/graphics/items/icons/rare_bone.png deleted file mode 100755 index eb5665a351..0000000000 Binary files a/graphics/items/icons/rare_bone.png and /dev/null differ diff --git a/graphics/items/icons/relic_band.png b/graphics/items/icons/relic_band.png index 902e04f7cc..83f44ee9cb 100644 Binary files a/graphics/items/icons/relic_band.png and b/graphics/items/icons/relic_band.png differ diff --git a/graphics/items/icons/relic_crown.png b/graphics/items/icons/relic_crown.png index 7511a2e081..2f8987e704 100644 Binary files a/graphics/items/icons/relic_crown.png and b/graphics/items/icons/relic_crown.png differ diff --git a/graphics/items/icons/relic_statue.png b/graphics/items/icons/relic_statue.png index 927aa4b8b8..0813c3b36b 100644 Binary files a/graphics/items/icons/relic_statue.png and b/graphics/items/icons/relic_statue.png differ diff --git a/graphics/items/icons/relic_vase.png b/graphics/items/icons/relic_vase.png index aa8698c1a2..ae46330342 100644 Binary files a/graphics/items/icons/relic_vase.png and b/graphics/items/icons/relic_vase.png differ diff --git a/graphics/items/icons/resist_feather.png b/graphics/items/icons/resist_feather.png deleted file mode 100644 index d717151621..0000000000 Binary files a/graphics/items/icons/resist_feather.png and /dev/null differ diff --git a/graphics/items/icons/ring_target.png b/graphics/items/icons/ring_target.png index 08b044df76..9a9c5ea3ef 100755 Binary files a/graphics/items/icons/ring_target.png and b/graphics/items/icons/ring_target.png differ diff --git a/graphics/items/icons/rock_gem.png b/graphics/items/icons/rock_gem.png deleted file mode 100644 index fdf634b730..0000000000 Binary files a/graphics/items/icons/rock_gem.png and /dev/null differ diff --git a/graphics/items/icons/sacred_ash.png b/graphics/items/icons/sacred_ash.png deleted file mode 100755 index ca9279539e..0000000000 Binary files a/graphics/items/icons/sacred_ash.png and /dev/null differ diff --git a/graphics/items/icons/sand.png b/graphics/items/icons/sand.png new file mode 100644 index 0000000000..86bcc9de6c Binary files /dev/null and b/graphics/items/icons/sand.png differ diff --git a/graphics/items/icons/shock_drive.png b/graphics/items/icons/shock_drive.png deleted file mode 100644 index 99f8e512c4..0000000000 Binary files a/graphics/items/icons/shock_drive.png and /dev/null differ diff --git a/graphics/items/icons/sky_plate.png b/graphics/items/icons/sky_plate.png deleted file mode 100644 index 0d2a910bca..0000000000 Binary files a/graphics/items/icons/sky_plate.png and /dev/null differ diff --git a/graphics/items/icons/soft_sand.png b/graphics/items/icons/soft_sand.png deleted file mode 100755 index 29a4fde0de..0000000000 Binary files a/graphics/items/icons/soft_sand.png and /dev/null differ diff --git a/graphics/items/icons/splash_plate.png b/graphics/items/icons/splash_plate.png deleted file mode 100644 index c75fe54736..0000000000 Binary files a/graphics/items/icons/splash_plate.png and /dev/null differ diff --git a/graphics/items/icons/spooky_plate.png b/graphics/items/icons/spooky_plate.png deleted file mode 100644 index d3dbfaf0c8..0000000000 Binary files a/graphics/items/icons/spooky_plate.png and /dev/null differ diff --git a/graphics/items/icons/stable_mulch.png b/graphics/items/icons/stable_mulch.png index be4369d07c..ae16559ac3 100644 Binary files a/graphics/items/icons/stable_mulch.png and b/graphics/items/icons/stable_mulch.png differ diff --git a/graphics/items/icons/stardust.png b/graphics/items/icons/stardust.png deleted file mode 100755 index 1f427cfbef..0000000000 Binary files a/graphics/items/icons/stardust.png and /dev/null differ diff --git a/graphics/items/icons/steel_gem.png b/graphics/items/icons/steel_gem.png deleted file mode 100644 index 65495811f3..0000000000 Binary files a/graphics/items/icons/steel_gem.png and /dev/null differ diff --git a/graphics/items/icons/stone_plate.png b/graphics/items/icons/stone_plate.png deleted file mode 100644 index 4aa9ba2848..0000000000 Binary files a/graphics/items/icons/stone_plate.png and /dev/null differ diff --git a/graphics/items/icons/swift_feather.png b/graphics/items/icons/swift_feather.png deleted file mode 100644 index 75af06017c..0000000000 Binary files a/graphics/items/icons/swift_feather.png and /dev/null differ diff --git a/graphics/items/icons/electric_seed.png b/graphics/items/icons/terrain_seed.png similarity index 100% rename from graphics/items/icons/electric_seed.png rename to graphics/items/icons/terrain_seed.png diff --git a/graphics/items/icons/toxic_plate.png b/graphics/items/icons/toxic_plate.png deleted file mode 100644 index f282c0f3a7..0000000000 Binary files a/graphics/items/icons/toxic_plate.png and /dev/null differ diff --git a/graphics/items/icons/type_gem.png b/graphics/items/icons/type_gem.png new file mode 100644 index 0000000000..22be66dcb4 Binary files /dev/null and b/graphics/items/icons/type_gem.png differ diff --git a/graphics/items/icons/ultranecrozium_z.png b/graphics/items/icons/ultranecrozium_z.png index 52e984598e..3b3278d594 100644 Binary files a/graphics/items/icons/ultranecrozium_z.png and b/graphics/items/icons/ultranecrozium_z.png differ diff --git a/graphics/items/icons/water_gem.png b/graphics/items/icons/water_gem.png deleted file mode 100644 index 555d92ccca..0000000000 Binary files a/graphics/items/icons/water_gem.png and /dev/null differ diff --git a/graphics/items/icons/white_apricorn.png b/graphics/items/icons/white_apricorn.png deleted file mode 100755 index 976779af70..0000000000 Binary files a/graphics/items/icons/white_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/wide_lens.png b/graphics/items/icons/wide_lens.png index dd1e92c2c2..6b91bb4404 100644 Binary files a/graphics/items/icons/wide_lens.png and b/graphics/items/icons/wide_lens.png differ diff --git a/graphics/items/icons/x_special_defense.png b/graphics/items/icons/x_special_defense.png deleted file mode 100755 index 18dd6d5cc8..0000000000 Binary files a/graphics/items/icons/x_special_defense.png and /dev/null differ diff --git a/graphics/items/icons/yellow_apricorn.png b/graphics/items/icons/yellow_apricorn.png deleted file mode 100755 index 293b4054f2..0000000000 Binary files a/graphics/items/icons/yellow_apricorn.png and /dev/null differ diff --git a/graphics/items/icons/yellow_nectar.png b/graphics/items/icons/yellow_nectar.png deleted file mode 100755 index c097f40926..0000000000 Binary files a/graphics/items/icons/yellow_nectar.png and /dev/null differ diff --git a/graphics/items/icons/z_power_ring.png b/graphics/items/icons/z_power_ring.png index addf901e15..9f0a952126 100644 Binary files a/graphics/items/icons/z_power_ring.png and b/graphics/items/icons/z_power_ring.png differ diff --git a/graphics/items/icons/zap_plate.png b/graphics/items/icons/zap_plate.png deleted file mode 100644 index 3e355ca995..0000000000 Binary files a/graphics/items/icons/zap_plate.png and /dev/null differ diff --git a/graphics/items/icons/zygarde_cube.png b/graphics/items/icons/zygarde_cube.png index b577dcecd8..16f67e765f 100644 Binary files a/graphics/items/icons/zygarde_cube.png and b/graphics/items/icons/zygarde_cube.png differ diff --git a/include/constants/heal_locations.h b/include/constants/heal_locations.h deleted file mode 100644 index 82392f8780..0000000000 --- a/include/constants/heal_locations.h +++ /dev/null @@ -1,36 +0,0 @@ -#ifndef GUARD_CONSTANTS_HEAL_LOCATIONS_H -#define GUARD_CONSTANTS_HEAL_LOCATIONS_H - -// -// DO NOT MODIFY THIS FILE! It is auto-generated from src/data/heal_locations.json and Inja template src/data/heal_locations.constants.json.txt -// - - -enum { - HEAL_LOCATION_NONE, - HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, - HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F, - HEAL_LOCATION_PETALBURG_CITY, - HEAL_LOCATION_SLATEPORT_CITY, - HEAL_LOCATION_MAUVILLE_CITY, - HEAL_LOCATION_RUSTBORO_CITY, - HEAL_LOCATION_FORTREE_CITY, - HEAL_LOCATION_LILYCOVE_CITY, - HEAL_LOCATION_MOSSDEEP_CITY, - HEAL_LOCATION_SOOTOPOLIS_CITY, - HEAL_LOCATION_EVER_GRANDE_CITY, - HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE, - HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE, - HEAL_LOCATION_OLDALE_TOWN, - HEAL_LOCATION_DEWFORD_TOWN, - HEAL_LOCATION_LAVARIDGE_TOWN, - HEAL_LOCATION_FALLARBOR_TOWN, - HEAL_LOCATION_VERDANTURF_TOWN, - HEAL_LOCATION_PACIFIDLOG_TOWN, - HEAL_LOCATION_EVER_GRANDE_CITY_POKEMON_LEAGUE, - HEAL_LOCATION_SOUTHERN_ISLAND_EXTERIOR, - HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST, - NUM_HEAL_LOCATIONS -}; - -#endif // GUARD_CONSTANTS_HEAL_LOCATIONS_H diff --git a/include/constants/script_commands.h b/include/constants/script_commands.h deleted file mode 100644 index 3d8fc459f1..0000000000 --- a/include/constants/script_commands.h +++ /dev/null @@ -1,241 +0,0 @@ -// -// DO NOT MODIFY THIS FILE! It is auto-generated by tools/misc/make_scr_cmd_constants.py -// -#ifndef GUARD_SCR_CMD_CONSTANTS_H -#define GUARD_SCR_CMD_CONSTANTS_H - -enum ScrOp -{ - SCR_OP_NOP = 0x0, - SCR_OP_NOP1 = 0x1, - SCR_OP_END = 0x2, - SCR_OP_RETURN = 0x3, - SCR_OP_CALL = 0x4, - SCR_OP_GOTO = 0x5, - SCR_OP_GOTO_IF = 0x6, - SCR_OP_CALL_IF = 0x7, - SCR_OP_GOTO_STD = 0x8, - SCR_OP_CALL_STD = 0x9, - SCR_OP_GOTO_STD_IF = 0xA, - SCR_OP_CALL_STD_IF = 0xB, - SCR_OP_RETURNRAM = 0xC, - SCR_OP_ENDRAM = 0xD, - SCR_OP_SETMYSTERYEVENTSTATUS = 0xE, - SCR_OP_LOAD_WORD = 0xF, - SCR_OP_LOAD_BYTE = 0x10, - SCR_OP_SETPTR = 0x11, - SCR_OP_LOADBYTEFROMPTR = 0x12, - SCR_OP_SETPTRBYTE = 0x13, - SCR_OP_COPYLOCAL = 0x14, - SCR_OP_COPYBYTE = 0x15, - SCR_OP_SETVAR = 0x16, - SCR_OP_ADDVAR = 0x17, - SCR_OP_SUBVAR = 0x18, - SCR_OP_COPYVAR = 0x19, - SCR_OP_SETORCOPYVAR = 0x1A, - SCR_OP_COMPARE_LOCAL_TO_LOCAL = 0x1B, - SCR_OP_COMPARE_LOCAL_TO_VALUE = 0x1C, - SCR_OP_COMPARE_LOCAL_TO_PTR = 0x1D, - SCR_OP_COMPARE_PTR_TO_LOCAL = 0x1E, - SCR_OP_COMPARE_PTR_TO_VALUE = 0x1F, - SCR_OP_COMPARE_PTR_TO_PTR = 0x20, - SCR_OP_COMPARE_VAR_TO_VALUE = 0x21, - SCR_OP_COMPARE_VAR_TO_VAR = 0x22, - SCR_OP_CALLNATIVE = 0x23, - SCR_OP_GOTONATIVE = 0x24, - SCR_OP_SPECIAL = 0x25, - SCR_OP_SPECIALVAR = 0x26, - SCR_OP_WAITSTATE = 0x27, - SCR_OP_DELAY = 0x28, - SCR_OP_SETFLAG = 0x29, - SCR_OP_CLEARFLAG = 0x2A, - SCR_OP_CHECKFLAG = 0x2B, - SCR_OP_INITCLOCK = 0x2C, - SCR_OP_DOTIMEBASEDEVENTS = 0x2D, - SCR_OP_GETTIME = 0x2E, - SCR_OP_PLAYSE = 0x2F, - SCR_OP_WAITSE = 0x30, - SCR_OP_PLAYFANFARE = 0x31, - SCR_OP_WAITFANFARE = 0x32, - SCR_OP_PLAYBGM = 0x33, - SCR_OP_SAVEBGM = 0x34, - SCR_OP_FADEDEFAULTBGM = 0x35, - SCR_OP_FADENEWBGM = 0x36, - SCR_OP_FADEOUTBGM = 0x37, - SCR_OP_FADEINBGM = 0x38, - SCR_OP_WARP = 0x39, - SCR_OP_WARPSILENT = 0x3A, - SCR_OP_WARPDOOR = 0x3B, - SCR_OP_WARPHOLE = 0x3C, - SCR_OP_WARPTELEPORT = 0x3D, - SCR_OP_SETWARP = 0x3E, - SCR_OP_SETDYNAMICWARP = 0x3F, - SCR_OP_SETDIVEWARP = 0x40, - SCR_OP_SETHOLEWARP = 0x41, - SCR_OP_GETPLAYERXY = 0x42, - SCR_OP_GETPARTYSIZE = 0x43, - SCR_OP_ADDITEM = 0x44, - SCR_OP_REMOVEITEM = 0x45, - SCR_OP_CHECKITEMSPACE = 0x46, - SCR_OP_CHECKITEM = 0x47, - SCR_OP_CHECKITEMTYPE = 0x48, - SCR_OP_ADDPCITEM = 0x49, - SCR_OP_CHECKPCITEM = 0x4A, - SCR_OP_ADDDECORATION = 0x4B, - SCR_OP_REMOVEDECORATION = 0x4C, - SCR_OP_CHECKDECOR = 0x4D, - SCR_OP_CHECKDECORSPACE = 0x4E, - SCR_OP_APPLYMOVEMENT = 0x4F, - SCR_OP_APPLYMOVEMENTAT = 0x50, - SCR_OP_WAITMOVEMENT = 0x51, - SCR_OP_WAITMOVEMENTAT = 0x52, - SCR_OP_REMOVEOBJECT = 0x53, - SCR_OP_REMOVEOBJECTAT = 0x54, - SCR_OP_ADDOBJECT = 0x55, - SCR_OP_ADDOBJECTAT = 0x56, - SCR_OP_SETOBJECTXY = 0x57, - SCR_OP_SHOWOBJECTAT = 0x58, - SCR_OP_HIDEOBJECTAT = 0x59, - SCR_OP_FACEPLAYER = 0x5A, - SCR_OP_TURNOBJECT = 0x5B, - SCR_OP_TRAINERBATTLE = 0x5C, - SCR_OP_DOTRAINERBATTLE = 0x5D, - SCR_OP_GOTOPOSTBATTLESCRIPT = 0x5E, - SCR_OP_GOTOBEATENSCRIPT = 0x5F, - SCR_OP_CHECKTRAINERFLAG = 0x60, - SCR_OP_SETTRAINERFLAG = 0x61, - SCR_OP_CLEARTRAINERFLAG = 0x62, - SCR_OP_SETOBJECTXYPERM = 0x63, - SCR_OP_COPYOBJECTXYTOPERM = 0x64, - SCR_OP_SETOBJECTMOVEMENTTYPE = 0x65, - SCR_OP_WAITMESSAGE = 0x66, - SCR_OP_MESSAGE = 0x67, - SCR_OP_CLOSEMESSAGE = 0x68, - SCR_OP_LOCKALL = 0x69, - SCR_OP_LOCK = 0x6A, - SCR_OP_RELEASEALL = 0x6B, - SCR_OP_RELEASE = 0x6C, - SCR_OP_WAITBUTTONPRESS = 0x6D, - SCR_OP_YESNOBOX = 0x6E, - SCR_OP_MULTICHOICE = 0x6F, - SCR_OP_MULTICHOICEDEFAULT = 0x70, - SCR_OP_MULTICHOICEGRID = 0x71, - SCR_OP_DRAWBOX = 0x72, - SCR_OP_ERASEBOX = 0x73, - SCR_OP_DRAWBOXTEXT = 0x74, - SCR_OP_SHOWMONPIC = 0x75, - SCR_OP_HIDEMONPIC = 0x76, - SCR_OP_SHOWCONTESTPAINTING = 0x77, - SCR_OP_BRAILLEMESSAGE = 0x78, - SCR_OP_GIVEMON = 0x79, - SCR_OP_GIVEEGG = 0x7A, - SCR_OP_SETMONMOVE = 0x7B, - SCR_OP_CHECKFIELDMOVE = 0x7C, - SCR_OP_BUFFERSPECIESNAME = 0x7D, - SCR_OP_BUFFERLEADMONSPECIESNAME = 0x7E, - SCR_OP_BUFFERPARTYMONNICK = 0x7F, - SCR_OP_BUFFERITEMNAME = 0x80, - SCR_OP_BUFFERDECORATIONNAME = 0x81, - SCR_OP_BUFFERMOVENAME = 0x82, - SCR_OP_BUFFERNUMBERSTRING = 0x83, - SCR_OP_BUFFERSTDSTRING = 0x84, - SCR_OP_BUFFERSTRING = 0x85, - SCR_OP_POKEMART = 0x86, - SCR_OP_POKEMARTDECORATION = 0x87, - SCR_OP_POKEMARTDECORATION2 = 0x88, - SCR_OP_PLAYSLOTMACHINE = 0x89, - SCR_OP_SETBERRYTREE = 0x8A, - SCR_OP_CHOOSECONTESTMON = 0x8B, - SCR_OP_STARTCONTEST = 0x8C, - SCR_OP_SHOWCONTESTRESULTS = 0x8D, - SCR_OP_CONTESTLINKTRANSFER = 0x8E, - SCR_OP_RANDOM = 0x8F, - SCR_OP_ADDMONEY = 0x90, - SCR_OP_REMOVEMONEY = 0x91, - SCR_OP_CHECKMONEY = 0x92, - SCR_OP_SHOWMONEYBOX = 0x93, - SCR_OP_HIDEMONEYBOX = 0x94, - SCR_OP_UPDATEMONEYBOX = 0x95, - SCR_OP_GETPOKENEWSACTIVE = 0x96, - SCR_OP_FADESCREEN = 0x97, - SCR_OP_FADESCREENSPEED = 0x98, - SCR_OP_SETFLASHLEVEL = 0x99, - SCR_OP_ANIMATEFLASH = 0x9A, - SCR_OP_MESSAGEAUTOSCROLL = 0x9B, - SCR_OP_DOFIELDEFFECT = 0x9C, - SCR_OP_SETFIELDEFFECTARGUMENT = 0x9D, - SCR_OP_WAITFIELDEFFECT = 0x9E, - SCR_OP_SETRESPAWN = 0x9F, - SCR_OP_CHECKPLAYERGENDER = 0xA0, - SCR_OP_PLAYMONCRY = 0xA1, - SCR_OP_SETMETATILE = 0xA2, - SCR_OP_RESETWEATHER = 0xA3, - SCR_OP_SETWEATHER = 0xA4, - SCR_OP_DOWEATHER = 0xA5, - SCR_OP_SETSTEPCALLBACK = 0xA6, - SCR_OP_SETMAPLAYOUTINDEX = 0xA7, - SCR_OP_SETOBJECTSUBPRIORITY = 0xA8, - SCR_OP_RESETOBJECTSUBPRIORITY = 0xA9, - SCR_OP_CREATEVOBJECT = 0xAA, - SCR_OP_TURNVOBJECT = 0xAB, - SCR_OP_OPENDOOR = 0xAC, - SCR_OP_CLOSEDOOR = 0xAD, - SCR_OP_WAITDOORANIM = 0xAE, - SCR_OP_SETDOOROPEN = 0xAF, - SCR_OP_SETDOORCLOSED = 0xB0, - SCR_OP_ADDELEVMENUITEM = 0xB1, - SCR_OP_SHOWELEVMENU = 0xB2, - SCR_OP_CHECKCOINS = 0xB3, - SCR_OP_ADDCOINS = 0xB4, - SCR_OP_REMOVECOINS = 0xB5, - SCR_OP_SETWILDBATTLE = 0xB6, - SCR_OP_DOWILDBATTLE = 0xB7, - SCR_OP_SETVADDRESS = 0xB8, - SCR_OP_VGOTO = 0xB9, - SCR_OP_VCALL = 0xBA, - SCR_OP_VGOTO_IF = 0xBB, - SCR_OP_VCALL_IF = 0xBC, - SCR_OP_VMESSAGE = 0xBD, - SCR_OP_VBUFFERMESSAGE = 0xBE, - SCR_OP_VBUFFERSTRING = 0xBF, - SCR_OP_SHOWCOINSBOX = 0xC0, - SCR_OP_HIDECOINSBOX = 0xC1, - SCR_OP_UPDATECOINSBOX = 0xC2, - SCR_OP_INCREMENTGAMESTAT = 0xC3, - SCR_OP_SETESCAPEWARP = 0xC4, - SCR_OP_WAITMONCRY = 0xC5, - SCR_OP_BUFFERBOXNAME = 0xC6, - SCR_OP_TEXTCOLOR = 0xC7, - SCR_OP_LOADHELP = 0xC8, - SCR_OP_UNLOADHELP = 0xC9, - SCR_OP_SIGNMSG = 0xCA, - SCR_OP_NORMALMSG = 0xCB, - SCR_OP_COMPAREHIDDENVAR = 0xCC, - SCR_OP_SETMODERNFATEFULENCOUNTER = 0xCD, - SCR_OP_CHECKMODERNFATEFULENCOUNTER = 0xCE, - SCR_OP_TRYWONDERCARDSCRIPT = 0xCF, - SCR_OP_SETWORLDMAPFLAG = 0xD0, - SCR_OP_WARPSPINENTER = 0xD1, - SCR_OP_SETMONMETLOCATION = 0xD2, - SCR_OP_MOVEROTATINGTILEOBJECTS = 0xD3, - SCR_OP_TURNROTATINGTILEOBJECTS = 0xD4, - SCR_OP_INITROTATINGTILEPUZZLE = 0xD5, - SCR_OP_FREEROTATINGTILEPUZZLE = 0xD6, - SCR_OP_WARPMOSSDEEPGYM = 0xD7, - SCR_OP_SELECTAPPROACHINGTRAINER = 0xD8, - SCR_OP_LOCKFORTRAINER = 0xD9, - SCR_OP_CLOSEBRAILLEMESSAGE = 0xDA, - SCR_OP_MESSAGEINSTANT = 0xDB, - SCR_OP_FADESCREENSWAPBUFFERS = 0xDC, - SCR_OP_BUFFERTRAINERCLASSNAME = 0xDD, - SCR_OP_BUFFERTRAINERNAME = 0xDE, - SCR_OP_POKENAVCALL = 0xDF, - SCR_OP_WARPWHITEFADE = 0xE0, - SCR_OP_BUFFERCONTESTNAME = 0xE1, - SCR_OP_BUFFERITEMNAMEPLURAL = 0xE2, - SCR_OP_DYNMULTICHOICE = 0xE3, - SCR_OP_DYNMULTIPUSH = 0xE4, - SCR_OP_HIDEFOLLOWER = 0xE5, -}; - -#endif // GUARD_SCR_CMD_CONSTANTS_H diff --git a/include/graphics.h b/include/graphics.h index bc168e39a1..8ee6cfb667 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -373,6 +373,7 @@ extern const u16 gItemIconPalette_UltraBall[]; extern const u32 gItemIcon_MasterBall[]; extern const u16 gItemIconPalette_MasterBall[]; extern const u32 gItemIcon_PremierBall[]; +extern const u16 gItemIconPalette_PremierBall[]; extern const u32 gItemIcon_HealBall[]; extern const u16 gItemIconPalette_HealBall[]; extern const u32 gItemIcon_NetBall[]; @@ -442,7 +443,6 @@ extern const u16 gItemIconPalette_EnergyRoot[]; extern const u16 gItemIconPalette_HealPowder[]; extern const u32 gItemIcon_RevivalHerb[]; extern const u16 gItemIconPalette_RevivalHerb[]; -extern const u32 gItemIcon_Antidote[]; extern const u16 gItemIconPalette_Antidote[]; extern const u32 gItemIcon_StatusHeal[]; extern const u16 gItemIconPalette_ParalyzeHeal[]; @@ -458,7 +458,6 @@ extern const u16 gItemIconPalette_Elixir[]; extern const u16 gItemIconPalette_MaxElixir[]; extern const u32 gItemIcon_BerryJuice[]; extern const u16 gItemIconPalette_BerryJuice[]; -extern const u32 gItemIcon_SacredAsh[]; extern const u16 gItemIconPalette_SacredAsh[]; extern const u32 gItemIcon_SweetHeart[]; extern const u16 gItemIconPalette_SweetHeart[]; @@ -495,17 +494,12 @@ extern const u16 gItemIconPalette_PPUp[]; extern const u32 gItemIcon_PPMax[]; extern const u16 gItemIconPalette_PPMax[]; // EV Feathers -extern const u32 gItemIcon_HealthFeather[]; +extern const u32 gItemIcon_EVFeather[]; extern const u16 gItemIconPalette_HealthFeather[]; -extern const u32 gItemIcon_MuscleFeather[]; extern const u16 gItemIconPalette_MuscleFeather[]; -extern const u32 gItemIcon_ResistFeather[]; extern const u16 gItemIconPalette_ResistFeather[]; -extern const u32 gItemIcon_GeniusFeather[]; extern const u16 gItemIconPalette_GeniusFeather[]; -extern const u32 gItemIcon_CleverFeather[]; extern const u16 gItemIconPalette_CleverFeather[]; -extern const u32 gItemIcon_SwiftFeather[]; extern const u16 gItemIconPalette_SwiftFeather[]; // Ability Modifiers extern const u32 gItemIcon_AbilityCapsule[]; @@ -555,7 +549,6 @@ extern const u32 gItemIcon_BattleStatItem[]; extern const u16 gItemIconPalette_XAttack[]; extern const u16 gItemIconPalette_XDefend[]; extern const u16 gItemIconPalette_XSpecial[]; -extern const u32 gItemIcon_XSpecialDefense[]; extern const u16 gItemIconPalette_XSpecialDefense[]; extern const u16 gItemIconPalette_XSpeed[]; extern const u16 gItemIconPalette_XAccuracy[]; @@ -588,10 +581,8 @@ extern const u16 gItemIconPalette_Pearl[]; extern const u32 gItemIcon_BigPearl[]; extern const u32 gItemIcon_PearlString[]; extern const u16 gItemIconPalette_PearlString[]; -extern const u32 gItemIcon_Stardust[]; -extern const u16 gItemIconPalette_Star[]; extern const u32 gItemIcon_StarPiece[]; -extern const u32 gItemIcon_CometShard[]; +extern const u16 gItemIconPalette_Star[]; extern const u16 gItemIconPalette_CometShard[]; extern const u16 gItemIconPalette_ShoalSalt[]; extern const u32 gItemIcon_ShoalShell[]; @@ -605,8 +596,6 @@ extern const u32 gItemIcon_HeartScale[]; extern const u16 gItemIconPalette_HeartScale[]; extern const u32 gItemIcon_Honey[]; extern const u16 gItemIconPalette_Honey[]; -extern const u32 gItemIcon_RareBone[]; -extern const u16 gItemIconPalette_RareBone[]; extern const u32 gItemIcon_OddKeystone[]; extern const u16 gItemIconPalette_OddKeystone[]; extern const u32 gItemIcon_PrettyFeather[]; @@ -663,19 +652,13 @@ extern const u16 gItemIconPalette_SurpriseMulch[]; extern const u16 gItemIconPalette_BoostMulch[]; extern const u16 gItemIconPalette_AmazeMulch[]; // Apricorns -extern const u32 gItemIcon_RedApricorn[]; +extern const u32 gItemIcon_Apricorn[]; extern const u16 gItemIconPalette_RedApricorn[]; -extern const u32 gItemIcon_BlueApricorn[]; extern const u16 gItemIconPalette_BlueApricorn[]; -extern const u32 gItemIcon_YellowApricorn[]; extern const u16 gItemIconPalette_YellowApricorn[]; -extern const u32 gItemIcon_GreenApricorn[]; extern const u16 gItemIconPalette_GreenApricorn[]; -extern const u32 gItemIcon_PinkApricorn[]; extern const u16 gItemIconPalette_PinkApricorn[]; -extern const u32 gItemIcon_WhiteApricorn[]; extern const u16 gItemIconPalette_WhiteApricorn[]; -extern const u32 gItemIcon_BlackApricorn[]; extern const u16 gItemIconPalette_BlackApricorn[]; extern const u32 gItemIcon_WishingPiece[]; extern const u16 gItemIconPalette_WishingPiece[]; @@ -793,57 +776,35 @@ extern const u16 gItemIconPalette_MasterpieceTeacup[]; extern const u32 gItemIcon_MetalAlloy[]; extern const u16 gItemIconPalette_MetalAlloy[]; // Nectars -extern const u32 gItemIcon_RedNectar[]; +extern const u32 gItemIcon_Nectar[]; extern const u16 gItemIconPalette_RedNectar[]; -extern const u32 gItemIcon_YellowNectar[]; extern const u16 gItemIconPalette_YellowNectar[]; -extern const u32 gItemIcon_PinkNectar[]; extern const u16 gItemIconPalette_PinkNectar[]; -extern const u32 gItemIcon_PurpleNectar[]; extern const u16 gItemIconPalette_PurpleNectar[]; // Plates -extern const u32 gItemIcon_FlamePlate[]; +extern const u32 gItemIcon_Plate[]; extern const u16 gItemIconPalette_FlamePlate[]; -extern const u32 gItemIcon_SplashPlate[]; extern const u16 gItemIconPalette_SplashPlate[]; -extern const u32 gItemIcon_ZapPlate[]; extern const u16 gItemIconPalette_ZapPlate[]; -extern const u32 gItemIcon_MeadowPlate[]; extern const u16 gItemIconPalette_MeadowPlate[]; -extern const u32 gItemIcon_IciclePlate[]; extern const u16 gItemIconPalette_IciclePlate[]; -extern const u32 gItemIcon_FistPlate[]; extern const u16 gItemIconPalette_FistPlate[]; -extern const u32 gItemIcon_ToxicPlate[]; extern const u16 gItemIconPalette_ToxicPlate[]; -extern const u32 gItemIcon_EarthPlate[]; extern const u16 gItemIconPalette_EarthPlate[]; -extern const u32 gItemIcon_SkyPlate[]; extern const u16 gItemIconPalette_SkyPlate[]; -extern const u32 gItemIcon_MindPlate[]; extern const u16 gItemIconPalette_MindPlate[]; -extern const u32 gItemIcon_InsectPlate[]; extern const u16 gItemIconPalette_InsectPlate[]; -extern const u32 gItemIcon_StonePlate[]; extern const u16 gItemIconPalette_StonePlate[]; -extern const u32 gItemIcon_SpookyPlate[]; extern const u16 gItemIconPalette_SpookyPlate[]; -extern const u32 gItemIcon_DracoPlate[]; extern const u16 gItemIconPalette_DracoPlate[]; -extern const u32 gItemIcon_DreadPlate[]; extern const u16 gItemIconPalette_DreadPlate[]; -extern const u32 gItemIcon_IronPlate[]; extern const u16 gItemIconPalette_IronPlate[]; -extern const u32 gItemIcon_PixiePlate[]; extern const u16 gItemIconPalette_PixiePlate[]; // Drives -extern const u32 gItemIcon_DouseDrive[]; +extern const u32 gItemIcon_Drive[]; extern const u16 gItemIconPalette_DouseDrive[]; -extern const u32 gItemIcon_ShockDrive[]; extern const u16 gItemIconPalette_ShockDrive[]; -extern const u32 gItemIcon_BurnDrive[]; extern const u16 gItemIconPalette_BurnDrive[]; -extern const u32 gItemIcon_ChillDrive[]; extern const u16 gItemIconPalette_ChillDrive[]; // Memories extern const u32 gItemIcon_FireMemory[]; @@ -984,41 +945,24 @@ extern const u16 gItemIconPalette_Audinite[]; extern const u32 gItemIcon_Diancite[]; extern const u16 gItemIconPalette_Diancite[]; // Gems -extern const u32 gItemIcon_NormalGem[]; +extern const u32 gItemIcon_TypeGem[]; extern const u16 gItemIconPalette_NormalGem[]; -extern const u32 gItemIcon_FireGem[]; extern const u16 gItemIconPalette_FireGem[]; -extern const u32 gItemIcon_WaterGem[]; extern const u16 gItemIconPalette_WaterGem[]; -extern const u32 gItemIcon_ElectricGem[]; extern const u16 gItemIconPalette_ElectricGem[]; -extern const u32 gItemIcon_GrassGem[]; extern const u16 gItemIconPalette_GrassGem[]; -extern const u32 gItemIcon_IceGem[]; extern const u16 gItemIconPalette_IceGem[]; -extern const u32 gItemIcon_FightingGem[]; extern const u16 gItemIconPalette_FightingGem[]; -extern const u32 gItemIcon_PoisonGem[]; extern const u16 gItemIconPalette_PoisonGem[]; -extern const u32 gItemIcon_GroundGem[]; extern const u16 gItemIconPalette_GroundGem[]; -extern const u32 gItemIcon_FlyingGem[]; extern const u16 gItemIconPalette_FlyingGem[]; -extern const u32 gItemIcon_PsychicGem[]; extern const u16 gItemIconPalette_PsychicGem[]; -extern const u32 gItemIcon_BugGem[]; extern const u16 gItemIconPalette_BugGem[]; -extern const u32 gItemIcon_RockGem[]; extern const u16 gItemIconPalette_RockGem[]; -extern const u32 gItemIcon_GhostGem[]; extern const u16 gItemIconPalette_GhostGem[]; -extern const u32 gItemIcon_DragonGem[]; extern const u16 gItemIconPalette_DragonGem[]; -extern const u32 gItemIcon_DarkGem[]; extern const u16 gItemIconPalette_DarkGem[]; -extern const u32 gItemIcon_SteelGem[]; extern const u16 gItemIconPalette_SteelGem[]; -extern const u32 gItemIcon_FairyGem[]; extern const u16 gItemIconPalette_FairyGem[]; // Z-Crystals extern const u32 gItemIcon_NormaliumZ[]; @@ -1096,13 +1040,12 @@ extern const u32 gItemIcon_LightBall[]; extern const u16 gItemIconPalette_LightBall[]; extern const u32 gItemIcon_Leek[]; extern const u16 gItemIconPalette_Leek[]; -extern const u32 gItemIcon_ThickClub[]; -extern const u16 gItemIconPalette_ThickClub[]; +extern const u32 gItemIcon_Bone[]; +extern const u16 gItemIconPalette_Bone[]; extern const u32 gItemIcon_LuckyPunch[]; extern const u16 gItemIconPalette_LuckyPunch[]; -extern const u32 gItemIcon_MetalPowder[]; +extern const u32 gItemIcon_DittoPowder[]; extern const u16 gItemIconPalette_MetalPowder[]; -extern const u32 gItemIcon_QuickPowder[]; extern const u16 gItemIconPalette_QuickPowder[]; extern const u32 gItemIcon_DeepSeaScale[]; extern const u16 gItemIconPalette_DeepSeaScale[]; @@ -1174,7 +1117,7 @@ extern const u32 gItemIcon_BlackBelt[]; extern const u16 gItemIconPalette_BlackTypeEnhancingItem[]; extern const u32 gItemIcon_PoisonBarb[]; extern const u16 gItemIconPalette_PoisonBarb[]; -extern const u32 gItemIcon_SoftSand[]; +extern const u32 gItemIcon_Sand[]; extern const u16 gItemIconPalette_SoftSand[]; extern const u32 gItemIcon_SharpBeak[]; extern const u16 gItemIconPalette_SharpBeak[]; @@ -1213,13 +1156,10 @@ extern const u16 gItemIconPalette_SmoothRock[]; extern const u32 gItemIcon_IcyRock[]; extern const u16 gItemIconPalette_IcyRock[]; // Terrain Seeds -extern const u32 gItemIcon_ElectricSeed[]; +extern const u32 gItemIcon_TerrainSeed[]; extern const u16 gItemIconPalette_ElectricSeed[]; -extern const u32 gItemIcon_PsychicSeed[]; extern const u16 gItemIconPalette_PsychicSeed[]; -extern const u32 gItemIcon_MistySeed[]; extern const u16 gItemIconPalette_MistySeed[]; -extern const u32 gItemIcon_GrassySeed[]; extern const u16 gItemIconPalette_GrassySeed[]; // Type-activated Stat Modifiers extern const u32 gItemIcon_AbsorbBulb[]; diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index b3fe626e8c..20dd6f9f5d 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -568,8 +568,8 @@ bool32 MovesWithCategoryUnusable(u32 attacker, u32 target, enum DamageCategory c ctx.updateFlags = FALSE; ctx.abilityAtk = gAiLogicData->abilities[attacker]; ctx.abilityDef = gAiLogicData->abilities[target]; - ctx.holdEffectAtk = gAiLogicData->items[attacker]; - ctx.holdEffectDef = gAiLogicData->items[target]; + ctx.holdEffectAtk = gAiLogicData->holdEffects[attacker]; + ctx.holdEffectDef = gAiLogicData->holdEffects[target]; for (u32 moveIndex = 0; moveIndex < MAX_MON_MOVES; moveIndex++) { @@ -1413,8 +1413,8 @@ uq4_12_t AI_GetMoveEffectiveness(enum Move move, u32 battlerAtk, u32 battlerDef) ctx.updateFlags = FALSE; ctx.abilityAtk = gAiLogicData->abilities[battlerAtk]; ctx.abilityDef = gAiLogicData->abilities[battlerDef]; - ctx.holdEffectAtk = gAiLogicData->items[battlerAtk]; - ctx.holdEffectDef = gAiLogicData->items[battlerDef]; + ctx.holdEffectAtk = gAiLogicData->holdEffects[battlerAtk]; + ctx.holdEffectDef = gAiLogicData->holdEffects[battlerDef]; typeEffectiveness = CalcTypeEffectivenessMultiplier(&ctx); RestoreBattlerData(battlerAtk); diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 9e1d48b25d..c172387e28 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -1762,7 +1762,7 @@ static void MoveSelectionDisplayMoveDescription(u32 battler) u8 acc_desc[7] = _("ACC: "); u8 cat_start[] = _("{CLEAR_TO 0x03}"); u8 pwr_start[] = _("{CLEAR_TO 0x38}"); - u8 acc_start[] = _("{CLEAR_TO 0x6D}"); + u8 acc_start[] = _("{CLEAR_TO 0x6C}"); LoadMessageBoxAndBorderGfx(); DrawStdWindowFrame(B_WIN_MOVE_DESCRIPTION, FALSE); if (pwr < 2) diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 4b1116148f..113119f09f 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -1270,10 +1270,13 @@ void SpriteCB_EnemyShadow(struct Sprite *shadowSprite) } else if (transformSpecies != SPECIES_NONE) { - xOffset = gSpeciesInfo[transformSpecies].enemyShadowXOffset + (shadowSprite->tSpriteSide == SPRITE_SIDE_LEFT ? -16 : 16); + xOffset = gSpeciesInfo[transformSpecies].enemyShadowXOffset; yOffset = gSpeciesInfo[transformSpecies].enemyShadowYOffset + 16; size = gSpeciesInfo[transformSpecies].enemyShadowSize; + if (B_ENEMY_MON_SHADOW_STYLE >= GEN_4) + xOffset += (shadowSprite->tSpriteSide == SPRITE_SIDE_LEFT ? -16 : 16); + invisible = (B_ENEMY_MON_SHADOW_STYLE >= GEN_4 && P_GBA_STYLE_SPECIES_GFX == FALSE) ? gSpeciesInfo[transformSpecies].suppressEnemyShadow : gSpeciesInfo[transformSpecies].enemyMonElevation == 0; diff --git a/src/battle_util.c b/src/battle_util.c index 6d16362fb6..7b958bf53d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -8040,24 +8040,6 @@ static inline u32 CalcMoveBasePowerAfterModifiers(struct BattleContext *ctx) if (moveType == TYPE_FIRE) modifier = uq4_12_multiply(modifier, UQ_4_12(1.25)); break; - case ABILITY_PROTOSYNTHESIS: - { - enum Stat defHighestStat = GetParadoxBoostedStatId(battlerDef); - if ((ctx->weather & B_WEATHER_SUN || gBattleMons[battlerDef].volatiles.boosterEnergyActivated) - && ((IsBattleMovePhysical(move) && defHighestStat == STAT_DEF) || (IsBattleMoveSpecial(move) && defHighestStat == STAT_SPDEF)) - && !(gBattleMons[battlerDef].volatiles.transformed)) - modifier = uq4_12_multiply(modifier, UQ_4_12(0.7)); - } - break; - case ABILITY_QUARK_DRIVE: - { - u32 defHighestStat = GetParadoxBoostedStatId(battlerDef); - if ((ctx->fieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN || gBattleMons[battlerDef].volatiles.boosterEnergyActivated) - && ((IsBattleMovePhysical(move) && defHighestStat == STAT_DEF) || (IsBattleMoveSpecial(move) && defHighestStat == STAT_SPDEF)) - && !(gBattleMons[battlerDef].volatiles.transformed)) - modifier = uq4_12_multiply(modifier, UQ_4_12(0.7)); - } - break; default: break; } @@ -8563,6 +8545,24 @@ static inline u32 CalcDefenseStat(struct BattleContext *ctx) if (gBattleMons[battlerDef].species == SPECIES_CHERRIM_SUNSHINE && IsBattlerWeatherAffected(battlerDef, B_WEATHER_SUN) && !usesDefStat) modifier = uq4_12_multiply_half_down(modifier, UQ_4_12(1.5)); break; + case ABILITY_PROTOSYNTHESIS: + { + enum Stat defHighestStat = GetParadoxBoostedStatId(battlerDef); + if (((ctx->weather & B_WEATHER_SUN && HasWeatherEffect()) || gBattleMons[battlerDef].volatiles.boosterEnergyActivated) + && ((IsBattleMovePhysical(move) && defHighestStat == STAT_DEF) || (IsBattleMoveSpecial(move) && defHighestStat == STAT_SPDEF)) + && !(gBattleMons[battlerDef].volatiles.transformed)) + modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); + } + break; + case ABILITY_QUARK_DRIVE: + { + u32 defHighestStat = GetParadoxBoostedStatId(battlerDef); + if ((gFieldStatuses & STATUS_FIELD_ELECTRIC_TERRAIN || gBattleMons[battlerDef].volatiles.boosterEnergyActivated) + && ((IsBattleMovePhysical(move) && defHighestStat == STAT_DEF) || (IsBattleMoveSpecial(move) && defHighestStat == STAT_SPDEF)) + && !(gBattleMons[battlerDef].volatiles.transformed)) + modifier = uq4_12_multiply(modifier, UQ_4_12(1.3)); + } + break; default: break; } diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 31a78d8c6b..e6bd7e8d67 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -21,7 +21,8 @@ const u16 gItemIconPalette_UltraBall[] = INCBIN_U16("graphics/items/icon_palette const u32 gItemIcon_MasterBall[] = INCBIN_U32("graphics/items/icons/master_ball.4bpp.smol"); const u16 gItemIconPalette_MasterBall[] = INCBIN_U16("graphics/items/icon_palettes/master_ball.gbapal"); -const u32 gItemIcon_PremierBall[] = INCBIN_U32("graphics/items/icons/premier_ball.4bpp.smol"); +const u32 gItemIcon_PremierBall[] = INCBIN_U16("graphics/items/icons/premier_ball.4bpp.smol"); +const u16 gItemIconPalette_PremierBall[] = INCBIN_U16("graphics/items/icon_palettes/premier_ball.gbapal"); const u32 gItemIcon_HealBall[] = INCBIN_U32("graphics/items/icons/heal_ball.4bpp.smol"); const u16 gItemIconPalette_HealBall[] = INCBIN_U16("graphics/items/icon_palettes/heal_ball.gbapal"); @@ -130,7 +131,6 @@ const u16 gItemIconPalette_HealPowder[] = INCBIN_U16("graphics/items/icon_palett const u32 gItemIcon_RevivalHerb[] = INCBIN_U32("graphics/items/icons/revival_herb.4bpp.smol"); const u16 gItemIconPalette_RevivalHerb[] = INCBIN_U16("graphics/items/icon_palettes/revival_herb.gbapal"); -const u32 gItemIcon_Antidote[] = INCBIN_U32("graphics/items/icons/antidote.4bpp.smol"); const u16 gItemIconPalette_Antidote[] = INCBIN_U16("graphics/items/icon_palettes/antidote.gbapal"); const u32 gItemIcon_StatusHeal[] = INCBIN_U32("graphics/items/icons/status_heal.4bpp.smol"); @@ -157,7 +157,6 @@ const u16 gItemIconPalette_MaxElixir[] = INCBIN_U16("graphics/items/icon_palette const u32 gItemIcon_BerryJuice[] = INCBIN_U32("graphics/items/icons/berry_juice.4bpp.smol"); const u16 gItemIconPalette_BerryJuice[] = INCBIN_U16("graphics/items/icon_palettes/berry_juice.gbapal"); -const u32 gItemIcon_SacredAsh[] = INCBIN_U32("graphics/items/icons/sacred_ash.4bpp.smol"); const u16 gItemIconPalette_SacredAsh[] = INCBIN_U16("graphics/items/icon_palettes/sacred_ash.gbapal"); const u32 gItemIcon_SweetHeart[] = INCBIN_U32("graphics/items/icons/sweet_heart.4bpp.smol"); @@ -216,22 +215,12 @@ const u16 gItemIconPalette_PPMax[] = INCBIN_U16("graphics/items/icon_palettes/pp // EV Feathers -const u32 gItemIcon_HealthFeather[] = INCBIN_U32("graphics/items/icons/health_feather.4bpp.smol"); +const u32 gItemIcon_EVFeather[] = INCBIN_U32("graphics/items/icons/ev_feather.4bpp.smol"); const u16 gItemIconPalette_HealthFeather[] = INCBIN_U16("graphics/items/icon_palettes/health_feather.gbapal"); - -const u32 gItemIcon_MuscleFeather[] = INCBIN_U32("graphics/items/icons/muscle_feather.4bpp.smol"); const u16 gItemIconPalette_MuscleFeather[] = INCBIN_U16("graphics/items/icon_palettes/muscle_feather.gbapal"); - -const u32 gItemIcon_ResistFeather[] = INCBIN_U32("graphics/items/icons/resist_feather.4bpp.smol"); const u16 gItemIconPalette_ResistFeather[] = INCBIN_U16("graphics/items/icon_palettes/resist_feather.gbapal"); - -const u32 gItemIcon_GeniusFeather[] = INCBIN_U32("graphics/items/icons/genius_feather.4bpp.smol"); const u16 gItemIconPalette_GeniusFeather[] = INCBIN_U16("graphics/items/icon_palettes/genius_feather.gbapal"); - -const u32 gItemIcon_CleverFeather[] = INCBIN_U32("graphics/items/icons/clever_feather.4bpp.smol"); const u16 gItemIconPalette_CleverFeather[] = INCBIN_U16("graphics/items/icon_palettes/clever_feather.gbapal"); - -const u32 gItemIcon_SwiftFeather[] = INCBIN_U32("graphics/items/icons/swift_feather.4bpp.smol"); const u16 gItemIconPalette_SwiftFeather[] = INCBIN_U16("graphics/items/icon_palettes/swift_feather.gbapal"); // Ability Modifiers @@ -303,20 +292,12 @@ const u16 gItemIconPalette_EscapeRope[] = INCBIN_U16("graphics/items/icon_palett const u32 gItemIcon_BattleStatItem[] = INCBIN_U32("graphics/items/icons/battle_stat_item.4bpp.smol"); const u16 gItemIconPalette_XAttack[] = INCBIN_U16("graphics/items/icon_palettes/x_attack.gbapal"); - const u16 gItemIconPalette_XDefend[] = INCBIN_U16("graphics/items/icon_palettes/x_defend.gbapal"); - const u16 gItemIconPalette_XSpecial[] = INCBIN_U16("graphics/items/icon_palettes/x_special.gbapal"); - -const u32 gItemIcon_XSpecialDefense[] = INCBIN_U32("graphics/items/icons/x_special_defense.4bpp.smol"); const u16 gItemIconPalette_XSpecialDefense[] = INCBIN_U16("graphics/items/icon_palettes/x_special_defense.gbapal"); - const u16 gItemIconPalette_XSpeed[] = INCBIN_U16("graphics/items/icon_palettes/x_speed.gbapal"); - const u16 gItemIconPalette_XAccuracy[] = INCBIN_U16("graphics/items/icon_palettes/x_accuracy.gbapal"); - const u16 gItemIconPalette_DireHit[] = INCBIN_U16("graphics/items/icon_palettes/dire_hit.gbapal"); - const u16 gItemIconPalette_GuardSpec[] = INCBIN_U16("graphics/items/icon_palettes/guard_spec.gbapal"); // Escape Items @@ -361,12 +342,8 @@ const u32 gItemIcon_BigPearl[] = INCBIN_U32("graphics/items/icons/big_pearl.4bpp const u32 gItemIcon_PearlString[] = INCBIN_U32("graphics/items/icons/pearl_string.4bpp.smol"); const u16 gItemIconPalette_PearlString[] = INCBIN_U16("graphics/items/icon_palettes/pearl_string.gbapal"); -const u32 gItemIcon_Stardust[] = INCBIN_U32("graphics/items/icons/stardust.4bpp.smol"); -const u16 gItemIconPalette_Star[] = INCBIN_U16("graphics/items/icon_palettes/star.gbapal"); - const u32 gItemIcon_StarPiece[] = INCBIN_U32("graphics/items/icons/star_piece.4bpp.smol"); - -const u32 gItemIcon_CometShard[] = INCBIN_U32("graphics/items/icons/comet_shard.4bpp.smol"); +const u16 gItemIconPalette_Star[] = INCBIN_U16("graphics/items/icon_palettes/star.gbapal"); const u16 gItemIconPalette_CometShard[] = INCBIN_U16("graphics/items/icon_palettes/comet_shard.gbapal"); const u16 gItemIconPalette_ShoalSalt[] = INCBIN_U16("graphics/items/icon_palettes/shoal_salt.gbapal"); @@ -389,9 +366,6 @@ const u16 gItemIconPalette_HeartScale[] = INCBIN_U16("graphics/items/icon_palett const u32 gItemIcon_Honey[] = INCBIN_U32("graphics/items/icons/honey.4bpp.smol"); const u16 gItemIconPalette_Honey[] = INCBIN_U16("graphics/items/icon_palettes/honey.gbapal"); -const u32 gItemIcon_RareBone[] = INCBIN_U32("graphics/items/icons/rare_bone.4bpp.smol"); -const u16 gItemIconPalette_RareBone[] = INCBIN_U16("graphics/items/icon_palettes/rare_bone.gbapal"); - const u32 gItemIcon_OddKeystone[] = INCBIN_U32("graphics/items/icons/odd_keystone.4bpp.smol"); const u16 gItemIconPalette_OddKeystone[] = INCBIN_U16("graphics/items/icon_palettes/odd_keystone.gbapal"); @@ -474,25 +448,13 @@ const u16 gItemIconPalette_AmazeMulch[] = INCBIN_U16("graphics/items/icon_palett // Apricorns -const u32 gItemIcon_RedApricorn[] = INCBIN_U32("graphics/items/icons/red_apricorn.4bpp.smol"); +const u32 gItemIcon_Apricorn[] = INCBIN_U32("graphics/items/icons/apricorn.4bpp.smol"); const u16 gItemIconPalette_RedApricorn[] = INCBIN_U16("graphics/items/icon_palettes/red_apricorn.gbapal"); - -const u32 gItemIcon_BlueApricorn[] = INCBIN_U32("graphics/items/icons/blue_apricorn.4bpp.smol"); const u16 gItemIconPalette_BlueApricorn[] = INCBIN_U16("graphics/items/icon_palettes/blue_apricorn.gbapal"); - -const u32 gItemIcon_YellowApricorn[] = INCBIN_U32("graphics/items/icons/yellow_apricorn.4bpp.smol"); const u16 gItemIconPalette_YellowApricorn[] = INCBIN_U16("graphics/items/icon_palettes/yellow_apricorn.gbapal"); - -const u32 gItemIcon_GreenApricorn[] = INCBIN_U32("graphics/items/icons/green_apricorn.4bpp.smol"); const u16 gItemIconPalette_GreenApricorn[] = INCBIN_U16("graphics/items/icon_palettes/green_apricorn.gbapal"); - -const u32 gItemIcon_PinkApricorn[] = INCBIN_U32("graphics/items/icons/pink_apricorn.4bpp.smol"); const u16 gItemIconPalette_PinkApricorn[] = INCBIN_U16("graphics/items/icon_palettes/pink_apricorn.gbapal"); - -const u32 gItemIcon_WhiteApricorn[] = INCBIN_U32("graphics/items/icons/white_apricorn.4bpp.smol"); const u16 gItemIconPalette_WhiteApricorn[] = INCBIN_U16("graphics/items/icon_palettes/white_apricorn.gbapal"); - -const u32 gItemIcon_BlackApricorn[] = INCBIN_U32("graphics/items/icons/black_apricorn.4bpp.smol"); const u16 gItemIconPalette_BlackApricorn[] = INCBIN_U16("graphics/items/icon_palettes/black_apricorn.gbapal"); const u32 gItemIcon_WishingPiece[] = INCBIN_U32("graphics/items/icons/wishing_piece.4bpp.smol"); @@ -671,83 +633,39 @@ const u16 gItemIconPalette_MetalAlloy[] = INCBIN_U16("graphics/items/icon_palett // Nectars -const u32 gItemIcon_RedNectar[] = INCBIN_U32("graphics/items/icons/red_nectar.4bpp.smol"); +const u32 gItemIcon_Nectar[] = INCBIN_U32("graphics/items/icons/nectar.4bpp.smol"); const u16 gItemIconPalette_RedNectar[] = INCBIN_U16("graphics/items/icon_palettes/red_nectar.gbapal"); - -const u32 gItemIcon_YellowNectar[] = INCBIN_U32("graphics/items/icons/yellow_nectar.4bpp.smol"); const u16 gItemIconPalette_YellowNectar[] = INCBIN_U16("graphics/items/icon_palettes/yellow_nectar.gbapal"); - -const u32 gItemIcon_PinkNectar[] = INCBIN_U32("graphics/items/icons/pink_nectar.4bpp.smol"); const u16 gItemIconPalette_PinkNectar[] = INCBIN_U16("graphics/items/icon_palettes/pink_nectar.gbapal"); - -const u32 gItemIcon_PurpleNectar[] = INCBIN_U32("graphics/items/icons/purple_nectar.4bpp.smol"); const u16 gItemIconPalette_PurpleNectar[] = INCBIN_U16("graphics/items/icon_palettes/purple_nectar.gbapal"); // Plates -const u32 gItemIcon_FlamePlate[] = INCBIN_U32("graphics/items/icons/flame_plate.4bpp.smol"); +const u32 gItemIcon_Plate[] = INCBIN_U32("graphics/items/icons/plate.4bpp.smol"); const u16 gItemIconPalette_FlamePlate[] = INCBIN_U16("graphics/items/icon_palettes/flame_plate.gbapal"); - -const u32 gItemIcon_SplashPlate[] = INCBIN_U32("graphics/items/icons/splash_plate.4bpp.smol"); const u16 gItemIconPalette_SplashPlate[] = INCBIN_U16("graphics/items/icon_palettes/splash_plate.gbapal"); - -const u32 gItemIcon_ZapPlate[] = INCBIN_U32("graphics/items/icons/zap_plate.4bpp.smol"); const u16 gItemIconPalette_ZapPlate[] = INCBIN_U16("graphics/items/icon_palettes/zap_plate.gbapal"); - -const u32 gItemIcon_MeadowPlate[] = INCBIN_U32("graphics/items/icons/meadow_plate.4bpp.smol"); const u16 gItemIconPalette_MeadowPlate[] = INCBIN_U16("graphics/items/icon_palettes/meadow_plate.gbapal"); - -const u32 gItemIcon_IciclePlate[] = INCBIN_U32("graphics/items/icons/icicle_plate.4bpp.smol"); const u16 gItemIconPalette_IciclePlate[] = INCBIN_U16("graphics/items/icon_palettes/icicle_plate.gbapal"); - -const u32 gItemIcon_FistPlate[] = INCBIN_U32("graphics/items/icons/fist_plate.4bpp.smol"); const u16 gItemIconPalette_FistPlate[] = INCBIN_U16("graphics/items/icon_palettes/fist_plate.gbapal"); - -const u32 gItemIcon_ToxicPlate[] = INCBIN_U32("graphics/items/icons/toxic_plate.4bpp.smol"); const u16 gItemIconPalette_ToxicPlate[] = INCBIN_U16("graphics/items/icon_palettes/toxic_plate.gbapal"); - -const u32 gItemIcon_EarthPlate[] = INCBIN_U32("graphics/items/icons/earth_plate.4bpp.smol"); const u16 gItemIconPalette_EarthPlate[] = INCBIN_U16("graphics/items/icon_palettes/earth_plate.gbapal"); - -const u32 gItemIcon_SkyPlate[] = INCBIN_U32("graphics/items/icons/sky_plate.4bpp.smol"); const u16 gItemIconPalette_SkyPlate[] = INCBIN_U16("graphics/items/icon_palettes/sky_plate.gbapal"); - -const u32 gItemIcon_MindPlate[] = INCBIN_U32("graphics/items/icons/mind_plate.4bpp.smol"); const u16 gItemIconPalette_MindPlate[] = INCBIN_U16("graphics/items/icon_palettes/mind_plate.gbapal"); - -const u32 gItemIcon_InsectPlate[] = INCBIN_U32("graphics/items/icons/insect_plate.4bpp.smol"); const u16 gItemIconPalette_InsectPlate[] = INCBIN_U16("graphics/items/icon_palettes/insect_plate.gbapal"); - -const u32 gItemIcon_StonePlate[] = INCBIN_U32("graphics/items/icons/stone_plate.4bpp.smol"); const u16 gItemIconPalette_StonePlate[] = INCBIN_U16("graphics/items/icon_palettes/stone_plate.gbapal"); - -const u32 gItemIcon_SpookyPlate[] = INCBIN_U32("graphics/items/icons/spooky_plate.4bpp.smol"); const u16 gItemIconPalette_SpookyPlate[] = INCBIN_U16("graphics/items/icon_palettes/spooky_plate.gbapal"); - -const u32 gItemIcon_DracoPlate[] = INCBIN_U32("graphics/items/icons/draco_plate.4bpp.smol"); const u16 gItemIconPalette_DracoPlate[] = INCBIN_U16("graphics/items/icon_palettes/draco_plate.gbapal"); - -const u32 gItemIcon_DreadPlate[] = INCBIN_U32("graphics/items/icons/dread_plate.4bpp.smol"); const u16 gItemIconPalette_DreadPlate[] = INCBIN_U16("graphics/items/icon_palettes/dread_plate.gbapal"); - -const u32 gItemIcon_IronPlate[] = INCBIN_U32("graphics/items/icons/iron_plate.4bpp.smol"); const u16 gItemIconPalette_IronPlate[] = INCBIN_U16("graphics/items/icon_palettes/iron_plate.gbapal"); - -const u32 gItemIcon_PixiePlate[] = INCBIN_U32("graphics/items/icons/pixie_plate.4bpp.smol"); const u16 gItemIconPalette_PixiePlate[] = INCBIN_U16("graphics/items/icon_palettes/pixie_plate.gbapal"); // Drives -const u32 gItemIcon_DouseDrive[] = INCBIN_U32("graphics/items/icons/douse_drive.4bpp.smol"); +const u32 gItemIcon_Drive[] = INCBIN_U32("graphics/items/icons/drive.4bpp.smol"); const u16 gItemIconPalette_DouseDrive[] = INCBIN_U16("graphics/items/icon_palettes/douse_drive.gbapal"); - -const u32 gItemIcon_ShockDrive[] = INCBIN_U32("graphics/items/icons/shock_drive.4bpp.smol"); const u16 gItemIconPalette_ShockDrive[] = INCBIN_U16("graphics/items/icon_palettes/shock_drive.gbapal"); - -const u32 gItemIcon_BurnDrive[] = INCBIN_U32("graphics/items/icons/burn_drive.4bpp.smol"); const u16 gItemIconPalette_BurnDrive[] = INCBIN_U16("graphics/items/icon_palettes/burn_drive.gbapal"); - -const u32 gItemIcon_ChillDrive[] = INCBIN_U32("graphics/items/icons/chill_drive.4bpp.smol"); const u16 gItemIconPalette_ChillDrive[] = INCBIN_U16("graphics/items/icon_palettes/chill_drive.gbapal"); // Memories @@ -960,58 +878,24 @@ const u16 gItemIconPalette_Diancite[] = INCBIN_U16("graphics/items/icon_palettes // Gems -const u32 gItemIcon_NormalGem[] = INCBIN_U32("graphics/items/icons/normal_gem.4bpp.smol"); +const u32 gItemIcon_TypeGem[] = INCBIN_U32("graphics/items/icons/type_gem.4bpp.smol"); const u16 gItemIconPalette_NormalGem[] = INCBIN_U16("graphics/items/icon_palettes/normal_gem.gbapal"); - -const u32 gItemIcon_FireGem[] = INCBIN_U32("graphics/items/icons/fire_gem.4bpp.smol"); const u16 gItemIconPalette_FireGem[] = INCBIN_U16("graphics/items/icon_palettes/fire_gem.gbapal"); - -const u32 gItemIcon_WaterGem[] = INCBIN_U32("graphics/items/icons/water_gem.4bpp.smol"); const u16 gItemIconPalette_WaterGem[] = INCBIN_U16("graphics/items/icon_palettes/water_gem.gbapal"); - -const u32 gItemIcon_ElectricGem[] = INCBIN_U32("graphics/items/icons/electric_gem.4bpp.smol"); const u16 gItemIconPalette_ElectricGem[] = INCBIN_U16("graphics/items/icon_palettes/electric_gem.gbapal"); - -const u32 gItemIcon_GrassGem[] = INCBIN_U32("graphics/items/icons/grass_gem.4bpp.smol"); const u16 gItemIconPalette_GrassGem[] = INCBIN_U16("graphics/items/icon_palettes/grass_gem.gbapal"); - -const u32 gItemIcon_IceGem[] = INCBIN_U32("graphics/items/icons/ice_gem.4bpp.smol"); const u16 gItemIconPalette_IceGem[] = INCBIN_U16("graphics/items/icon_palettes/ice_gem.gbapal"); - -const u32 gItemIcon_FightingGem[] = INCBIN_U32("graphics/items/icons/fighting_gem.4bpp.smol"); const u16 gItemIconPalette_FightingGem[] = INCBIN_U16("graphics/items/icon_palettes/fighting_gem.gbapal"); - -const u32 gItemIcon_PoisonGem[] = INCBIN_U32("graphics/items/icons/poison_gem.4bpp.smol"); const u16 gItemIconPalette_PoisonGem[] = INCBIN_U16("graphics/items/icon_palettes/poison_gem.gbapal"); - -const u32 gItemIcon_GroundGem[] = INCBIN_U32("graphics/items/icons/ground_gem.4bpp.smol"); const u16 gItemIconPalette_GroundGem[] = INCBIN_U16("graphics/items/icon_palettes/ground_gem.gbapal"); - -const u32 gItemIcon_FlyingGem[] = INCBIN_U32("graphics/items/icons/flying_gem.4bpp.smol"); const u16 gItemIconPalette_FlyingGem[] = INCBIN_U16("graphics/items/icon_palettes/flying_gem.gbapal"); - -const u32 gItemIcon_PsychicGem[] = INCBIN_U32("graphics/items/icons/psychic_gem.4bpp.smol"); const u16 gItemIconPalette_PsychicGem[] = INCBIN_U16("graphics/items/icon_palettes/psychic_gem.gbapal"); - -const u32 gItemIcon_BugGem[] = INCBIN_U32("graphics/items/icons/bug_gem.4bpp.smol"); const u16 gItemIconPalette_BugGem[] = INCBIN_U16("graphics/items/icon_palettes/bug_gem.gbapal"); - -const u32 gItemIcon_RockGem[] = INCBIN_U32("graphics/items/icons/rock_gem.4bpp.smol"); const u16 gItemIconPalette_RockGem[] = INCBIN_U16("graphics/items/icon_palettes/rock_gem.gbapal"); - -const u32 gItemIcon_GhostGem[] = INCBIN_U32("graphics/items/icons/ghost_gem.4bpp.smol"); const u16 gItemIconPalette_GhostGem[] = INCBIN_U16("graphics/items/icon_palettes/ghost_gem.gbapal"); - -const u32 gItemIcon_DragonGem[] = INCBIN_U32("graphics/items/icons/dragon_gem.4bpp.smol"); const u16 gItemIconPalette_DragonGem[] = INCBIN_U16("graphics/items/icon_palettes/dragon_gem.gbapal"); - -const u32 gItemIcon_DarkGem[] = INCBIN_U32("graphics/items/icons/dark_gem.4bpp.smol"); const u16 gItemIconPalette_DarkGem[] = INCBIN_U16("graphics/items/icon_palettes/dark_gem.gbapal"); - -const u32 gItemIcon_SteelGem[] = INCBIN_U32("graphics/items/icons/steel_gem.4bpp.smol"); const u16 gItemIconPalette_SteelGem[] = INCBIN_U16("graphics/items/icon_palettes/steel_gem.gbapal"); - -const u32 gItemIcon_FairyGem[] = INCBIN_U32("graphics/items/icons/fairy_gem.4bpp.smol"); const u16 gItemIconPalette_FairyGem[] = INCBIN_U16("graphics/items/icon_palettes/fairy_gem.gbapal"); // Z-Crystals @@ -1129,16 +1013,14 @@ const u16 gItemIconPalette_LightBall[] = INCBIN_U16("graphics/items/icon_palette const u32 gItemIcon_Leek[] = INCBIN_U32("graphics/items/icons/leek.4bpp.smol"); const u16 gItemIconPalette_Leek[] = INCBIN_U16("graphics/items/icon_palettes/leek.gbapal"); -const u32 gItemIcon_ThickClub[] = INCBIN_U32("graphics/items/icons/thick_club.4bpp.smol"); -const u16 gItemIconPalette_ThickClub[] = INCBIN_U16("graphics/items/icon_palettes/thick_club.gbapal"); +const u32 gItemIcon_Bone[] = INCBIN_U32("graphics/items/icons/bone.4bpp.smol"); +const u16 gItemIconPalette_Bone[] = INCBIN_U16("graphics/items/icon_palettes/bone.gbapal"); const u32 gItemIcon_LuckyPunch[] = INCBIN_U32("graphics/items/icons/lucky_punch.4bpp.smol"); const u16 gItemIconPalette_LuckyPunch[] = INCBIN_U16("graphics/items/icon_palettes/lucky_punch.gbapal"); -const u32 gItemIcon_MetalPowder[] = INCBIN_U32("graphics/items/icons/metal_powder.4bpp.smol"); +const u32 gItemIcon_DittoPowder[] = INCBIN_U32("graphics/items/icons/ditto_powder.4bpp.smol"); const u16 gItemIconPalette_MetalPowder[] = INCBIN_U16("graphics/items/icon_palettes/metal_powder.gbapal"); - -const u32 gItemIcon_QuickPowder[] = INCBIN_U32("graphics/items/icons/quick_powder.4bpp.smol"); const u16 gItemIconPalette_QuickPowder[] = INCBIN_U16("graphics/items/icon_palettes/quick_powder.gbapal"); const u32 gItemIcon_DeepSeaScale[] = INCBIN_U32("graphics/items/icons/deep_sea_scale.4bpp.smol"); @@ -1250,7 +1132,7 @@ const u16 gItemIconPalette_BlackTypeEnhancingItem[] = INCBIN_U16("graphics/items const u32 gItemIcon_PoisonBarb[] = INCBIN_U32("graphics/items/icons/poison_barb.4bpp.smol"); const u16 gItemIconPalette_PoisonBarb[] = INCBIN_U16("graphics/items/icon_palettes/poison_barb.gbapal"); -const u32 gItemIcon_SoftSand[] = INCBIN_U32("graphics/items/icons/soft_sand.4bpp.smol"); +const u32 gItemIcon_Sand[] = INCBIN_U32("graphics/items/icons/sand.4bpp.smol"); const u16 gItemIconPalette_SoftSand[] = INCBIN_U16("graphics/items/icon_palettes/soft_sand.gbapal"); const u32 gItemIcon_SharpBeak[] = INCBIN_U32("graphics/items/icons/sharp_beak.4bpp.smol"); @@ -1311,16 +1193,10 @@ const u16 gItemIconPalette_IcyRock[] = INCBIN_U16("graphics/items/icon_palettes/ // Terrain Seeds -const u32 gItemIcon_ElectricSeed[] = INCBIN_U32("graphics/items/icons/electric_seed.4bpp.smol"); +const u32 gItemIcon_TerrainSeed[] = INCBIN_U32("graphics/items/icons/terrain_seed.4bpp.smol"); const u16 gItemIconPalette_ElectricSeed[] = INCBIN_U16("graphics/items/icon_palettes/electric_seed.gbapal"); - -const u32 gItemIcon_PsychicSeed[] = INCBIN_U32("graphics/items/icons/psychic_seed.4bpp.smol"); const u16 gItemIconPalette_PsychicSeed[] = INCBIN_U16("graphics/items/icon_palettes/psychic_seed.gbapal"); - -const u32 gItemIcon_MistySeed[] = INCBIN_U32("graphics/items/icons/misty_seed.4bpp.smol"); const u16 gItemIconPalette_MistySeed[] = INCBIN_U16("graphics/items/icon_palettes/misty_seed.gbapal"); - -const u32 gItemIcon_GrassySeed[] = INCBIN_U32("graphics/items/icons/grassy_seed.4bpp.smol"); const u16 gItemIconPalette_GrassySeed[] = INCBIN_U16("graphics/items/icon_palettes/grassy_seed.gbapal"); // Type-activated Stat Modifiers diff --git a/src/data/items.h b/src/data/items.h index 3ee7b0b056..38702ebb8e 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -269,7 +269,7 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_THROW_BALL, .secondaryId = BALL_PREMIER, .iconPic = gItemIcon_PremierBall, - .iconPalette = gItemIconPalette_LuxuryBall, + .iconPalette = gItemIconPalette_PremierBall, }, [ITEM_HEAL_BALL] = @@ -961,7 +961,7 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_CURE_STATUS, .effect = gItemEffect_Antidote, .flingPower = 30, - .iconPic = gItemIcon_Antidote, + .iconPic = gItemIcon_StatusHeal, .iconPalette = gItemIconPalette_Antidote, }, @@ -1186,7 +1186,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, .effect = gItemEffect_SacredAsh, .flingPower = 30, - .iconPic = gItemIcon_SacredAsh, + .iconPic = gItemIcon_DittoPowder, .iconPalette = gItemIconPalette_SacredAsh, }, @@ -1528,7 +1528,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_HpFeather, .flingPower = 20, - .iconPic = gItemIcon_HealthFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_HealthFeather, }, @@ -1543,7 +1543,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_AtkFeather, .flingPower = 20, - .iconPic = gItemIcon_MuscleFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_MuscleFeather, }, @@ -1558,7 +1558,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_DefFeather, .flingPower = 20, - .iconPic = gItemIcon_ResistFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_ResistFeather, }, @@ -1573,7 +1573,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpatkFeather, .flingPower = 20, - .iconPic = gItemIcon_GeniusFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_GeniusFeather, }, @@ -1588,7 +1588,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpdefFeather, .flingPower = 20, - .iconPic = gItemIcon_CleverFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_CleverFeather, }, @@ -1603,7 +1603,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_Medicine, .effect = gItemEffect_SpeedFeather, .flingPower = 20, - .iconPic = gItemIcon_SwiftFeather, + .iconPic = gItemIcon_EVFeather, .iconPalette = gItemIconPalette_SwiftFeather, }, @@ -2507,7 +2507,7 @@ const struct Item gItemsInfo[] = .battleUsage = EFFECT_ITEM_INCREASE_STAT, .effect = gItemEffect_XSpecialDefense, .flingPower = 30, - .iconPic = gItemIcon_XSpecialDefense, + .iconPic = gItemIcon_BattleStatItem, .iconPalette = gItemIconPalette_XSpecialDefense, }, @@ -2872,7 +2872,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, - .iconPic = gItemIcon_Stardust, + .iconPic = gItemIcon_Sand, .iconPalette = gItemIconPalette_Star, }, @@ -2914,7 +2914,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 30, - .iconPic = gItemIcon_CometShard, + .iconPic = gItemIcon_StarPiece, .iconPalette = gItemIconPalette_CometShard, }, @@ -3062,8 +3062,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 100, - .iconPic = gItemIcon_RareBone, - .iconPalette = gItemIconPalette_RareBone, + .iconPic = gItemIcon_Bone, + .iconPalette = gItemIconPalette_Bone, }, [ITEM_ODD_KEYSTONE] = @@ -3719,7 +3719,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_RedApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_RedApricorn, }, @@ -3735,7 +3735,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_BlueApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_BlueApricorn, }, @@ -3751,7 +3751,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_YellowApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_YellowApricorn, }, @@ -3767,7 +3767,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_GreenApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_GreenApricorn, }, @@ -3783,7 +3783,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_PinkApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_PinkApricorn, }, @@ -3799,7 +3799,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_WhiteApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_WhiteApricorn, }, @@ -3815,7 +3815,7 @@ const struct Item gItemsInfo[] = .sortType = ITEM_TYPE_GROWTH, .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .iconPic = gItemIcon_BlackApricorn, + .iconPic = gItemIcon_Apricorn, .iconPalette = gItemIconPalette_BlackApricorn, }, @@ -4723,7 +4723,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, - .iconPic = gItemIcon_RedNectar, + .iconPic = gItemIcon_Nectar, .iconPalette = gItemIconPalette_RedNectar, }, @@ -4738,7 +4738,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, - .iconPic = gItemIcon_YellowNectar, + .iconPic = gItemIcon_Nectar, .iconPalette = gItemIconPalette_YellowNectar, }, @@ -4753,7 +4753,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, - .iconPic = gItemIcon_PinkNectar, + .iconPic = gItemIcon_Nectar, .iconPalette = gItemIconPalette_PinkNectar, }, @@ -4768,7 +4768,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_PARTY_MENU, .fieldUseFunc = ItemUseOutOfBattle_FormChange_ConsumedOnUse, .flingPower = 10, - .iconPic = gItemIcon_PurpleNectar, + .iconPic = gItemIcon_Nectar, .iconPalette = gItemIconPalette_PurpleNectar, }, @@ -4790,7 +4790,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 90, - .iconPic = gItemIcon_FlamePlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_FlamePlate, }, @@ -4810,7 +4810,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 90, - .iconPic = gItemIcon_SplashPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_SplashPlate, }, @@ -4830,7 +4830,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 90, - .iconPic = gItemIcon_ZapPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_ZapPlate, }, @@ -4850,7 +4850,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, .flingPower = 90, - .iconPic = gItemIcon_MeadowPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_MeadowPlate, }, @@ -4870,7 +4870,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 90, - .iconPic = gItemIcon_IciclePlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_IciclePlate, }, @@ -4890,7 +4890,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, .flingPower = 90, - .iconPic = gItemIcon_FistPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_FistPlate, }, @@ -4910,7 +4910,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, .flingPower = 90, - .iconPic = gItemIcon_ToxicPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_ToxicPlate, }, @@ -4930,7 +4930,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 90, - .iconPic = gItemIcon_EarthPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_EarthPlate, }, @@ -4950,7 +4950,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, .flingPower = 90, - .iconPic = gItemIcon_SkyPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_SkyPlate, }, @@ -4970,7 +4970,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, .flingPower = 90, - .iconPic = gItemIcon_MindPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_MindPlate, }, @@ -4990,7 +4990,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, .flingPower = 90, - .iconPic = gItemIcon_InsectPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_InsectPlate, }, @@ -5010,7 +5010,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, .flingPower = 90, - .iconPic = gItemIcon_StonePlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_StonePlate, }, @@ -5030,7 +5030,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, .flingPower = 90, - .iconPic = gItemIcon_SpookyPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_SpookyPlate, }, @@ -5050,7 +5050,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, .flingPower = 90, - .iconPic = gItemIcon_DracoPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_DracoPlate, }, @@ -5070,7 +5070,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, .flingPower = 90, - .iconPic = gItemIcon_DreadPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_DreadPlate, }, @@ -5090,7 +5090,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, .flingPower = 90, - .iconPic = gItemIcon_IronPlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_IronPlate, }, @@ -5110,7 +5110,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, .flingPower = 90, - .iconPic = gItemIcon_PixiePlate, + .iconPic = gItemIcon_Plate, .iconPalette = gItemIconPalette_PixiePlate, }, @@ -5131,7 +5131,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, .flingPower = 70, - .iconPic = gItemIcon_DouseDrive, + .iconPic = gItemIcon_Drive, .iconPalette = gItemIconPalette_DouseDrive, }, @@ -5150,7 +5150,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, .flingPower = 70, - .iconPic = gItemIcon_ShockDrive, + .iconPic = gItemIcon_Drive, .iconPalette = gItemIconPalette_ShockDrive, }, @@ -5169,7 +5169,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, .flingPower = 70, - .iconPic = gItemIcon_BurnDrive, + .iconPic = gItemIcon_Drive, .iconPalette = gItemIconPalette_BurnDrive, }, @@ -5188,7 +5188,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, .flingPower = 70, - .iconPic = gItemIcon_ChillDrive, + .iconPic = gItemIcon_Drive, .iconPalette = gItemIconPalette_ChillDrive, }, @@ -7265,7 +7265,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_NORMAL, - .iconPic = gItemIcon_NormalGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_NormalGem, }, @@ -7284,7 +7284,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIRE, - .iconPic = gItemIcon_FireGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_FireGem, }, @@ -7303,7 +7303,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_WATER, - .iconPic = gItemIcon_WaterGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_WaterGem, }, @@ -7322,7 +7322,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ELECTRIC, - .iconPic = gItemIcon_ElectricGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_ElectricGem, }, @@ -7341,7 +7341,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GRASS, - .iconPic = gItemIcon_GrassGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_GrassGem, }, @@ -7360,7 +7360,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ICE, - .iconPic = gItemIcon_IceGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_IceGem, }, @@ -7379,7 +7379,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FIGHTING, - .iconPic = gItemIcon_FightingGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_FightingGem, }, @@ -7398,7 +7398,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_POISON, - .iconPic = gItemIcon_PoisonGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_PoisonGem, }, @@ -7417,7 +7417,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, - .iconPic = gItemIcon_GroundGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_GroundGem, }, @@ -7436,7 +7436,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FLYING, - .iconPic = gItemIcon_FlyingGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_FlyingGem, }, @@ -7455,7 +7455,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_PSYCHIC, - .iconPic = gItemIcon_PsychicGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_PsychicGem, }, @@ -7474,7 +7474,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_BUG, - .iconPic = gItemIcon_BugGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_BugGem, }, @@ -7493,7 +7493,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_ROCK, - .iconPic = gItemIcon_RockGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_RockGem, }, @@ -7512,7 +7512,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GHOST, - .iconPic = gItemIcon_GhostGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_GhostGem, }, @@ -7531,7 +7531,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DRAGON, - .iconPic = gItemIcon_DragonGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_DragonGem, }, @@ -7550,7 +7550,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_DARK, - .iconPic = gItemIcon_DarkGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_DarkGem, }, @@ -7569,7 +7569,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_STEEL, - .iconPic = gItemIcon_SteelGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_SteelGem, }, @@ -7588,7 +7588,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_FAIRY, - .iconPic = gItemIcon_FairyGem, + .iconPic = gItemIcon_TypeGem, .iconPalette = gItemIconPalette_FairyGem, }, @@ -8276,8 +8276,8 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 90, - .iconPic = gItemIcon_ThickClub, - .iconPalette = gItemIconPalette_ThickClub, + .iconPic = gItemIcon_Bone, + .iconPalette = gItemIconPalette_Bone, }, [ITEM_LUCKY_PUNCH] = @@ -8313,7 +8313,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_MetalPowder, + .iconPic = gItemIcon_DittoPowder, .iconPalette = gItemIconPalette_MetalPowder, }, @@ -8331,7 +8331,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_QuickPowder, + .iconPic = gItemIcon_DittoPowder, .iconPalette = gItemIconPalette_QuickPowder, }, @@ -9039,7 +9039,7 @@ const struct Item gItemsInfo[] = .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .secondaryId = TYPE_GROUND, .flingPower = 10, - .iconPic = gItemIcon_SoftSand, + .iconPic = gItemIcon_Sand, .iconPalette = gItemIconPalette_SoftSand, }, @@ -9458,7 +9458,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_ElectricSeed, + .iconPic = gItemIcon_TerrainSeed, .iconPalette = gItemIconPalette_ElectricSeed, }, @@ -9477,7 +9477,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_PsychicSeed, + .iconPic = gItemIcon_TerrainSeed, .iconPalette = gItemIconPalette_PsychicSeed, }, @@ -9496,7 +9496,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_MistySeed, + .iconPic = gItemIcon_TerrainSeed, .iconPalette = gItemIconPalette_MistySeed, }, @@ -9515,7 +9515,7 @@ const struct Item gItemsInfo[] = .type = ITEM_USE_BAG_MENU, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, .flingPower = 10, - .iconPic = gItemIcon_GrassySeed, + .iconPic = gItemIcon_TerrainSeed, .iconPalette = gItemIconPalette_GrassySeed, }, diff --git a/src/data/pokemon/form_species_tables.h b/src/data/pokemon/form_species_tables.h index 38147177ef..44f0f60ee8 100644 --- a/src/data/pokemon/form_species_tables.h +++ b/src/data/pokemon/form_species_tables.h @@ -1949,7 +1949,7 @@ static const u16 sLurantisFormSpeciesIdTable[] = { #endif //P_FAMILY_FOMANTIS #if P_FAMILY_SALANDIT -static const u16 sSalanditFormSpeciesIdTable[] = { +static const u16 sSalazzleFormSpeciesIdTable[] = { SPECIES_SALAZZLE, SPECIES_SALAZZLE_TOTEM, FORM_SPECIES_END, diff --git a/src/data/pokemon/species_info/gen_7_families.h b/src/data/pokemon/species_info/gen_7_families.h index 3c8040a327..63cdc50cb8 100644 --- a/src/data/pokemon/species_info/gen_7_families.h +++ b/src/data/pokemon/species_info/gen_7_families.h @@ -3409,7 +3409,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = ) .levelUpLearnset = sSalazzleLevelUpLearnset, .teachableLearnset = sSalazzleTeachableLearnset, - .formSpeciesIdTable = sSalanditFormSpeciesIdTable, + .formSpeciesIdTable = sSalazzleFormSpeciesIdTable, }, [SPECIES_SALAZZLE_TOTEM] = @@ -3472,7 +3472,7 @@ const struct SpeciesInfo gSpeciesInfoGen7[] = .perfectIVCount = LEGENDARY_PERFECT_IV_COUNT, .levelUpLearnset = sSalazzleLevelUpLearnset, .teachableLearnset = sSalazzleTeachableLearnset, - .formSpeciesIdTable = sSalanditFormSpeciesIdTable, + .formSpeciesIdTable = sSalazzleFormSpeciesIdTable, }, #endif //P_FAMILY_SALANDIT diff --git a/test/battle/ability/protosynthesis.c b/test/battle/ability/protosynthesis.c index bd7acd7e10..5173a18bd9 100644 --- a/test/battle/ability/protosynthesis.c +++ b/test/battle/ability/protosynthesis.c @@ -312,3 +312,38 @@ SINGLE_BATTLE_TEST("Protosynthesis retains its boosted stat after Neutralizing G EXPECT_EQ(damage[0], damage[1]); } } + +SINGLE_BATTLE_TEST("Protosynthesis damage calculation is correct") +{ + s16 dmg; + s16 expectedDamage; + + PARAMETRIZE { expectedDamage = 127; } + PARAMETRIZE { expectedDamage = 126; } + PARAMETRIZE { expectedDamage = 124; } + PARAMETRIZE { expectedDamage = 123; } + PARAMETRIZE { expectedDamage = 121; } + PARAMETRIZE { expectedDamage = 120; } + PARAMETRIZE { expectedDamage = 118; } + PARAMETRIZE { expectedDamage = 118; } + PARAMETRIZE { expectedDamage = 117; } + PARAMETRIZE { expectedDamage = 115; } + PARAMETRIZE { expectedDamage = 114; } + PARAMETRIZE { expectedDamage = 112; } + PARAMETRIZE { expectedDamage = 111; } + PARAMETRIZE { expectedDamage = 109; } + PARAMETRIZE { expectedDamage = 109; } + PARAMETRIZE { expectedDamage = 108; } + + GIVEN { + ASSUME(GetMoveCategory(MOVE_CLOSE_COMBAT) == DAMAGE_CATEGORY_PHYSICAL); + PLAYER(SPECIES_GOUGING_FIRE) { Ability(ABILITY_PROTOSYNTHESIS); Item(ITEM_BOOSTER_ENERGY); } + OPPONENT(SPECIES_URSHIFU_RAPID_STRIKE); + } WHEN { + TURN { MOVE(opponent, MOVE_CLOSE_COMBAT, WITH_RNG(RNG_DAMAGE_MODIFIER, i)); } + } SCENE { + HP_BAR(player, captureDamage: &dmg); + } THEN { + EXPECT_EQ(expectedDamage, dmg); + } +} diff --git a/test/battle/hold_effect/booster_energy.c b/test/battle/hold_effect/booster_energy.c index 16bc504e24..94341bfb9d 100644 --- a/test/battle/hold_effect/booster_energy.c +++ b/test/battle/hold_effect/booster_energy.c @@ -225,7 +225,8 @@ SINGLE_BATTLE_TEST("Booster Energy increases special defense by 30% if it is the ANIMATION(ANIM_TYPE_MOVE, MOVE_ROUND, opponent); HP_BAR(player, captureDamage: &results[i].damage); } FINALLY { - EXPECT_MUL_EQ(results[0].damage, Q_4_12(0.7), results[1].damage); + EXPECT_MUL_EQ(results[0].damage, Q_4_12(0.77), results[1].damage); + EXPECT_MUL_EQ(results[2].damage, Q_4_12(0.77), results[3].damage); } } diff --git a/test/text.c b/test/text.c index d84c35788a..6ad7c1919f 100644 --- a/test/text.c +++ b/test/text.c @@ -6,6 +6,7 @@ #include "battle_setup.h" #include "item.h" #include "malloc.h" +#include "party_menu.h" #include "main_menu.h" #include "string_util.h" #include "text.h" @@ -66,12 +67,13 @@ TEST("Move names fit on Contest Screen") TEST("Move names fit on TMs & HMs Bag Screen") { - u32 i; const u32 fontId = FONT_NARROWER, widthPx = 61; enum Move move = MOVE_NONE; - for (i = 1; i < MOVES_COUNT; i++) + + for (enum TMHMIndex tm = 1; tm <= NUM_ALL_MACHINES; tm++) { - PARAMETRIZE_LABEL("%S", GetMoveName(i)) { move = i; } + u32 tmMove = GetTMHMMoveId(tm); + PARAMETRIZE_LABEL("%S", GetMoveName(tmMove)) { move = tmMove; } } EXPECT_LE(GetStringWidth(fontId, GetMoveName(move), 0), widthPx); }