mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-09 11:36:32 -05:00
Merge branch 'upcoming' into RHH/pr/upcoming/typeEffectiveness
This commit is contained in:
ghoulslash
@@ -11,7 +11,7 @@ body:
|
||||
attributes:
|
||||
label: Description
|
||||
description: |
|
||||
Describe the issue you are experiencing.
|
||||
Describe the issue you are experiencing.
|
||||
Attach images/videos if possible.
|
||||
placeholder: |
|
||||
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
|
||||
@@ -23,16 +23,15 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.3 (Default)
|
||||
- 1.6.2 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.6.1
|
||||
- 1.6.0
|
||||
- 1.5.3
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
- 1.4.2
|
||||
- 1.4.1
|
||||
- 1.4.0
|
||||
- pre-1.4.0
|
||||
- pre-1.5.0
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
|
||||
13
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
vendored
13
.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
vendored
@@ -11,7 +11,7 @@ body:
|
||||
attributes:
|
||||
label: Description
|
||||
description: |
|
||||
Describe the issue you are experiencing.
|
||||
Describe the issue you are experiencing.
|
||||
Attach images/videos if possible.
|
||||
placeholder: |
|
||||
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
|
||||
@@ -23,16 +23,15 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.3 (Default)
|
||||
- 1.6.2 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.6.1
|
||||
- 1.6.0
|
||||
- 1.5.3
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
- 1.4.2
|
||||
- 1.4.1
|
||||
- 1.4.0
|
||||
- pre-1.4.0
|
||||
- pre-1.5.0
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
|
||||
@@ -11,7 +11,7 @@ body:
|
||||
attributes:
|
||||
label: Description
|
||||
description: |
|
||||
Describe the issue you are experiencing.
|
||||
Describe the issue you are experiencing.
|
||||
Attach images/videos if possible.
|
||||
placeholder: |
|
||||
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
|
||||
|
||||
13
.github/ISSUE_TEMPLATE/04_other_errors.yaml
vendored
13
.github/ISSUE_TEMPLATE/04_other_errors.yaml
vendored
@@ -11,7 +11,7 @@ body:
|
||||
attributes:
|
||||
label: Description
|
||||
description: |
|
||||
Describe the issue you are experiencing.
|
||||
Describe the issue you are experiencing.
|
||||
Attach images/videos if possible.
|
||||
placeholder: |
|
||||
Please enter a description of the issue. Here you can also attach log screenshots, gifs or a video
|
||||
@@ -23,16 +23,15 @@ body:
|
||||
label: Version
|
||||
description: What version of pokeemerald-expansion are you using as a base?
|
||||
options:
|
||||
- 1.5.3 (Default)
|
||||
- 1.6.2 (Default)
|
||||
- upcoming (Edge)
|
||||
- 1.6.1
|
||||
- 1.6.0
|
||||
- 1.5.3
|
||||
- 1.5.2
|
||||
- 1.5.1
|
||||
- 1.5.0
|
||||
- 1.4.3
|
||||
- 1.4.2
|
||||
- 1.4.1
|
||||
- 1.4.0
|
||||
- pre-1.4.0
|
||||
- pre-1.5.0
|
||||
validations:
|
||||
required: true
|
||||
- type: input
|
||||
|
||||
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
@@ -1,5 +1,5 @@
|
||||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
contact_links:
|
||||
- name: Rom-Hacking Hideout's Discord server!
|
||||
url: https://discord.gg/6CzjAG6GZk
|
||||
about: You can follow the development of pokeemerald-expansion and be notified of new releases :)
|
||||
9
.github/workflows/build.yml
vendored
9
.github/workflows/build.yml
vendored
@@ -10,6 +10,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
container: devkitpro/devkitarm
|
||||
env:
|
||||
GAME_VERSION: EMERALD
|
||||
GAME_REVISION: 0
|
||||
@@ -27,7 +28,9 @@ jobs:
|
||||
repository: pret/agbcc
|
||||
|
||||
- name: Install binutils
|
||||
run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libelf-dev
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt install -y build-essential libpng-dev libelf-dev
|
||||
# build-essential, git, and libpng-dev are already installed
|
||||
# gcc-arm-none-eabi is only needed for the modern build
|
||||
# as an alternative to dkP
|
||||
@@ -39,6 +42,9 @@ jobs:
|
||||
working-directory: agbcc
|
||||
|
||||
- name: Agbcc
|
||||
env:
|
||||
MODERN: 0
|
||||
COMPARE: 0
|
||||
run: make -j${nproc} -O all
|
||||
|
||||
- name: Modern
|
||||
@@ -49,6 +55,7 @@ jobs:
|
||||
|
||||
- name: Test
|
||||
env:
|
||||
MODERN: 1
|
||||
TEST: 1
|
||||
run: |
|
||||
make -j${nproc} -O pokeemerald-test.elf
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -39,3 +39,4 @@ prefabs.json
|
||||
*.diff
|
||||
*.sym
|
||||
*.js
|
||||
src/data/map_group_count.h
|
||||
|
||||
122
CHANGELOG.md
Normal file
122
CHANGELOG.md
Normal file
@@ -0,0 +1,122 @@
|
||||
# Pokeemerald-Expansion Changelog
|
||||
|
||||
# Version 1.6.2
|
||||
|
||||
## 🌋 *IMPORTANT CHANGES* 🌋
|
||||
### Battle changes
|
||||
* Battler Types are now obtained via `GetBattlerType` instead of `gBattleMons[battlerId].type1/2/3` to better consider Roost. Be sure to update your custom battle effects to account for this change.
|
||||
|
||||
## 🧬 General 🧬
|
||||
### Fixed
|
||||
* Fixed Cheat Start not initiating time-based events by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3446
|
||||
|
||||
## 🐉 Pokémon 🐉
|
||||
### Changed
|
||||
* Updated Cresselia's base stats to Gen 9 by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3419
|
||||
* Updated Zacian/Zamazenta base stats to Gen 9 by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3421
|
||||
### Fixed
|
||||
* Fixed Kleavor, Hisuian Sneasel and Sneasler missing their SV abilities by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3391
|
||||
* Fixed Bergmite/Avalugg old and updated egg groups being switched by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3380
|
||||
|
||||
## 🤹 Moves 🤹
|
||||
### Changed
|
||||
* Quick Draw now uses weighted RNG by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3399
|
||||
* Added `IS_BATTLER_TYPELESS` macro that checks if the specified battler has no valid type by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3303
|
||||
### Fixed
|
||||
* Fixed Protect failing if the user flinched on the previous turn by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3345
|
||||
* Fixed entry hazards not working properly being cleared on switch-in by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3316
|
||||
* This includes Toxic Spikes not working if Pecha Berry actived on the previous turn.
|
||||
* Fixed Roost overwriting other type changing at the end of the turn (Soak, Forest's Curse, Color Change, etc.) by @BLourenco in https://github.com/rh-hideout/pokeemerald-expansion/pull/3258
|
||||
* Now it suppresses the user's Flying-type rather than remove and re-add it.
|
||||
* Fixes Salt Cure visual bug if mon fainted by direct attack by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3388
|
||||
* Fixed Purifying Salt not preventing the use of Rest by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3399
|
||||
* Fixed Make it Rain lowering Sp. Attack twice if hitting 2 targets in double battles by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3441
|
||||
* Fixed Reflect Type not properly handle 3rd types by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3303
|
||||
* Fixed form change triggered by switching not occuring when using moves like U-Turn or Baton Pass by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3463
|
||||
* Fixed Last Resort not counting Sleep Talk as used for its effect by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3378
|
||||
|
||||
## 🎭 Abilities 🎭
|
||||
### Changed
|
||||
* Removed unused `STATUS3_CANT_SCORE_A_CRIT` by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3377
|
||||
* Moved Beads of Ruin and Sword of Ruin damage to the appropiate damage modifier functions by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3415
|
||||
### Fixed
|
||||
* Fixed Intimidate increasing the attack of both opponents if one of them has Contrary in double battles by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3365
|
||||
* Fixed Battle/Shell Armor not preventing critical hits by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3377
|
||||
* Fixed Rivalry's effect being reversed by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3381
|
||||
* Fixed Rivalry lowering attack if either attacker or target were genderless by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3381
|
||||
* Fixed missing Poison Heal Ability Popup by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3385
|
||||
* Fixed Parental Bond not working at all by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3417
|
||||
* Fixed Beads of Ruin and Sword of Ruin damage modifiers by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3415
|
||||
* Fixed Sheer Force not negating effects that benefit the user (eg. Flame Charge, Power-Up Punch) by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3378
|
||||
* Fixed Strength Sap not healing the user when used on a Substitute by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3486
|
||||
* Fixed Substitute showing the "took damage for" message if Strength Sap was used on it by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3486
|
||||
* Fixed Weak Armor interrupting Multi Hit moves by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3497
|
||||
|
||||
## 🧶 Items 🧶
|
||||
### Fixed
|
||||
* Fixed Shiny Charm doing too many rerolls by default by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3327
|
||||
* Fixed Berserk Gene activating for the wrong Pokémon double battles by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3363
|
||||
* Fixed Red Card not being consumed after opponent Sticky Web activation by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3364
|
||||
* Fixed implementation of Gen6 that didn't allow for the Exp Share flag to be set via script without setting the item to the Gen 6+ version by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3384
|
||||
* Fixed Kee Berry raising defense by 1 stage instead of 2 by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3409
|
||||
* Fixed Kee Berry incorrect stat raise message by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3409
|
||||
* Fixed Razor Fang not being able to be used directly even if `I_USE_EVO_HELD_ITEMS_FROM_BAG` was set to `TRUE` by @fdeblasio in https://github.com/rh-hideout/pokeemerald-expansion/pull/3456
|
||||
|
||||
## 🧹 Cleanup 🧹
|
||||
* `AbilityBattleEffects` uses `B_MSG_TERRAIN` constants for field terrain intro text by @LOuroboros in https://github.com/rh-hideout/pokeemerald-expansion/pull/3410
|
||||
* Removed all trailing whitespace by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3472
|
||||
|
||||
## 🧪 Test Runner 🧪
|
||||
### Added
|
||||
* Flinch tests by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3345
|
||||
* Berserk Gene double battle tests by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3363
|
||||
* More specific Toxic Spikes tests by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3316
|
||||
* Red Card/Sticky Web test @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3364
|
||||
* Intimidate/Contrary double battle test by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3365
|
||||
* Critical Hit tests by @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3377
|
||||
* Roost tests by @BLourenco in https://github.com/rh-hideout/pokeemerald-expansion/pull/3258
|
||||
* Rivalry tests by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3381
|
||||
* Various tests by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3385
|
||||
* Defeatist, Dragon's Maw, Earth Eater, Gale Wings, Poison Heal, Rocky Payload, Sap Sipper, Steelworker and Transistor.
|
||||
* Various tests by @Bassoonian in https://github.com/rh-hideout/pokeemerald-expansion/pull/3399
|
||||
* Beast Boost, Ice Scales, Neuroforce, Purifying Salt, Quick Draw and Sharpness.
|
||||
* Berry tests @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3409
|
||||
* Full: Apicot, Custap, Ganlon, Jaboca, Kee, Lansat, Liechi, Maranga, Micle, Petaya, Rowap and Salac Berries.
|
||||
* TODO: Starf Berry.
|
||||
* Weather and type-specific tests by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3260
|
||||
* Full: Freezing, Hail, Moonlight, Morning Sun, Sandstorm, Snow, Solar Beam/Blade, Steel poisoning, Synthesis, Thunder and Weather Ball.
|
||||
* Partial: Prankster, Safety Goggles, Aurora Veil, Hurricane, Leech Seed and OHKO moves.
|
||||
* TODO: Harvest.
|
||||
* Single Parental Bond test by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3417
|
||||
* Several tests by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3378
|
||||
* Full: Weak Armor, Last Resort, Stealth Rock.
|
||||
* Completed Weak Armor tests by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3493
|
||||
* Partial: Defiant, Sheer Force, White Herb, Strength Sap.
|
||||
### Changed
|
||||
* Red Card tests now check if the item was consumed by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3364
|
||||
* Tests now cannot use `i` in their cycles to avoid messing with `PARAMETRIZE` by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3408
|
||||
* Moved battle tests off the heap by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3414
|
||||
* Moved Powder/Grass test to `move_flags` folder by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3260
|
||||
* Continuous `NOT x; NOT y;` are now not allowed in tests due to them not acting as one would expect by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3459
|
||||
* Test writers should use `NONE_OF { x; y; }` instead.
|
||||
### Fixed
|
||||
* Fixed CreateNPCTrainerPartyForTrainer test failing on modern by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3367
|
||||
* Fixed `RNG_CRITICAL_HIT` by @mrgriffin and @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3377
|
||||
* Fixed `ASSUMPTIONS` block not working by @DizzyEggg in https://github.com/rh-hideout/pokeemerald-expansion/pull/3368
|
||||
* Fixup by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3408
|
||||
* Fixed Beads of Ruin and Sword of Ruin damage tests by @kittenchilly in https://github.com/rh-hideout/pokeemerald-expansion/pull/3415
|
||||
* Fixes test RNG by @mrgriffin and @AlexOn1ine in https://github.com/rh-hideout/pokeemerald-expansion/pull/3433
|
||||
* Fixed battle test estimateCost bug by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3448
|
||||
* Test cleanup and improvements by @AsparagusEduardo in https://github.com/rh-hideout/pokeemerald-expansion/pull/3449
|
||||
* Removed duplicated Prankster TO_DO test.
|
||||
* Corrected Multi-hit test names (4 and 5 hits stated 35% instead of 15%).
|
||||
* Grouped Maranga Berry's Physical vs Special tests using PARAMETRIZE.
|
||||
* Improved Jaboca, Kee and Rowap tests by @AlexOn1ine
|
||||
* Fixed `ModifyPersonalityForNature` by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3452
|
||||
* Fixed test_runner.c modern warning by @mrgriffin in https://github.com/rh-hideout/pokeemerald-expansion/pull/3451
|
||||
|
||||
## New Contributors
|
||||
* @BLourenco made their first contribution in https://github.com/rh-hideout/pokeemerald-expansion/pull/3258
|
||||
|
||||
## Full Changelog
|
||||
https://github.com/rh-hideout/pokeemerald-expansion/compare/expansion/1.6.1...expansion/1.6.2
|
||||
16
INSTALL.md
16
INSTALL.md
@@ -82,7 +82,7 @@ Some tips before proceeding:
|
||||
4. Certain packages are required to build pokeemerald. Install these packages by running the following command:
|
||||
|
||||
```bash
|
||||
sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
|
||||
sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi git libpng-dev
|
||||
```
|
||||
<details>
|
||||
<summary><i>Note...</i></summary>
|
||||
@@ -150,9 +150,9 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
|
||||
<details>
|
||||
<summary><i>Notes...</i></summary>
|
||||
|
||||
> Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.
|
||||
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.
|
||||
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.
|
||||
> Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.
|
||||
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.
|
||||
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.
|
||||
> Note 4: If libpng was saved elsewhere, you will need to specify the full path to where libpng was downloaded, e.g. `cd c:/devkitpro/msys2` if it was saved there.
|
||||
</details>
|
||||
|
||||
@@ -329,28 +329,28 @@ Open Terminal and enter the following commands, depending on which distro you're
|
||||
### Debian/Ubuntu-based distributions
|
||||
Run the following command to install the necessary packages:
|
||||
```bash
|
||||
sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
|
||||
sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi git libpng-dev
|
||||
```
|
||||
Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to-store-pokeemerald-linux).
|
||||
<details>
|
||||
<summary><i>Note for legacy repos...</i></summary>
|
||||
|
||||
> If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokeemerald/blob/571c598/INSTALL.md)**,
|
||||
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
|
||||
> then you will have to install devkitARM. Install all the above packages except for the arm-none-eabi packages, and follow the instructions to
|
||||
> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
|
||||
</details>
|
||||
|
||||
### Arch Linux
|
||||
Run this command as root to install the necessary packages:
|
||||
```bash
|
||||
pacman -S base-devel arm-none-eabi-binutils git libpng
|
||||
pacman -S base-devel arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib git libpng
|
||||
```
|
||||
Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to-store-pokeemerald-linux).
|
||||
<details>
|
||||
<summary><i>Note for legacy repos...</i></summary>
|
||||
|
||||
> If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokeemerald/blob/571c598/INSTALL.md)**,
|
||||
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
|
||||
> then you will have to install devkitARM. Install all the above packages except for the arm-none-eabi packages, and follow the instructions to
|
||||
> [install devkitARM on Arch Linux](#installing-devkitarm-on-arch-linux).
|
||||
</details>
|
||||
|
||||
|
||||
23
Makefile
23
Makefile
@@ -40,12 +40,12 @@ TITLE := POKEMON EMER
|
||||
GAME_CODE := BPEE
|
||||
MAKER_CODE := 01
|
||||
REVISION := 0
|
||||
MODERN ?= 0
|
||||
MODERN ?= 1
|
||||
TEST ?= 0
|
||||
ANALYZE ?= 0
|
||||
|
||||
ifeq (modern,$(MAKECMDGOALS))
|
||||
MODERN := 1
|
||||
ifeq (agbcc,$(MAKECMDGOALS))
|
||||
MODERN := 0
|
||||
endif
|
||||
|
||||
ifeq (check,$(MAKECMDGOALS))
|
||||
@@ -69,12 +69,12 @@ else
|
||||
CPP := $(PREFIX)cpp
|
||||
endif
|
||||
|
||||
ROM_NAME := pokeemerald.gba
|
||||
ROM_NAME := pokeemerald_agbcc.gba
|
||||
ELF_NAME := $(ROM_NAME:.gba=.elf)
|
||||
MAP_NAME := $(ROM_NAME:.gba=.map)
|
||||
OBJ_DIR_NAME := build/emerald
|
||||
|
||||
MODERN_ROM_NAME := pokeemerald_modern.gba
|
||||
MODERN_ROM_NAME := pokeemerald.gba
|
||||
MODERN_ELF_NAME := $(MODERN_ROM_NAME:.gba=.elf)
|
||||
MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map)
|
||||
MODERN_OBJ_DIR_NAME := build/modern
|
||||
@@ -85,7 +85,11 @@ ELF = $(ROM:.gba=.elf)
|
||||
MAP = $(ROM:.gba=.map)
|
||||
SYM = $(ROM:.gba=.sym)
|
||||
|
||||
ifeq ($(MODERN),0)
|
||||
TEST_OBJ_DIR_NAME := build/test
|
||||
else
|
||||
TEST_OBJ_DIR_NAME := build/modern-test
|
||||
endif
|
||||
TESTELF = $(ROM:.gba=-test.elf)
|
||||
HEADLESSELF = $(ROM:.gba=-test-headless.elf)
|
||||
|
||||
@@ -119,7 +123,7 @@ LIBPATH := -L ../../tools/agbcc/lib
|
||||
LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
|
||||
else
|
||||
CC1 = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
|
||||
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -std=gnu17
|
||||
override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
|
||||
ifeq ($(ANALYZE),1)
|
||||
override CFLAGS += -fanalyzer
|
||||
endif
|
||||
@@ -178,7 +182,7 @@ MAKEFLAGS += --no-print-directory
|
||||
# Secondary expansion is required for dependency variables in object rules.
|
||||
.SECONDEXPANSION:
|
||||
|
||||
.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
|
||||
.PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall agbcc modern tidymodern tidynonmodern check
|
||||
|
||||
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
|
||||
|
||||
@@ -186,7 +190,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
|
||||
# Disable dependency scanning for clean/tidy/tools
|
||||
# Use a separate minimal makefile for speed
|
||||
# Since we don't need to reload most of this makefile
|
||||
ifeq (,$(filter-out all rom compare modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
|
||||
ifeq (,$(filter-out all rom compare agbcc modern check libagbsyscall syms $(TESTELF),$(MAKECMDGOALS)))
|
||||
$(call infoshell, $(MAKE) -f make_tools.mk)
|
||||
else
|
||||
NODEP ?= 1
|
||||
@@ -345,6 +349,7 @@ $(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
|
||||
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
|
||||
else
|
||||
$(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
|
||||
$(C_BUILDDIR)/pokedex_plus_hgss.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
|
||||
endif
|
||||
|
||||
ifeq ($(DINFO),1)
|
||||
@@ -480,6 +485,8 @@ $(ROM): $(ELF)
|
||||
$(OBJCOPY) -O binary $< $@
|
||||
$(FIX) $@ -p --silent
|
||||
|
||||
agbcc: all
|
||||
|
||||
modern: all
|
||||
|
||||
LD_SCRIPT_TEST := ld_script_test.txt
|
||||
|
||||
10
README.md
10
README.md
@@ -108,11 +108,17 @@ The pokeemerald Expansion is a feature branch meant to be integrated into existi
|
||||
- Feature branches incorporated:
|
||||
- [RHH intro credits](https://github.com/Xhyzi/pokeemerald/tree/rhh-intro-credits) by Xhyzi.
|
||||
- A small signature from all of us to show the collective effort in the project :)
|
||||
- [Overworld debug]() by TheXaman
|
||||
- [Overworld debug](https://github.com/TheXaman/pokeemerald/tree/tx_debug_system) by TheXaman
|
||||
- May be disabled.
|
||||
- Accesible by pressing `R + Start` in the overworld by default.
|
||||
- **Additional features**:
|
||||
- *Clear Boxes*: cleans every Pokémon from the Boxes.
|
||||
- *Hatch an Egg*: lets you choose an Egg in your party and immediatly hatch it.
|
||||
- [HGSS Pokédex](https://github.com/TheXaman/pokeemerald/tree/tx_pokedexPlus_hgss) by TheXaman
|
||||
- May be disabled.
|
||||
- **Additional features**:
|
||||
- *Support for new evolution methods*.
|
||||
- *Dark Mode*.
|
||||
- Other features
|
||||
- Pressing B while holding a Pokémon drops them like in modern games (configurable).
|
||||
- Running indoors (configurable).
|
||||
@@ -139,7 +145,7 @@ With this, you'll get the latest version of the Expansion, plus a couple of bugf
|
||||
|
||||
## **How do I update my version of the pokeemerald Expansion?**
|
||||
- If you haven't set up a remote, run the command `git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion`.
|
||||
- Once you have your remote set up, run the command `git pull RHH expansion/1.6.0`.
|
||||
- Once you have your remote set up, run the command `git pull RHH expansion/1.6.2`.
|
||||
|
||||
### Please consider crediting the entire [list of contributors](https://github.com/rh-hideout/pokeemerald-expansion/wiki/Credits) in your project, as they have all worked hard to develop this project :)
|
||||
|
||||
|
||||
@@ -1366,6 +1366,20 @@
|
||||
.byte \battler
|
||||
.endm
|
||||
|
||||
.macro trysetoctolock battler:req, failInstr:req
|
||||
callnative BS_TrySetOctolock
|
||||
.byte \battler
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro setglaiverush
|
||||
callnative BS_SetGlaiveRush
|
||||
.endm
|
||||
|
||||
.macro tryrelicsong
|
||||
callnative BS_TryRelicSong
|
||||
.endm
|
||||
|
||||
.macro setzeffect
|
||||
callnative BS_SetZEffect
|
||||
.endm
|
||||
@@ -1456,6 +1470,54 @@
|
||||
.4byte \jumpInstr
|
||||
.endm
|
||||
|
||||
.macro tryreflecttype failInstr:req
|
||||
callnative BS_TryReflectType
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
@ Used to active a different Max Move effects.
|
||||
.macro setmaxmoveeffect
|
||||
callnative BS_SetMaxMoveEffect
|
||||
.endm
|
||||
|
||||
.macro setsteelsurge, failInstr:req
|
||||
callnative BS_SetSteelsurge
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro damagenontypes
|
||||
callnative BS_DamageNonTypes
|
||||
.endm
|
||||
|
||||
.macro trysetstatus1, ptr:req
|
||||
callnative BS_TrySetStatus1
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro trysetstatus2, ptr:req
|
||||
callnative BS_TrySetStatus2
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro tryhealsixthhealth, ptr:req
|
||||
callnative BS_HealOneSixth
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro tryrecycleberry, ptr:req
|
||||
callnative BS_TryRecycleBerry
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
.macro updatedynamax
|
||||
callnative BS_UpdateDynamax
|
||||
.endm
|
||||
|
||||
.macro jumpiftargetdynamaxed, ptr:req
|
||||
callnative BS_JumpIfDynamaxed
|
||||
.4byte \ptr
|
||||
.endm
|
||||
|
||||
@ various command changed to more readable macros
|
||||
.macro cancelmultiturnmoves battler:req
|
||||
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
|
||||
@@ -1686,11 +1748,6 @@
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro tryreflecttype failInstr:req
|
||||
various BS_ATTACKER, VARIOUS_TRY_REFLECT_TYPE
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro trysoak failInstr:req
|
||||
various BS_ATTACKER, VARIOUS_TRY_SOAK
|
||||
.4byte \failInstr
|
||||
@@ -2004,10 +2061,6 @@
|
||||
.4byte \jumpInstr
|
||||
.endm
|
||||
|
||||
.macro applyplasmafists
|
||||
various BS_ATTACKER, VARIOUS_APPLY_PLASMA_FISTS
|
||||
.endm
|
||||
|
||||
.macro jumpifweatheraffected battler:req, flags:req, jumpInstr:req
|
||||
various \battler, VARIOUS_JUMP_IF_WEATHER_AFFECTED
|
||||
.4byte \flags
|
||||
@@ -2044,11 +2097,6 @@
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro setoctolock battler:req, failInstr:req
|
||||
various \battler, VARIOUS_SET_OCTOLOCK
|
||||
.4byte \failInstr
|
||||
.endm
|
||||
|
||||
.macro cutonethirdhpraisestats failInstr:req
|
||||
various BS_ATTACKER, VARIOUS_CUT_1_3_HP_RAISE_STATS
|
||||
.4byte \failInstr
|
||||
@@ -2340,3 +2388,8 @@
|
||||
getbattlerfainted \battler
|
||||
jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
|
||||
.endm
|
||||
|
||||
.macro flushtextbox
|
||||
printstring STRINGID_EMPTYSTRING3
|
||||
waitmessage 1
|
||||
.endm
|
||||
|
||||
@@ -780,7 +780,7 @@ gBattleAnims_Moves::
|
||||
.4byte Move_GLACIAL_LANCE
|
||||
.4byte Move_ASTRAL_BARRAGE
|
||||
.4byte Move_EERIE_SPELL
|
||||
@@@@LA MOVES
|
||||
@@@@ LA MOVES
|
||||
.4byte Move_DIRE_CLAW
|
||||
.4byte Move_PSYSHIELD_BASH
|
||||
.4byte Move_POWER_SHIFT
|
||||
@@ -856,6 +856,10 @@ gBattleAnims_Moves::
|
||||
.4byte Move_MAGICAL_TORQUE
|
||||
.4byte Move_PSYBLADE
|
||||
.4byte Move_HYDRO_STEAM
|
||||
.4byte Move_BLOOD_MOON
|
||||
.4byte Move_MATCHA_GOTCHA
|
||||
.4byte Move_SYRUP_BOMB
|
||||
.4byte Move_IVY_CUDGEL
|
||||
@@@@ Z MOVES
|
||||
.4byte Move_BREAKNECK_BLITZ
|
||||
.4byte Move_ALL_OUT_PUMMELING
|
||||
@@ -892,6 +896,60 @@ gBattleAnims_Moves::
|
||||
.4byte Move_MENACING_MOONRAZE_MAELSTROM
|
||||
.4byte Move_LIGHT_THAT_BURNS_THE_SKY
|
||||
.4byte Move_SOUL_STEALING_7_STAR_STRIKE
|
||||
@@@@ MAX MOVES
|
||||
.4byte Move_MAX_GUARD
|
||||
.4byte Move_MAX_STRIKE
|
||||
.4byte Move_MAX_KNUCKLE
|
||||
.4byte Move_MAX_AIRSTREAM
|
||||
.4byte Move_MAX_OOZE
|
||||
.4byte Move_MAX_QUAKE
|
||||
.4byte Move_MAX_ROCKFALL
|
||||
.4byte Move_MAX_FLUTTERBY
|
||||
.4byte Move_MAX_PHANTASM
|
||||
.4byte Move_MAX_STEELSPIKE
|
||||
.4byte Move_MAX_FLARE
|
||||
.4byte Move_MAX_GEYSER
|
||||
.4byte Move_MAX_OVERGROWTH
|
||||
.4byte Move_MAX_LIGHTNING
|
||||
.4byte Move_MAX_MINDSTORM
|
||||
.4byte Move_MAX_HAILSTORM
|
||||
.4byte Move_MAX_WYRMWIND
|
||||
.4byte Move_MAX_DARKNESS
|
||||
.4byte Move_MAX_STARFALL
|
||||
@@@@ G-MAX MOVES
|
||||
.4byte Move_G_MAX_VINE_LASH
|
||||
.4byte Move_G_MAX_WILDFIRE
|
||||
.4byte Move_G_MAX_CANNONADE
|
||||
.4byte Move_G_MAX_BEFUDDLE
|
||||
.4byte Move_G_MAX_VOLT_CRASH
|
||||
.4byte Move_G_MAX_GOLD_RUSH
|
||||
.4byte Move_G_MAX_CHI_STRIKE
|
||||
.4byte Move_G_MAX_TERROR
|
||||
.4byte Move_G_MAX_FOAM_BURST
|
||||
.4byte Move_G_MAX_RESONANCE
|
||||
.4byte Move_G_MAX_CUDDLE
|
||||
.4byte Move_G_MAX_REPLENISH
|
||||
.4byte Move_G_MAX_MALODOR
|
||||
.4byte Move_G_MAX_MELTDOWN
|
||||
.4byte Move_G_MAX_DRUM_SOLO
|
||||
.4byte Move_G_MAX_FIREBALL
|
||||
.4byte Move_G_MAX_HYDROSNIPE
|
||||
.4byte Move_G_MAX_WIND_RAGE
|
||||
.4byte Move_G_MAX_GRAVITAS
|
||||
.4byte Move_G_MAX_STONESURGE
|
||||
.4byte Move_G_MAX_VOLCALITH
|
||||
.4byte Move_G_MAX_TARTNESS
|
||||
.4byte Move_G_MAX_SWEETNESS
|
||||
.4byte Move_G_MAX_SANDBLAST
|
||||
.4byte Move_G_MAX_STUN_SHOCK
|
||||
.4byte Move_G_MAX_CENTIFERNO
|
||||
.4byte Move_G_MAX_SMITE
|
||||
.4byte Move_G_MAX_SNOOZE
|
||||
.4byte Move_G_MAX_FINALE
|
||||
.4byte Move_G_MAX_STEELSURGE
|
||||
.4byte Move_G_MAX_DEPLETION
|
||||
.4byte Move_G_MAX_ONE_BLOW
|
||||
.4byte Move_G_MAX_RAPID_FLOW
|
||||
@@@ Last Move - cannot be reached
|
||||
.4byte Move_COUNT
|
||||
|
||||
@@ -949,6 +1007,9 @@ gBattleAnims_General::
|
||||
.4byte General_Snow @ B_ANIM_SNOW_CONTINUES
|
||||
.4byte General_UltraBurst @ B_ANIM_ULTRA_BURST
|
||||
.4byte General_SaltCureDamage @ B_ANIM_SALT_CURE_DAMAGE
|
||||
.4byte General_DynamaxGrowth @ B_ANIM_DYNAMAX_GROWTH
|
||||
.4byte General_SetWeather @ B_ANIM_MAX_SET_WEATHER
|
||||
.4byte General_SyrupBombSpeedDrop @ B_ANIM_SYRUP_BOMB_SPEED_DROP
|
||||
|
||||
.align 2
|
||||
gBattleAnims_Special::
|
||||
@@ -4000,58 +4061,57 @@ Move_BUG_BITE:
|
||||
end
|
||||
|
||||
Move_CHARGE_BEAM:
|
||||
loadspritegfx ANIM_TAG_BLACK_BALL_2
|
||||
loadspritegfx ANIM_TAG_ELECTRIC_ORBS
|
||||
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
|
||||
loadspritegfx ANIM_TAG_ELECTRICITY
|
||||
loadspritegfx ANIM_TAG_SPARK_2
|
||||
delay 0
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 5, 5, RGB(31, 31, 22)
|
||||
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, 0, 1, 0
|
||||
delay 0
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, 0, 1, 0
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 24, 121, 13, 0, 1, 1
|
||||
delay 0
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
|
||||
delay 10
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 5, 5, RGB(31, 31, 22)
|
||||
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, 0, 1, 0
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, 0, 1, 1
|
||||
delay 0
|
||||
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 24, 165, 10, 0, 1, 1
|
||||
delay 0
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
|
||||
setalpha 12, 8
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 4, RGB_BLACK
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2
|
||||
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
|
||||
delay 12
|
||||
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, RGB(31, 31, 22)
|
||||
delay 50
|
||||
createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 16, 0, 5
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 11, 0, RGB(31, 31, 22)
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(31, 31, 22)
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
call SparkBeam
|
||||
delay 20
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 7, 7, RGB(31, 31, 22)
|
||||
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0
|
||||
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0
|
||||
delay 4
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
|
||||
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER
|
||||
createsprite gZapCannonBallSpriteTemplate, ANIM_TARGET, 3, 10, 0, 0, 0, 30, 0
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 64, 40, 1
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 128, 40, 0
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 192, 40, 2
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 32, 40, 0
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 96, 40, 1
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 160, 40, 0
|
||||
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 8, 30, 224, 40, 2
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
|
||||
delay 15
|
||||
waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 19
|
||||
call ElectricityEffect
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(31, 31, 22)
|
||||
waitforvisualfinish
|
||||
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 4, 4, 0, RGB_BLACK
|
||||
blendoff
|
||||
end
|
||||
|
||||
SparkBeam:
|
||||
createsprite gSparkBeamSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
|
||||
delay 1
|
||||
createsprite gSparkBeamSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
|
||||
delay 1
|
||||
return
|
||||
|
||||
Move_WOOD_HAMMER:
|
||||
loadspritegfx ANIM_TAG_WOOD_HAMMER
|
||||
loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER
|
||||
@@ -4236,22 +4296,22 @@ Move_HEAL_ORDER:
|
||||
|
||||
Move_HEAD_SMASH:
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
call SetImpactBackground
|
||||
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
|
||||
loadspritegfx ANIM_TAG_ROCKS
|
||||
createvisualtask AnimTask_SkullBashPosition, 2, 0
|
||||
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
|
||||
waitforvisualfinish
|
||||
delay 2
|
||||
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
|
||||
playse SE_BANG
|
||||
call SetImpactBackground
|
||||
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 40, 1
|
||||
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
|
||||
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 0
|
||||
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
|
||||
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4
|
||||
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2
|
||||
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 28, 2, 3
|
||||
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 30, 4, 3
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 4, 1
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
|
||||
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
|
||||
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
|
||||
loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 8, 3
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
delay 2
|
||||
createvisualtask AnimTask_SkullBashPosition, 2, 1
|
||||
restorebg
|
||||
waitbgfadein
|
||||
end
|
||||
@@ -4800,19 +4860,82 @@ Move_WONDER_ROOM::
|
||||
end
|
||||
|
||||
Move_PSYSHOCK:
|
||||
loadspritegfx ANIM_TAG_RED_ORB_2
|
||||
loadspritegfx ANIM_TAG_POISON_JAB
|
||||
loadspritegfx ANIM_TAG_GRAY_SMOKE
|
||||
loadspritegfx ANIM_TAG_WISP_FIRE
|
||||
monbg ANIM_TARGET
|
||||
setalpha 8, 8
|
||||
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 8, RGB(31, 23, 0)
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 8, RGB_WHITE
|
||||
waitforvisualfinish
|
||||
loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
|
||||
createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
|
||||
delay 10
|
||||
call PsyshockConverge
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
end
|
||||
|
||||
PsyshockConverge:
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 40, 40, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -40, -40, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 0, 40, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 0, -40, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 40, -20, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 40, 20, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -40, -20, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -40, 20, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -20, 30, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 20, -30, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -20, -30, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 20, 30, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, -40, 0, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockOrbSpriteTemplate, ANIM_TARGET, 2, 40, 0, 16
|
||||
playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
|
||||
delay 6
|
||||
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 15, 1
|
||||
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 0, 1
|
||||
createsprite gPsyshockSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0
|
||||
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockSmokeSpriteTemplate, ANIM_TARGET, 2, -8, -8, 1, 0
|
||||
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockSmokeSpriteTemplate, ANIM_TARGET, 2, 8, -8, 1, 0
|
||||
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gPsyshockSmokeSpriteTemplate, ANIM_TARGET, 2, -8, 8, 1, 0
|
||||
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
return
|
||||
|
||||
Move_VENOSHOCK:
|
||||
loadspritegfx ANIM_TAG_POISON_BUBBLE
|
||||
loadspritegfx ANIM_TAG_TOXIC_BUBBLE
|
||||
@@ -5741,23 +5864,79 @@ Move_QUASH:
|
||||
|
||||
Move_ACROBATICS:
|
||||
loadspritegfx ANIM_TAG_ROUND_SHADOW
|
||||
loadspritegfx ANIM_TAG_WHITE_STREAK
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
monbg ANIM_TARGET
|
||||
setalpha 12, 8
|
||||
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
|
||||
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
|
||||
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
|
||||
delay 7
|
||||
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
|
||||
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, 1, 0
|
||||
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
|
||||
call SetSkyBg
|
||||
call AcrobaticsSlashes
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_TARGET
|
||||
blendoff
|
||||
visible ANIM_ATTACKER
|
||||
call UnsetSkyBg
|
||||
end
|
||||
|
||||
AcrobaticsSlashes:
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 40, 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -10, 3
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 24, -19
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -28, -15
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -6, -30
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -20, 6
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 28, 2
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -14, -25
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 9, -2
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -1, 0
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 21, 4
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 28, 20
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -7, 24
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -11, 1
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 12, -18
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -21, -14
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -29, 7
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 15, 28
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 1
|
||||
createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -21, -16
|
||||
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
|
||||
delay 2
|
||||
return
|
||||
|
||||
Move_REFLECT_TYPE:
|
||||
loadspritegfx ANIM_TAG_GUARD_RING @ring around user
|
||||
loadspritegfx ANIM_TAG_ICE_CHUNK @blue green color
|
||||
@@ -8252,17 +8431,99 @@ Move_FELL_STINGER:
|
||||
end
|
||||
|
||||
Move_PHANTOM_FORCE:
|
||||
choosetwoturnanim PhantomForceSetUp, PhantomForceUnleash
|
||||
PhantomForceEnd:
|
||||
loadspritegfx ANIM_TAG_ROUND_SHADOW
|
||||
loadspritegfx ANIM_TAG_IMPACT
|
||||
choosetwoturnanim PhantomForcePrep PhantomForceAttack
|
||||
PhantomForceWaitEnd:
|
||||
waitforvisualfinish
|
||||
restorebg
|
||||
waitbgfadein
|
||||
end
|
||||
PhantomForceSetUp:
|
||||
PhantomForcePrep:
|
||||
monbg ANIM_ATTACKER
|
||||
fadetobg BG_GHOST
|
||||
waitbgfadein
|
||||
delay 0
|
||||
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
|
||||
createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATTACKER
|
||||
invisible ANIM_ATTACKER
|
||||
goto PhantomForceEnd
|
||||
PhantomForceUnleash:
|
||||
visible ANIM_ATTACKER
|
||||
goto PhantomForceEnd
|
||||
delay 1
|
||||
goto PhantomForceWaitEnd
|
||||
PhantomForceAttack:
|
||||
loadspritegfx ANIM_TAG_PURPLE_FLAME
|
||||
loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond
|
||||
monbg ANIM_ATTACKER
|
||||
splitbgprio ANIM_ATTACKER
|
||||
fadetobg BG_GHOST
|
||||
waitbgfadein
|
||||
delay 1
|
||||
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
|
||||
setalpha 12, 8
|
||||
waitforvisualfinish
|
||||
delay 10
|
||||
playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_PurpleFlamesOnTarget, 0x3
|
||||
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x30
|
||||
delay 30
|
||||
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
|
||||
waitforvisualfinish
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
|
||||
createvisualtask SoundTask_PlaySE1WithPanning, 5, 215, SOUND_PAN_TARGET
|
||||
delay 3
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_DEF_PARTNER, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_ATK_PARTNER, 2
|
||||
createvisualtask SoundTask_PlaySE1WithPanning, 5, 215, SOUND_PAN_TARGET
|
||||
delay 3
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_DEF_PARTNER, 2
|
||||
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_ATK_PARTNER, 2
|
||||
createvisualtask SoundTask_PlaySE1WithPanning, 5, 215, SOUND_PAN_TARGET
|
||||
delay 3
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 0, 2, 0, 13, RGB_PURPLE
|
||||
waitforvisualfinish
|
||||
delay 1
|
||||
playsewithpan SOUND_PAN_ATTACKER, 192
|
||||
createvisualtask AnimTask_NightShadeClone, 5, 10
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_ATTACKER
|
||||
delay 1
|
||||
goto PhantomForceWaitEnd
|
||||
PhantomForceBg:
|
||||
fadetobg BG_DARK
|
||||
waitbgfadeout
|
||||
createvisualtask AnimTask_FadeScreenToWhite, 5
|
||||
waitbgfadein
|
||||
return
|
||||
|
||||
Move_TRICK_OR_TREAT:
|
||||
loadspritegfx ANIM_TAG_EYE_SPARKLE
|
||||
loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
|
||||
fadetobg BG_NIGHTMARE
|
||||
waitbgfadein
|
||||
delay 10
|
||||
playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 8, RGB(10, 2, 19)
|
||||
waitforvisualfinish
|
||||
playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_ScaryFace, 5
|
||||
delay 13
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 12, RGB(10, 2, 19) @;Deep purple
|
||||
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
|
||||
createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2
|
||||
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
|
||||
waitforvisualfinish
|
||||
clearmonbg ANIM_TARGET
|
||||
restorebg
|
||||
waitbgfadein
|
||||
end
|
||||
|
||||
Move_NOBLE_ROAR:
|
||||
@@ -15101,16 +15362,21 @@ Move_SILK_TRAP::
|
||||
clearmonbg ANIM_ATK_PARTNER
|
||||
end
|
||||
|
||||
@ Also used by Snow weather. Currently identical with Move_HAIL
|
||||
@ Also used by Snow weather. Credits to Dat.H A
|
||||
Move_SNOWSCAPE::
|
||||
loadspritegfx ANIM_TAG_HAIL
|
||||
loadspritegfx ANIM_TAG_ICE_CRYSTALS
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 6, RGB_BLACK
|
||||
loadspritegfx ANIM_TAG_SNOWFLAKES
|
||||
playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 0, 4, RGB(11, 18, 22)
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_Hail, 5
|
||||
loopsewithpan SE_M_HAIL, 0, 8, 10
|
||||
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
|
||||
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
|
||||
createvisualtask AnimTask_CreateSnowflakes, 2, 0, 3, 120
|
||||
delay 120
|
||||
playsewithpan SE_M_GUST2, SOUND_PAN_ATTACKER
|
||||
delay 30
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS), 2, 4, 0, RGB(11, 18, 22)
|
||||
waitforvisualfinish
|
||||
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 6, 0, RGB_BLACK
|
||||
end
|
||||
|
||||
@Credits to Skeli
|
||||
@@ -16459,6 +16725,113 @@ Move_DOUBLE_SHOCK::
|
||||
blendoff
|
||||
end
|
||||
|
||||
Move_SYRUP_BOMB::
|
||||
createvisualtask AnimTask_SyrupBomb, 0x5
|
||||
jumpargeq 0x0, FALSE, Move_SYRUP_BOMB_RED
|
||||
jumpargeq 0x0, TRUE, Move_SYRUP_BOMB_YELLOW
|
||||
|
||||
@ Credits to Dat.H A
|
||||
Move_SYRUP_BOMB_RED:
|
||||
loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
|
||||
loadspritegfx ANIM_TAG_SYRUP_SPLAT_RED
|
||||
loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
call SyrupBombProjectileRed
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
|
||||
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
|
||||
delay 5
|
||||
createsprite gSyrupBombRedShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
|
||||
createsprite gSyrupBombRedHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
|
||||
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
|
||||
delay 5
|
||||
waitsound
|
||||
waitforvisualfinish
|
||||
end
|
||||
SyrupBombProjectileRed:
|
||||
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
|
||||
createsprite gSyrupRedProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
|
||||
delay 3
|
||||
return
|
||||
|
||||
Move_SYRUP_BOMB_YELLOW:
|
||||
loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
|
||||
loadspritegfx ANIM_TAG_SYRUP_SPLAT_YELLOW
|
||||
loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
call SyrupBombProjectileYellow
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
|
||||
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
|
||||
delay 5
|
||||
createsprite gSyrupBombYellowShellSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 100
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -8, -44, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, -46, -28, 20
|
||||
createsprite gSyrupBombYellowHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
|
||||
playsewithpan SE_M_DIG, SOUND_PAN_TARGET
|
||||
delay 5
|
||||
waitsound
|
||||
waitforvisualfinish
|
||||
end
|
||||
SyrupBombProjectileYellow:
|
||||
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
|
||||
createsprite gSyrupYellowProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 40, 0
|
||||
delay 3
|
||||
return
|
||||
|
||||
General_SyrupBombSpeedDrop::
|
||||
createvisualtask AnimTask_StickySyrup, 0x5
|
||||
jumpargeq 0x0, FALSE, SyrupBombSpeedDropRed
|
||||
jumpargeq 0x0, TRUE, SyrupBombSpeedDropYellow
|
||||
|
||||
SyrupBombSpeedDropRed:
|
||||
loadspritegfx ANIM_TAG_SYRUP_BLOB_RED
|
||||
loadspritegfx ANIM_TAG_SYRUP_SHELL_RED
|
||||
loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(20, 3, 3)
|
||||
createsprite gSyrupBombRedShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
SyrupBombSpeedDropYellow:
|
||||
loadspritegfx ANIM_TAG_SYRUP_BLOB_YELLOW
|
||||
loadspritegfx ANIM_TAG_SYRUP_SHELL_YELLOW
|
||||
loopsewithpan SE_M_TOXIC, SOUND_PAN_TARGET, 13, 6
|
||||
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 3, 0, 15, 1
|
||||
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(23, 13, 1)
|
||||
createsprite gSyrupBombYellowShellBSpriteTemplate, ANIM_TARGET, 1, ANIM_TARGET, 60
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
Move_TERA_BLAST::
|
||||
Move_AXE_KICK::
|
||||
Move_LAST_RESPECTS::
|
||||
@@ -16505,6 +16878,9 @@ Move_COMBAT_TORQUE::
|
||||
Move_MAGICAL_TORQUE::
|
||||
Move_PSYBLADE::
|
||||
Move_HYDRO_STEAM::
|
||||
Move_BLOOD_MOON::
|
||||
Move_MATCHA_GOTCHA::
|
||||
Move_IVY_CUDGEL::
|
||||
end @to do
|
||||
|
||||
@@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@
|
||||
@@ -19418,8 +19794,8 @@ Move_MILK_DRINK:
|
||||
Move_MAGNITUDE:
|
||||
createvisualtask AnimTask_IsPowerOver99, 2
|
||||
waitforvisualfinish
|
||||
jumpargeq 15, FALSE, MagnitudeRegular
|
||||
jumpargeq 15, TRUE, MagnitudeIntense
|
||||
jumpreteq FALSE, MagnitudeRegular
|
||||
jumpreteq TRUE, MagnitudeIntense
|
||||
MagnitudeEnd:
|
||||
end
|
||||
MagnitudeRegular:
|
||||
@@ -27121,9 +27497,9 @@ General_AffectionHangedOn::
|
||||
createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
|
||||
delay 15
|
||||
createvisualtask AnimTask_AffectionHangedOn, 0x5
|
||||
jumpargeq 0x0, FRIENDSHIP_100_TO_149, General_AffectionHangedOn_3Hearts
|
||||
jumpargeq 0x0, FRIENDSHIP_150_TO_199, General_AffectionHangedOn_4Hearts
|
||||
jumpargeq 0x0, FRIENDSHIP_200_TO_254, General_AffectionHangedOn_5Hearts
|
||||
jumpargeq 0x0, AFFECTION_THREE_HEARTS, General_AffectionHangedOn_3Hearts
|
||||
jumpargeq 0x0, AFFECTION_FOUR_HEARTS, General_AffectionHangedOn_4Hearts
|
||||
jumpargeq 0x0, AFFECTION_FIVE_HEARTS, General_AffectionHangedOn_5Hearts
|
||||
createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, -384, -31
|
||||
General_AffectionHangedOn_5Hearts:
|
||||
createsprite gRedHeartBurstSpriteTemplate, ANIM_ATTACKER, 3, -128, -22
|
||||
@@ -32860,3 +33236,182 @@ SoulStealingSevenStarStrikeExplosion:
|
||||
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
|
||||
delay 0x6
|
||||
return
|
||||
|
||||
@@@@@@@@@@ MAX MOVES @@@@@@@@@@
|
||||
General_SetWeather::
|
||||
createvisualtask AnimTask_GetWeatherToSet, 2
|
||||
jumpreteq 1, General_Sun
|
||||
jumpreteq 2, General_Rain
|
||||
jumpreteq 3, General_Sandstorm
|
||||
jumpreteq 4, General_Hail
|
||||
end
|
||||
|
||||
Move_MAX_GUARD:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_PROTECT
|
||||
end
|
||||
|
||||
Move_MAX_STRIKE:
|
||||
Move_G_MAX_REPLENISH:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_GIGA_IMPACT
|
||||
end
|
||||
|
||||
Move_MAX_AIRSTREAM:
|
||||
Move_G_MAX_WIND_RAGE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_AEROBLAST
|
||||
end
|
||||
|
||||
Move_MAX_OOZE:
|
||||
Move_G_MAX_MALODOR:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_GUNK_SHOT
|
||||
end
|
||||
|
||||
Move_G_MAX_WILDFIRE:
|
||||
Move_G_MAX_FIREBALL:
|
||||
Move_G_MAX_CENTIFERNO:
|
||||
Move_MAX_FLARE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_BLAST_BURN
|
||||
end
|
||||
|
||||
Move_G_MAX_CANNONADE:
|
||||
Move_G_MAX_HYDROSNIPE:
|
||||
Move_G_MAX_FOAM_BURST:
|
||||
Move_MAX_GEYSER:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_HYDRO_CANNON
|
||||
end
|
||||
|
||||
Move_G_MAX_VINE_LASH:
|
||||
Move_G_MAX_DRUM_SOLO:
|
||||
Move_G_MAX_TARTNESS:
|
||||
Move_G_MAX_SWEETNESS:
|
||||
Move_MAX_OVERGROWTH:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_FRENZY_PLANT
|
||||
end
|
||||
|
||||
Move_MAX_LIGHTNING:
|
||||
Move_G_MAX_STUN_SHOCK:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_ZAP_CANNON
|
||||
end
|
||||
|
||||
Move_G_MAX_CHI_STRIKE:
|
||||
Move_G_MAX_ONE_BLOW:
|
||||
Move_G_MAX_RAPID_FLOW:
|
||||
Move_MAX_KNUCKLE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_CLOSE_COMBAT
|
||||
end
|
||||
|
||||
Move_G_MAX_RESONANCE:
|
||||
Move_MAX_HAILSTORM:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_SHEER_COLD
|
||||
end
|
||||
|
||||
Move_G_MAX_SANDBLAST:
|
||||
Move_MAX_QUAKE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_FISSURE
|
||||
end
|
||||
|
||||
Move_G_MAX_BEFUDDLE:
|
||||
Move_MAX_FLUTTERBY:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_BUG_BUZZ
|
||||
end
|
||||
|
||||
Move_G_MAX_STEELSURGE:
|
||||
Move_G_MAX_MELTDOWN:
|
||||
Move_MAX_STEELSPIKE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_HEAVY_SLAM
|
||||
end
|
||||
|
||||
Move_G_MAX_TERROR:
|
||||
Move_MAX_PHANTASM:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_PHANTOM_FORCE
|
||||
end
|
||||
|
||||
Move_G_MAX_GRAVITAS:
|
||||
Move_MAX_MINDSTORM:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_PSYCHO_BOOST
|
||||
end
|
||||
|
||||
Move_G_MAX_SMITE:
|
||||
Move_G_MAX_FINALE:
|
||||
Move_MAX_STARFALL:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_MOONBLAST
|
||||
end
|
||||
|
||||
Move_G_MAX_STONESURGE:
|
||||
Move_G_MAX_VOLCALITH:
|
||||
Move_MAX_ROCKFALL:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_ROCK_WRECKER
|
||||
end
|
||||
|
||||
Move_G_MAX_DEPLETION:
|
||||
Move_MAX_WYRMWIND:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_SPACIAL_REND
|
||||
end
|
||||
|
||||
Move_G_MAX_SNOOZE:
|
||||
Move_MAX_DARKNESS:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_DARK_PULSE
|
||||
end
|
||||
|
||||
Move_G_MAX_CUDDLE:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_COVET
|
||||
end
|
||||
|
||||
Move_G_MAX_VOLT_CRASH:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_VOLT_TACKLE
|
||||
end
|
||||
|
||||
Move_G_MAX_GOLD_RUSH:
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x1
|
||||
waitforvisualfinish
|
||||
goto Move_PAY_DAY
|
||||
end
|
||||
|
||||
@@@ DYNAMAX AND MAX RAIDS
|
||||
General_DynamaxGrowth:: @ PORTED FROM CFRU
|
||||
createvisualtask SoundTask_PlayCryWithEcho, 2, ANIM_ATTACKER, 2
|
||||
delay 8
|
||||
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x0
|
||||
waitforvisualfinish
|
||||
end
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -245,7 +245,7 @@ BattleScript_TrainerASlideMsgRet::
|
||||
BattleScript_TrainerASlideMsgEnd2::
|
||||
call BattleScript_TrainerASlideMsgRet
|
||||
end2
|
||||
|
||||
|
||||
BattleScript_TrainerBSlideMsgRet::
|
||||
handletrainerslidemsg BS_SCRIPTING, 0
|
||||
trainerslidein B_POSITION_OPPONENT_RIGHT
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "config.h"
|
||||
#include "constants/global.h"
|
||||
#include "constants/contest.h"
|
||||
.include "asm/macros.inc"
|
||||
@@ -435,11 +436,11 @@ AI_CGM_BetterWhenAudienceExcited:
|
||||
AI_CGM_BetterWhenAudienceExcited_1stUp:
|
||||
@ BUG: Should be if_appeal_num_eq 0
|
||||
@ 1st up on 1st appeal excitement will always be 0
|
||||
.ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
|
||||
.else
|
||||
#else
|
||||
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
|
||||
.endif
|
||||
#endif
|
||||
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
|
||||
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
|
||||
end
|
||||
@@ -546,11 +547,11 @@ AI_CGM_TargetMonWithJudgesAttention:
|
||||
end
|
||||
AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
|
||||
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
|
||||
.ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
|
||||
.else
|
||||
#else
|
||||
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
|
||||
.endif
|
||||
#endif
|
||||
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
|
||||
score +2
|
||||
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
|
||||
@@ -559,11 +560,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
|
||||
AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
|
||||
if_user_order_eq MON_2, AI_CGM_End
|
||||
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
|
||||
.ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
|
||||
.else
|
||||
#else
|
||||
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
|
||||
.endif
|
||||
#endif
|
||||
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
|
||||
score +2
|
||||
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
|
||||
@@ -572,11 +573,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
|
||||
AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
|
||||
if_user_order_eq MON_3, AI_CGM_End
|
||||
if_cannot_participate MON_3, AI_CGM_End
|
||||
.ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
if_not_used_combo_starter MON_3, AI_CGM_End
|
||||
.else
|
||||
#else
|
||||
if_used_combo_starter MON_3, AI_CGM_End
|
||||
.endif
|
||||
#endif
|
||||
if_random_less_than 125, AI_CGM_End
|
||||
score +2
|
||||
if_not_completed_combo MON_3, AI_CGM_End
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
#include "config.h"
|
||||
#include "config/battle.h"
|
||||
#include "config/item.h"
|
||||
#include "constants/global.h"
|
||||
|
||||
@@ -415,18 +415,18 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
|
||||
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
|
||||
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
|
||||
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
|
||||
.ifndef BUGFIX
|
||||
#ifndef BUGFIX
|
||||
tower_save 0
|
||||
.endif
|
||||
#endif
|
||||
call Common_EventScript_SaveGame
|
||||
setvar VAR_TEMP_CHALLENGE_STATUS, 255
|
||||
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
|
||||
@ GAME_STAT_ENTERED_BATTLE_TOWER should not be incremented here, for two reasons:
|
||||
@ 1. It is incremented again in BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful or BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
|
||||
@ 2. If the player tries to save, but fails, the counter will still be incremented even if the player never enters the tower.
|
||||
.ifndef BUGFIX
|
||||
@ 2. If the player tries to connect, but fails, the counter will still be incremented even if the player never enters the tower.
|
||||
#ifndef BUGFIX
|
||||
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
|
||||
.endif
|
||||
#endif
|
||||
specialvar VAR_RESULT, IsWirelessAdapterConnected
|
||||
goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
|
||||
goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink
|
||||
|
||||
@@ -81,11 +81,11 @@ BirthIsland_Exterior_EventScript_Deoxys::
|
||||
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
|
||||
waitmovement 0
|
||||
waitse
|
||||
playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
|
||||
playmoncry SPECIES_DEOXYS_NORMAL, CRY_MODE_ENCOUNTER
|
||||
delay 40
|
||||
waitmoncry
|
||||
setvar VAR_LAST_TALKED, LOCALID_DEOXYS
|
||||
seteventmon SPECIES_DEOXYS, 30
|
||||
seteventmon SPECIES_DEOXYS_NORMAL, 30
|
||||
setflag FLAG_SYS_CTRL_OBJ_DELETE
|
||||
special BattleSetup_StartLegendaryBattle
|
||||
waitstate
|
||||
@@ -100,12 +100,12 @@ BirthIsland_Exterior_EventScript_Deoxys::
|
||||
|
||||
BirthIsland_Exterior_EventScript_DefeatedDeoxys::
|
||||
setflag FLAG_DEFEATED_DEOXYS
|
||||
setvar VAR_0x8004, SPECIES_DEOXYS
|
||||
setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
|
||||
goto Common_EventScript_LegendaryFlewAway
|
||||
end
|
||||
|
||||
BirthIsland_Exterior_EventScript_RanFromDeoxys::
|
||||
setvar VAR_0x8004, SPECIES_DEOXYS
|
||||
setvar VAR_0x8004, SPECIES_DEOXYS_NORMAL
|
||||
goto Common_EventScript_LegendaryFlewAway
|
||||
end
|
||||
|
||||
|
||||
@@ -229,11 +229,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2::
|
||||
copyobjectxytoperm LOCALID_STAIR_GRUNT
|
||||
switch VAR_FACING
|
||||
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
|
||||
#ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
|
||||
#else
|
||||
#else
|
||||
case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
|
||||
#endif
|
||||
#endif
|
||||
applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
|
||||
waitmovement 0
|
||||
setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
|
||||
|
||||
@@ -88,8 +88,8 @@ Route119_WeatherInstitute_2F_EventScript_ShellyDefeated::
|
||||
|
||||
Route119_WeatherInstitute_2F_EventScript_ReceiveCastform::
|
||||
msgbox Route119_WeatherInstitute_2F_Text_ThanksPleaseTakePokemon, MSGBOX_DEFAULT
|
||||
setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM
|
||||
givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER
|
||||
setvar VAR_TEMP_TRANSFERRED_SPECIES, SPECIES_CASTFORM_NORMAL
|
||||
givemon SPECIES_CASTFORM_NORMAL, 25, ITEM_MYSTIC_WATER
|
||||
goto_if_eq VAR_RESULT, MON_GIVEN_TO_PARTY, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformParty
|
||||
goto_if_eq VAR_RESULT, MON_GIVEN_TO_PC, Route119_WeatherInstitute_2F_EventScript_ReceiveCastformPC
|
||||
goto Common_EventScript_NoMoreRoomForPokemon
|
||||
@@ -122,7 +122,7 @@ Route119_WeatherInstitute_2F_EventScript_ReceivedCastformFanfare::
|
||||
message Route119_WeatherInstitute_2F_Text_PlayerReceivedCastform
|
||||
waitmessage
|
||||
waitfanfare
|
||||
bufferspeciesname STR_VAR_1, SPECIES_CASTFORM
|
||||
bufferspeciesname STR_VAR_1, SPECIES_CASTFORM_NORMAL
|
||||
return
|
||||
|
||||
Route119_WeatherInstitute_2F_EventScript_ExplainCastform::
|
||||
|
||||
@@ -39,6 +39,32 @@ Debug_CheatStart::
|
||||
setvar VAR_BRINEY_HOUSE_STATE, 1
|
||||
setvar VAR_ROUTE116_STATE, 2
|
||||
setflag FLAG_HIDE_ROUTE_116_MR_BRINEY
|
||||
setflag FLAG_BADGE01_GET
|
||||
setflag FLAG_BADGE02_GET
|
||||
setflag FLAG_BADGE03_GET
|
||||
setflag FLAG_BADGE04_GET
|
||||
setflag FLAG_BADGE05_GET
|
||||
setflag FLAG_BADGE06_GET
|
||||
setflag FLAG_BADGE07_GET
|
||||
setflag FLAG_BADGE08_GET
|
||||
setflag FLAG_VISITED_LITTLEROOT_TOWN
|
||||
setflag FLAG_VISITED_OLDALE_TOWN
|
||||
setflag FLAG_VISITED_DEWFORD_TOWN
|
||||
setflag FLAG_VISITED_LAVARIDGE_TOWN
|
||||
setflag FLAG_VISITED_FALLARBOR_TOWN
|
||||
setflag FLAG_VISITED_VERDANTURF_TOWN
|
||||
setflag FLAG_VISITED_PACIFIDLOG_TOWN
|
||||
setflag FLAG_VISITED_PETALBURG_CITY
|
||||
setflag FLAG_VISITED_SLATEPORT_CITY
|
||||
setflag FLAG_VISITED_MAUVILLE_CITY
|
||||
setflag FLAG_VISITED_RUSTBORO_CITY
|
||||
setflag FLAG_VISITED_FORTREE_CITY
|
||||
setflag FLAG_VISITED_LILYCOVE_CITY
|
||||
setflag FLAG_VISITED_MOSSDEEP_CITY
|
||||
setflag FLAG_VISITED_SOOTOPOLIS_CITY
|
||||
setflag FLAG_VISITED_EVER_GRANDE_CITY
|
||||
setflag FLAG_LANDMARK_POKEMON_LEAGUE
|
||||
setflag FLAG_LANDMARK_BATTLE_FRONTIER
|
||||
clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
|
||||
clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
|
||||
release
|
||||
@@ -69,28 +95,28 @@ Debug_BoxFilledMessage::
|
||||
Debug_BoxFilledMessage_Text:
|
||||
.string "Storage boxes filled!$"
|
||||
|
||||
Debug_Script_1::
|
||||
Debug_EventScript_Script_1::
|
||||
end
|
||||
|
||||
Debug_Script_2::
|
||||
Debug_EventScript_Script_2::
|
||||
end
|
||||
|
||||
Debug_Script_3::
|
||||
Debug_EventScript_Script_3::
|
||||
end
|
||||
|
||||
Debug_Script_4::
|
||||
Debug_EventScript_Script_4::
|
||||
end
|
||||
|
||||
Debug_Script_5::
|
||||
Debug_EventScript_Script_5::
|
||||
end
|
||||
|
||||
Debug_Script_6::
|
||||
Debug_EventScript_Script_6::
|
||||
end
|
||||
|
||||
Debug_Script_7::
|
||||
Debug_EventScript_Script_7::
|
||||
end
|
||||
|
||||
Debug_Script_8::
|
||||
Debug_EventScript_Script_8::
|
||||
end
|
||||
|
||||
Debug_CheckSaveBlock::
|
||||
@@ -104,13 +130,26 @@ Debug_CheckSaveBlock::
|
||||
end
|
||||
|
||||
Debug_SaveBlock1Size::
|
||||
.string "SaveBlock1 size: {STR_VAR_1}/{STR_VAR_2}.$"
|
||||
.string "SaveBlock1 size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
|
||||
.string "Free space: {STR_VAR_3}b.$"
|
||||
|
||||
Debug_SaveBlock2Size::
|
||||
.string "SaveBlock2 size: {STR_VAR_1}/{STR_VAR_2}.$"
|
||||
.string "SaveBlock2 size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
|
||||
.string "Free space: {STR_VAR_3}b.$"
|
||||
|
||||
Debug_PokemonStorageSize::
|
||||
.string "{PKMN}Storage size: {STR_VAR_1}/{STR_VAR_2}.$"
|
||||
.string "{PKMN}Storage size: {STR_VAR_1}b/{STR_VAR_2}b.\n"
|
||||
.string "Free space: {STR_VAR_3}b.$"
|
||||
|
||||
Debug_CheckROMSpace::
|
||||
callnative CheckROMSize
|
||||
msgbox Debug_ROMSize, MSGBOX_DEFAULT
|
||||
release
|
||||
end
|
||||
|
||||
Debug_ROMSize::
|
||||
.string "ROM size: {STR_VAR_1}MB/32MB.\n"
|
||||
.string "Free space: {STR_VAR_2}MB.$"
|
||||
|
||||
Debug_HatchAnEgg::
|
||||
lockall
|
||||
@@ -142,29 +181,38 @@ DebugScript_HatchAnEgg_Text_EmptyParty::
|
||||
|
||||
DebugScript_HatchAnEgg_Text_NotAnEgg::
|
||||
.string "That's not a Pokémon Egg.$"
|
||||
|
||||
|
||||
DebugScript_ZeroDaycareMons::
|
||||
msgbox DebugText_DaycareNoPokemon, MSGBOX_DEFAULT
|
||||
releaseall
|
||||
end
|
||||
|
||||
|
||||
DebugScript_OneDaycareMons::
|
||||
msgbox DebugText_DaycareOnePokemon, MSGBOX_DEFAULT
|
||||
releaseall
|
||||
end
|
||||
|
||||
|
||||
DebugScript_DaycareMonsNotCompatible::
|
||||
msgbox DebugText_DaycarePokemonNotCompatible, MSGBOX_DEFAULT
|
||||
releaseall
|
||||
end
|
||||
|
||||
|
||||
DebugText_DaycareNoPokemon:
|
||||
.string "You have no Pokémon at Daycare.$"
|
||||
|
||||
|
||||
DebugText_DaycareOnePokemon:
|
||||
.string "You have only one Pokémon at Daycare.$"
|
||||
|
||||
|
||||
DebugText_DaycarePokemonNotCompatible:
|
||||
.string "Your Pokémon at Daycare can't\nhave babies together!$"
|
||||
|
||||
Debug_ShowExpansionVersion::
|
||||
callnative BufferExpansionVersion
|
||||
msgbox Debug_ExpansionVersion, MSGBOX_DEFAULT
|
||||
release
|
||||
end
|
||||
|
||||
Debug_ExpansionVersion:
|
||||
.string "pokeemerald-expansion {STR_VAR_1}$"
|
||||
|
||||
.endif
|
||||
|
||||
@@ -13,9 +13,9 @@ TrainerHill_OnWarp:
|
||||
|
||||
TrainerHill_1F_EventScript_DummyOnWarp::
|
||||
setvar VAR_TEMP_3, 1
|
||||
.ifdef BUGFIX
|
||||
#ifdef BUGFIX
|
||||
end @ Missing end. By chance, the next byte (0x02 of VAR_TEMP_2) is also the id for the end cmd
|
||||
.endif
|
||||
#endif
|
||||
|
||||
TrainerHill_OnFrame:
|
||||
map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
|
||||
|
||||
@@ -377,6 +377,9 @@ u16 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset)
|
||||
u16 tileOffset;
|
||||
u8 cursor;
|
||||
|
||||
if (bg > 3)
|
||||
return -1;
|
||||
|
||||
if (GetBgControlAttribute(bg, BG_CTRL_ATTR_PALETTEMODE) == 0)
|
||||
{
|
||||
tileOffset = (sGpuBgConfigs2[bg].baseTile + destOffset) * 0x20;
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
#include "global.h"
|
||||
#include "malloc.h"
|
||||
#if TESTING
|
||||
#include "test/test.h"
|
||||
#endif
|
||||
|
||||
static void *sHeapStart;
|
||||
static u32 sHeapSize;
|
||||
@@ -71,7 +74,27 @@ void *AllocInternal(void *heapStart, u32 size, const char *location)
|
||||
}
|
||||
|
||||
if (pos->next == head)
|
||||
{
|
||||
#if TESTING
|
||||
const struct MemBlock *head = HeapHead();
|
||||
const struct MemBlock *block = head;
|
||||
do
|
||||
{
|
||||
if (block->allocated)
|
||||
{
|
||||
const char *location = MemBlockLocation(block);
|
||||
if (location)
|
||||
MgbaPrintf_("%s: %d bytes allocated", location, block->size);
|
||||
else
|
||||
MgbaPrintf_("<unknown>: %d bytes allocated", block->size);
|
||||
}
|
||||
block = block->next;
|
||||
}
|
||||
while (block != head);
|
||||
Test_ExitWithResult(TEST_RESULT_ERROR, "%s: OOM allocating %d bytes", location, size);
|
||||
#endif
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pos = pos->next;
|
||||
}
|
||||
|
||||
@@ -324,7 +324,7 @@ void AnimateSprites(void)
|
||||
void BuildOamBuffer(void)
|
||||
{
|
||||
bool32 oamLoadDisabled;
|
||||
u32 i, stride;
|
||||
u32 i;
|
||||
u8 oamIndex;
|
||||
|
||||
// All attributes which affect sorting packed into a single u32:
|
||||
|
||||
BIN
graphics/battle_anims/sprites/snowflakes.png
Normal file
BIN
graphics/battle_anims/sprites/snowflakes.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.9 KiB |
BIN
graphics/battle_anims/sprites/syrup_bomb_blob.png
Normal file
BIN
graphics/battle_anims/sprites/syrup_bomb_blob.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
graphics/battle_anims/sprites/syrup_bomb_shell.png
Normal file
BIN
graphics/battle_anims/sprites/syrup_bomb_shell.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 13 KiB |
BIN
graphics/battle_anims/sprites/syrup_bomb_splat.png
Normal file
BIN
graphics/battle_anims/sprites/syrup_bomb_splat.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.8 KiB |
19
graphics/battle_anims/sprites/syrup_red.pal
Normal file
19
graphics/battle_anims/sprites/syrup_red.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
30 255 0
|
||||
242 242 242
|
||||
255 194 173
|
||||
255 129 110
|
||||
224 51 38
|
||||
161 24 26
|
||||
110 30 36
|
||||
13 2 4
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
19
graphics/battle_anims/sprites/syrup_yellow.pal
Normal file
19
graphics/battle_anims/sprites/syrup_yellow.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
30 255 0
|
||||
242 242 242
|
||||
255 255 168
|
||||
255 235 82
|
||||
255 192 0
|
||||
185 104 4
|
||||
107 59 19
|
||||
13 2 4
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
200 224 240
|
||||
BIN
graphics/battle_interface/dynamax_indicator.png
Normal file
BIN
graphics/battle_interface/dynamax_indicator.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 268 B |
BIN
graphics/battle_interface/dynamax_trigger.png
Normal file
BIN
graphics/battle_interface/dynamax_trigger.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.7 KiB |
19
graphics/battle_interface/misc_indicator.pal
Normal file
19
graphics/battle_interface/misc_indicator.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 0
|
||||
224 74 106
|
||||
236 234 108
|
||||
154 45 48
|
||||
244 162 132
|
||||
32 127 216
|
||||
16 75 156
|
||||
184 224 240
|
||||
136 184 224
|
||||
213 207 207
|
||||
246 246 246
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
15
graphics/items/icon_palettes/clever_mochi.pal
Normal file
15
graphics/items/icon_palettes/clever_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
112 104 24
|
||||
72 64 32
|
||||
192 184 8
|
||||
216 208 8
|
||||
240 240 96
|
||||
248 248 0
|
||||
248 248 160
|
||||
248 248 216
|
||||
17
graphics/items/icon_palettes/cornerstone_mask.pal
Normal file
17
graphics/items/icon_palettes/cornerstone_mask.pal
Normal file
@@ -0,0 +1,17 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
14
|
||||
0 49 0
|
||||
32 24 24
|
||||
48 48 48
|
||||
72 72 80
|
||||
104 88 56
|
||||
16 112 160
|
||||
32 112 128
|
||||
112 104 112
|
||||
32 152 192
|
||||
136 144 144
|
||||
168 168 168
|
||||
48 208 240
|
||||
208 184 120
|
||||
240 240 240
|
||||
19
graphics/items/icon_palettes/fairy_feather.pal
Normal file
19
graphics/items/icon_palettes/fairy_feather.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
180 180 180
|
||||
11 15 16
|
||||
33 19 27
|
||||
59 38 38
|
||||
102 90 92
|
||||
200 124 124
|
||||
182 116 141
|
||||
255 124 189
|
||||
227 140 140
|
||||
253 155 155
|
||||
222 173 189
|
||||
255 175 175
|
||||
195 191 192
|
||||
252 161 206
|
||||
225 221 223
|
||||
245 245 245
|
||||
15
graphics/items/icon_palettes/fresh_start_mochi.pal
Normal file
15
graphics/items/icon_palettes/fresh_start_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
128 120 128
|
||||
63 63 63
|
||||
176 168 168
|
||||
216 208 216
|
||||
192 192 192
|
||||
224 232 224
|
||||
240 232 240
|
||||
248 248 248
|
||||
15
graphics/items/icon_palettes/genius_mochi.pal
Normal file
15
graphics/items/icon_palettes/genius_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
72 40 88
|
||||
72 40 88
|
||||
96 40 128
|
||||
96 40 120
|
||||
88 40 112
|
||||
112 48 160
|
||||
128 72 176
|
||||
128 80 176
|
||||
18
graphics/items/icon_palettes/glimmering_charm.pal
Normal file
18
graphics/items/icon_palettes/glimmering_charm.pal
Normal file
@@ -0,0 +1,18 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
15
|
||||
114 109 97
|
||||
0 0 0
|
||||
115 62 231
|
||||
57 95 90
|
||||
52 103 15
|
||||
48 101 216
|
||||
225 59 159
|
||||
136 154 143
|
||||
60 195 171
|
||||
76 204 74
|
||||
202 150 255
|
||||
142 191 235
|
||||
242 193 215
|
||||
238 219 161
|
||||
255 255 255
|
||||
15
graphics/items/icon_palettes/health_mochi.pal
Normal file
15
graphics/items/icon_palettes/health_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
32 64 86
|
||||
32 96 128
|
||||
16 128 176
|
||||
0 144 208
|
||||
0 176 240
|
||||
0 192 248
|
||||
72 200 248
|
||||
88 208 240
|
||||
19
graphics/items/icon_palettes/hearthflame_mask.pal
Normal file
19
graphics/items/icon_palettes/hearthflame_mask.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
110 101 110
|
||||
0 0 0
|
||||
40 40 40
|
||||
72 40 40
|
||||
136 48 48
|
||||
184 48 48
|
||||
72 88 88
|
||||
104 88 48
|
||||
232 64 48
|
||||
224 128 128
|
||||
192 144 64
|
||||
168 160 152
|
||||
32 200 232
|
||||
224 160 64
|
||||
248 200 72
|
||||
248 248 248
|
||||
15
graphics/items/icon_palettes/masterpiece_teacup.pal
Normal file
15
graphics/items/icon_palettes/masterpiece_teacup.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
56 48 48
|
||||
64 48 56
|
||||
80 48 32
|
||||
56 56 56
|
||||
72 64 72
|
||||
80 64 48
|
||||
96 64 40
|
||||
104 98 96
|
||||
174 163 155
|
||||
208 200 192
|
||||
224 224 208
|
||||
15
graphics/items/icon_palettes/muscle_mochi.pal
Normal file
15
graphics/items/icon_palettes/muscle_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
80 32 32
|
||||
128 32 32
|
||||
192 0 8
|
||||
248 40 48
|
||||
248 32 32
|
||||
248 0 0
|
||||
248 64 64
|
||||
248 80 80
|
||||
15
graphics/items/icon_palettes/resist_mochi.pal
Normal file
15
graphics/items/icon_palettes/resist_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
48 32 32
|
||||
40 40 40
|
||||
56 48 56
|
||||
48 48 48
|
||||
48 48 48
|
||||
64 64 64
|
||||
72 72 72
|
||||
88 88 88
|
||||
15
graphics/items/icon_palettes/swift_mochi.pal
Normal file
15
graphics/items/icon_palettes/swift_mochi.pal
Normal file
@@ -0,0 +1,15 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
12
|
||||
0 0 0
|
||||
0 0 0
|
||||
32 32 32
|
||||
40 40 40
|
||||
24 88 56
|
||||
24 48 40
|
||||
8 128 64
|
||||
8 152 72
|
||||
32 120 96
|
||||
0 176 80
|
||||
48 192 112
|
||||
80 200 144
|
||||
17
graphics/items/icon_palettes/syrupy_apple.pal
Normal file
17
graphics/items/icon_palettes/syrupy_apple.pal
Normal file
@@ -0,0 +1,17 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
14
|
||||
0 97 0
|
||||
36 39 38
|
||||
78 40 38
|
||||
192 24 40
|
||||
100 72 55
|
||||
240 48 40
|
||||
192 114 31
|
||||
248 112 48
|
||||
248 112 104
|
||||
248 135 16
|
||||
248 135 20
|
||||
248 144 120
|
||||
242 159 28
|
||||
216 192 184
|
||||
14
graphics/items/icon_palettes/unremarkable_teacup.pal
Normal file
14
graphics/items/icon_palettes/unremarkable_teacup.pal
Normal file
@@ -0,0 +1,14 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
11
|
||||
0 0 0
|
||||
56 48 48
|
||||
64 48 56
|
||||
56 56 56
|
||||
72 64 72
|
||||
80 64 48
|
||||
96 64 40
|
||||
104 98 96
|
||||
174 163 155
|
||||
208 200 192
|
||||
224 224 208
|
||||
16
graphics/items/icon_palettes/wellspring_mask.pal
Normal file
16
graphics/items/icon_palettes/wellspring_mask.pal
Normal file
@@ -0,0 +1,16 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
13
|
||||
0 0 0
|
||||
16 16 16
|
||||
40 40 40
|
||||
32 48 56
|
||||
24 80 128
|
||||
80 88 88
|
||||
32 104 112
|
||||
0 128 232
|
||||
56 144 176
|
||||
152 160 160
|
||||
56 200 232
|
||||
192 208 216
|
||||
248 248 248
|
||||
BIN
graphics/items/icons/cornerstone_mask.png
Normal file
BIN
graphics/items/icons/cornerstone_mask.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 383 B |
BIN
graphics/items/icons/fairy_feather.png
Normal file
BIN
graphics/items/icons/fairy_feather.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 266 B |
BIN
graphics/items/icons/glimmering_charm.png
Normal file
BIN
graphics/items/icons/glimmering_charm.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 324 B |
BIN
graphics/items/icons/hearthflame_mask.png
Normal file
BIN
graphics/items/icons/hearthflame_mask.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 368 B |
BIN
graphics/items/icons/masterpiece_teacup.png
Normal file
BIN
graphics/items/icons/masterpiece_teacup.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 328 B |
BIN
graphics/items/icons/mochi.png
Normal file
BIN
graphics/items/icons/mochi.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 262 B |
|
Before Width: | Height: | Size: 269 B After Width: | Height: | Size: 269 B |
BIN
graphics/items/icons/syrupy_apple.png
Normal file
BIN
graphics/items/icons/syrupy_apple.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 318 B |
BIN
graphics/items/icons/unremarkable_teacup.png
Normal file
BIN
graphics/items/icons/unremarkable_teacup.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 323 B |
BIN
graphics/items/icons/wellspring_mask.png
Normal file
BIN
graphics/items/icons/wellspring_mask.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 364 B |
@@ -1,21 +1,21 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
48
|
||||
193 33 177
|
||||
249 249 249
|
||||
225 225 225
|
||||
201 201 201
|
||||
169 169 169
|
||||
129 129 129
|
||||
249 153 161
|
||||
233 49 49
|
||||
193 33 41
|
||||
145 17 33
|
||||
249 153 161
|
||||
193 33 41
|
||||
141 251 184
|
||||
52 66 162
|
||||
194 181 66
|
||||
123 131 0
|
||||
255 255 255
|
||||
222 222 222
|
||||
189 189 189
|
||||
164 164 164
|
||||
98 98 115
|
||||
41 57 65
|
||||
41 57 106
|
||||
0 0 41
|
||||
255 255 255
|
||||
238 246 57
|
||||
255 0 189
|
||||
49 213 74
|
||||
24 131 32
|
||||
189 156 90
|
||||
0 0 0
|
||||
123 131 0
|
||||
255 255 255
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
48
|
||||
193 33 177
|
||||
249 249 249
|
||||
225 225 225
|
||||
201 201 201
|
||||
169 169 169
|
||||
129 129 129
|
||||
249 153 161
|
||||
233 49 49
|
||||
193 33 41
|
||||
145 17 33
|
||||
249 153 161
|
||||
193 33 41
|
||||
141 251 184
|
||||
52 66 162
|
||||
194 181 66
|
||||
123 131 0
|
||||
255 255 255
|
||||
255 238 0
|
||||
255 189 0
|
||||
255 115 0
|
||||
98 98 115
|
||||
41 57 65
|
||||
41 57 106
|
||||
0 0 41
|
||||
255 255 255
|
||||
238 246 57
|
||||
255 0 189
|
||||
49 213 74
|
||||
24 131 32
|
||||
189 156 90
|
||||
0 0 0
|
||||
123 131 0
|
||||
255 255 255
|
||||
|
||||
@@ -7,11 +7,11 @@ JASC-PAL
|
||||
201 201 201
|
||||
169 169 169
|
||||
129 129 129
|
||||
249 153 161
|
||||
233 49 49
|
||||
193 33 41
|
||||
145 17 33
|
||||
249 153 161
|
||||
106 106 106
|
||||
37 37 37
|
||||
106 106 106
|
||||
0 0 0
|
||||
106 106 106
|
||||
193 33 41
|
||||
141 251 184
|
||||
52 66 162
|
||||
|
||||
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
BIN
graphics/pokemon/alcremie/berry/back.png
Normal file
BIN
graphics/pokemon/alcremie/berry/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 651 B |
19
graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_caramel_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 232 184
|
||||
200 168 120
|
||||
232 168 96
|
||||
144 112 72
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_default.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_default.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 224 208
|
||||
208 160 168
|
||||
240 136 144
|
||||
128 80 88
|
||||
248 224 200
|
||||
208 128 136
|
||||
248 224 200
|
||||
208 160 168
|
||||
248 224 200
|
||||
208 160 168
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_lemon_cream.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_lemon_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 152
|
||||
208 184 72
|
||||
232 224 0
|
||||
112 120 24
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_matcha_cream.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_matcha_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
232 248 208
|
||||
176 208 152
|
||||
192 224 96
|
||||
104 128 80
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_mint_cream.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_mint_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
208 240 232
|
||||
152 168 176
|
||||
112 208 200
|
||||
72 112 128
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_rainbow_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 184
|
||||
208 192 120
|
||||
216 144 88
|
||||
120 88 64
|
||||
240 160 168
|
||||
208 128 136
|
||||
176 232 224
|
||||
128 160 168
|
||||
248 248 112
|
||||
216 192 40
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_ruby_cream.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_ruby_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 208 208
|
||||
200 152 184
|
||||
232 112 192
|
||||
128 80 112
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_ruby_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 240 208
|
||||
208 184 160
|
||||
240 192 128
|
||||
128 96 80
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/berry/berry_salted_cream.pal
Normal file
19
graphics/pokemon/alcremie/berry/berry_salted_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
232 232 248
|
||||
176 176 184
|
||||
112 208 200
|
||||
88 88 96
|
||||
232 232 248
|
||||
176 176 184
|
||||
232 232 248
|
||||
176 176 184
|
||||
232 232 248
|
||||
176 176 184
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
0 0 0
|
||||
@@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
216 216 216
|
||||
152 152 152
|
||||
128 128 128
|
||||
88 88 96
|
||||
72 80 72
|
||||
248 248 248
|
||||
88 88 96
|
||||
128 128 128
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
0 120 200
|
||||
0 80 144
|
||||
0 40 104
|
||||
16 16 16
|
||||
152 152 152
|
||||
136 32 56
|
||||
248 88 112
|
||||
192 48 72
|
||||
168 176 176
|
||||
168 176 176
|
||||
216 216 216
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
BIN
graphics/pokemon/alcremie/berry/front.png
Normal file
BIN
graphics/pokemon/alcremie/berry/front.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 717 B |
BIN
graphics/pokemon/alcremie/clover/back.png
Normal file
BIN
graphics/pokemon/alcremie/clover/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 655 B |
19
graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_caramel_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 232 184
|
||||
200 168 120
|
||||
232 168 96
|
||||
144 112 72
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_default.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_default.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 224 208
|
||||
208 160 168
|
||||
240 136 144
|
||||
128 80 88
|
||||
248 224 200
|
||||
208 128 136
|
||||
248 224 200
|
||||
208 160 168
|
||||
248 224 200
|
||||
208 160 168
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_lemon_cream.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_lemon_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 152
|
||||
208 184 72
|
||||
232 224 0
|
||||
112 120 24
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_matcha_cream.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_matcha_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
232 248 208
|
||||
176 208 152
|
||||
192 224 96
|
||||
104 128 80
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_mint_cream.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_mint_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
208 240 232
|
||||
152 168 176
|
||||
112 208 200
|
||||
72 112 128
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_rainbow_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 184
|
||||
208 192 120
|
||||
216 144 88
|
||||
120 88 64
|
||||
240 160 168
|
||||
208 128 136
|
||||
176 232 224
|
||||
128 160 168
|
||||
248 248 112
|
||||
216 192 40
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_ruby_cream.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_ruby_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 208 208
|
||||
200 152 184
|
||||
232 112 192
|
||||
128 80 112
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_ruby_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 240 208
|
||||
208 184 160
|
||||
240 192 128
|
||||
128 96 80
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/clover/clover_salted_cream.pal
Normal file
19
graphics/pokemon/alcremie/clover/clover_salted_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
232 232 248
|
||||
176 176 184
|
||||
112 208 200
|
||||
88 88 96
|
||||
232 232 248
|
||||
176 176 184
|
||||
232 232 248
|
||||
176 176 184
|
||||
232 232 248
|
||||
176 176 184
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
0 0 0
|
||||
@@ -2,18 +2,18 @@ JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
216 216 216
|
||||
152 152 152
|
||||
128 128 128
|
||||
88 88 96
|
||||
72 80 72
|
||||
248 248 248
|
||||
88 88 96
|
||||
128 128 128
|
||||
16 16 16
|
||||
152 152 152
|
||||
216 216 216
|
||||
136 32 56
|
||||
248 88 112
|
||||
192 48 72
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
248 248 248
|
||||
168 176 176
|
||||
136 216 64
|
||||
24 144 36
|
||||
24 80 36
|
||||
16 16 16
|
||||
BIN
graphics/pokemon/alcremie/clover/front.png
Normal file
BIN
graphics/pokemon/alcremie/clover/front.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 724 B |
BIN
graphics/pokemon/alcremie/flower/back.png
Normal file
BIN
graphics/pokemon/alcremie/flower/back.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 652 B |
19
graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_caramel_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 232 184
|
||||
200 168 120
|
||||
232 168 96
|
||||
144 112 72
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_default.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_default.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 224 208
|
||||
208 160 168
|
||||
240 136 144
|
||||
128 80 88
|
||||
248 224 200
|
||||
208 128 136
|
||||
248 224 200
|
||||
208 160 168
|
||||
248 224 200
|
||||
208 160 168
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_lemon_cream.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_lemon_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 152
|
||||
208 184 72
|
||||
232 224 0
|
||||
112 120 24
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_matcha_cream.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_matcha_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
232 248 208
|
||||
176 208 152
|
||||
192 224 96
|
||||
104 128 80
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
232 248 200
|
||||
176 208 152
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_mint_cream.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_mint_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
208 240 232
|
||||
152 168 176
|
||||
112 208 200
|
||||
72 112 128
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 248
|
||||
168 176 176
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_rainbow_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 248 184
|
||||
208 192 120
|
||||
216 144 88
|
||||
120 88 64
|
||||
240 160 168
|
||||
208 128 136
|
||||
176 232 224
|
||||
128 160 168
|
||||
248 248 112
|
||||
216 192 40
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_ruby_cream.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_ruby_cream.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 208 208
|
||||
200 152 184
|
||||
232 112 192
|
||||
128 80 112
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 208 208
|
||||
200 152 184
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
19
graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal
Normal file
19
graphics/pokemon/alcremie/flower/flower_ruby_swirl.pal
Normal file
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
152 208 160
|
||||
248 248 248
|
||||
248 240 208
|
||||
208 184 160
|
||||
240 192 128
|
||||
128 96 80
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 176 192
|
||||
224 120 128
|
||||
248 248 0
|
||||
248 104 40
|
||||
152 56 24
|
||||
0 0 0
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user