Merge branch 'upcoming' into guillotine-expansion

This commit is contained in:
Eduardo Quezada D'Ottone 2024-01-26 10:10:27 -03:00 committed by GitHub
commit c8d73c0827
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8222 changed files with 24257 additions and 24618 deletions

View File

@ -23,8 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.7.1 (Default)
- 1.7.2 (Latest release)
- master (default when pulling, unreleased bugfixes)
- upcoming (Edge)
- 1.7.1
- 1.7.0
- 1.6.2
- 1.6.1
@ -35,8 +37,8 @@ body:
- type: input
id: upcomingversion
attributes:
label: Upcoming Version
description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
label: Upcoming/master Version
description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
validations:
required: false
- type: input

View File

@ -23,8 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.7.1 (Default)
- 1.7.2 (Latest release)
- master (default when pulling, unreleased bugfixes)
- upcoming (Edge)
- 1.7.1
- 1.7.0
- 1.6.2
- 1.6.1
@ -35,8 +37,8 @@ body:
- type: input
id: upcomingversion
attributes:
label: Upcoming Version
description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
label: Upcoming/master Version
description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
validations:
required: false
- type: input

View File

@ -23,8 +23,10 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using as a base?
options:
- 1.7.1 (Default)
- 1.7.2 (Latest release)
- master (default when pulling, unreleased bugfixes)
- upcoming (Edge)
- 1.7.1
- 1.7.0
- 1.6.2
- 1.6.1
@ -35,8 +37,8 @@ body:
- type: input
id: upcomingversion
attributes:
label: Upcoming Version
description: If you're using the upcoming branch, please specify what was the commit hash you pulled from.
label: Upcoming/master Version
description: If you're using the upcoming or master branches directly, please specify what was the commit hash you pulled from.
validations:
required: false
- type: input

View File

@ -1,5 +1,7 @@
# Pokeemerald-Expansion Changelogs
## [Version 1.7.2](docs/changelogs/1.7.2.md) - Bugfix Release
## [Version 1.7.1](docs/changelogs/1.7.1.md) - Bugfix Release
## [Version 1.7.0](docs/changelogs/1.7.0.md) - Feature Release

View File

@ -1,6 +1,6 @@
# Instructions
These instructions explain how to set up the tools required to build **pokeemerald**, which assembles the source files into a ROM.
These instructions explain how to set up the tools required to build **pokeemerald Expansion**, which assembles the source files into a ROM (pokeemerald.gba).
These instructions come with notes which can be expanded by clicking the "<i>Note...</i>" text.
In general, you should not need to open these unless if you get an error or if you need additional clarification.
@ -27,10 +27,10 @@ All of the Windows instructions assume that the default drive is C:\\. If this d
**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
## Windows 10/11 (WSL1)
WSL1 is the preferred terminal to build **pokeemerald**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
WSL1 is the preferred terminal to build **pokeemerald Expansion**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
- If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1).
- Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1).
- Otherwise, **open WSL** and go to [Choosing where to store pokeemerald (WSL1)](#Choosing-where-to-store-pokeemerald-WSL1).
- Otherwise, **open WSL** and go to [Choosing where to store pokeemerald Expansion (WSL1)](#Choosing-where-to-store-pokeemerald-expansion-WSL1).
### Installing WSL1
1. Open [Windows Powershell **as Administrator**](https://i.imgur.com/QKmVbP9.png), and run the following command (Right Click or Shift+Insert is paste in the Powershell).
@ -79,7 +79,7 @@ Some tips before proceeding:
> Note: 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 follow the [legacy WSL1 instructions](docs/legacy_WSL1_INSTALL.md) from here.
4. Certain packages are required to build pokeemerald. Install these packages by running the following command:
4. Certain packages are required to build pokeemerald Expansion. Install these packages by running the following command:
```bash
sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi git libpng-dev
@ -89,12 +89,39 @@ Some tips before proceeding:
> If the above command does not work, try the above command but replacing `apt` with `apt-get`.
</details>
This will install GCC v10 on Ubuntu 22.04. pokeemerald-expansion works with GCC v10, but remote repositories and the RHH Team use GCC v13 for stricter error-checking. If you want to upgrade from v10 to v13, also follow the devkitpro install instructions.
This will install GCC v10 on Ubuntu 22.04. pokeemerald Expansion works with GCC v10, but remote repositories and the RHH Team use GCC v13 for stricter error-checking. If you want to upgrade from v10 to v13, also follow the devkitpro install instructions.
### Choosing where to store pokeemerald (WSL1)
WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokeemerald within Windows.
### Installing devkitARM on WSL1
For example, say you want to store pokeemerald (and agbcc) in **C:\Users\\_\<user>_\Desktop\decomps**. First, ensure that the folder already exists. Then, enter this command to **change directory** to said folder, where *\<user>* is your **Windows** username:
1. Change directory to somewhere you can download a package, such as **C:\Users\\_\<user>_\Downloads** (the Downloads location for most users). To do so, enter this command, where *\<user> is your **Windows** username:
```bash
cd /mnt/c/Users/<user>/Downloads
```
2. Once the directory has been changed, run the following commands to install devkitARM.
```bash
sudo apt install wget
wget https://apt.devkitpro.org/install-devkitpro-pacman
chmod +x ./install-devkitpro-pacman
sudo ./install-devkitpro-pacman
sudo dkp-pacman -S gba-dev
```
The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
3. Run the following command to set devkitPro related environment variables (alternatively, close and re-open WSL):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
### Choosing where to store pokeemerald Expansion (WSL1)
WSL has its own file system that's not natively accessible from Windows, but Windows files *are* accessible from WSL. So you're going to want to store pokeemerald Expansion within Windows.
For example, say you want to store pokeemerald Expansion in **C:\Users\\_\<user>_\Desktop\decomps**. First, ensure that the folder already exists. Then, enter this command to **change directory** to said folder, where *\<user>* is your **Windows** username:
```bash
cd /mnt/c/Users/<user>/Desktop/decomps
@ -116,7 +143,7 @@ Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or conti
- If devkitARM is **not installed**, then go to [Installing devkitARM](#installing-devkitarm).
- If devkitARM is installed, but msys2 **hasn't previously been set up for another decompilation project**, then go to [Setting up msys2](#setting-up-msys2).
- Otherwise, **open msys2** and go to [Choosing where to store pokeemerald (msys2)](#choosing-where-to-store-pokeemerald-msys2).
- Otherwise, **open msys2** and go to [Choosing where to store pokeemerald Expansion (msys2)](#choosing-where-to-store-pokeemerald-expansion-msys2).
### Installing devkitARM
1. Download the devkitPro installer [here](https://github.com/devkitPro/installer/releases).
@ -128,7 +155,7 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
1. Open msys2 at C:\devkitPro\msys2\msys2_shell.bat.
2. Certain packages are required to build pokeemerald. Install these by running the following two commands:
2. Certain packages are required to build pokeemerald Expansion. Install these by running the following two commands:
```bash
pacman -Sy msys2-keyring
@ -173,10 +200,10 @@ Note that in msys2, Copy is Ctrl+Insert and Paste is Shift+Insert.
cd
```
### Choosing where to store pokeemerald (msys2)
At this point, you can choose a folder to store pokeemerald into. If you're okay with storing pokeemerald in the user profile folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald is stored when changing directory to the pokeemerald folder.
### Choosing where to store pokeemerald Expansion (msys2)
At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user profile folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.
For example, if you want to store pokeemerald (and agbcc) in **C:\Users\\_\<user>_\Desktop\decomps** (where *\<user>* is your **Windows** username), enter this command:
For example, if you want to store pokeemerald Expansion in **C:\Users\\_\<user>_\Desktop\decomps** (where *\<user>* is your **Windows** username), enter this command:
```bash
cd Desktop/decomps
@ -192,7 +219,7 @@ Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or conti
2.
- If Cygwin is **not installed**, or does not have all of the required packages installed, then go to [Installing Cygwin](#installing-cygwin).
- If Cygwin is installed, but **is not configured to work with devkitARM**, then go to [Configuring devkitARM for Cygwin](#configuring-devkitarm-for-cygwin).
- Otherwise, **open Cygwin** and go to [Choosing where to store pokeemerald (Cygwin)](#choosing-where-to-store-pokeemerald-cygwin)
- Otherwise, **open Cygwin** and go to [Choosing where to store pokeemerald Expansion (Cygwin)](#choosing-where-to-store-pokeemerald-expansion-cygwin)
### Installing Cygwin
1. Download [Cygwin](https://cygwin.com/install.html): setup-x86_64.exe for 64-bit Windows, setup-x86.exe for 32-bit.
@ -235,15 +262,15 @@ Note that in Cygwin, Copy is Ctrl+Insert and Paste is Shift+Insert.
> Replace the drive letter c with the actual drive letter if it is not c.
</details>
### Choosing where to store pokeemerald (Cygwin)
### Choosing where to store pokeemerald Expansion (Cygwin)
Cygwin has its own file system that's within Windows, at **C:\cygwin64\home\\_\<user>_**. If you don't want to store pokeemerald there, you'll need to account for where pokeemerald is stored when **changing directory** to the pokeemerald folder.
Cygwin has its own file system that's within Windows, at **C:\cygwin64\home\\_\<user>_**. If you don't want to store pokeemerald Expansion there, you'll need to account for where ppokeemerald Expansion is stored when **changing directory** to the pokeemerald-expansion folder.
For example, if you want to store pokeemerald (and agbcc) in **C:\Users\\_\<user>_\Desktop\decomps**, enter this command, where *\<user>* is your **Windows** username:
For example, if you want to store pokeemerald Expansion in **C:\Users\\_\<user>_\Desktop\decomps**, enter this command, where *\<user>* is your **Windows** username:
```bash
cd c:/Users/<user>/Desktop/decomps
```
Note that the directory **must exist** in Windows. If you want to store pokeemerald in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Windows Explorer) before executing the `cd` command.
Note that the directory **must exist** in Windows. If you want to store pokeemerald Expansion in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Windows Explorer) before executing the `cd` command.
<details>
<summary><i>Notes...</i></summary>
@ -263,7 +290,7 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
2. - If libpng is **not installed**, then go to [Installing libpng (macOS)](#installing-libpng-macos).
- If devkitARM is **not installed**, then go to [Installing devkitARM (macOS)](#installing-devkitarm-macos).
- Otherwise, **open the Terminal** and go to [Choosing where to store pokeemerald (macOS)](#choosing-where-to-store-pokeemerald-macos)
- Otherwise, **open the Terminal** and go to [Choosing where to store pokeemerald Expansion (macOS)](#choosing-where-to-store-pokeemerald-expansion-macos)
### Installing libpng (macOS)
<details>
@ -281,7 +308,7 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
```
libpng is now installed.
Continue to [Installing devkitARM (macOS)](#installing-devkitarm-macos) if **devkitARM is not installed**, otherwise, go to [Choosing where to store pokeemerald (macOS)](#choosing-where-to-store-pokeemerald-macos).
Continue to [Installing devkitARM (macOS)](#installing-devkitarm-macos) if **devkitARM is not installed**, otherwise, go to [Choosing where to store pokeemerald Expansion (macOS)](#choosing-where-to-store-pokeemerald-expansion-macos).
### Installing devkitARM (macOS)
1. Download the `devkitpro-pacman-installer.pkg` package from [here](https://github.com/devkitPro/pacman/releases).
@ -307,14 +334,14 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile
```
### Choosing where to store pokeemerald (macOS)
At this point, you can choose a folder to store pokeemerald into. If you're okay with storing pokeemerald in the user folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald is stored when changing directory to the pokeemerald folder.
### Choosing where to store pokeemerald Expansion (macOS)
At this point, you can choose a folder to store pokeemerald Expansion into. If you're okay with storing pokeemerald Expansion in the user folder, then proceed to [Installation](#installation). Otherwise, you'll need to account for where pokeemerald Expansion is stored when changing directory to the pokeemerald-expansion folder.
For example, if you want to store pokeemerald (and agbcc) in **~/Desktop/decomps**, enter this command to **change directory** to the desired folder:
For example, if you want to store pokeemerald Expansion in **~/Desktop/decomps**, enter this command to **change directory** to the desired folder:
```bash
cd Desktop/decomps
```
Note that the directory **must exist** in the folder system. If you want to store pokeemerald in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Finder) before executing the `cd` command.
Note that the directory **must exist** in the folder system. If you want to store pokeemerald Expansion in a dedicated folder that doesn't exist (e.g. the example provided above), then create the folder (e.g. using Finder) before executing the `cd` command.
<details>
<summary><i>Note..</i>.</summary>
@ -332,7 +359,7 @@ Run the following command to install the necessary packages:
```bash
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).
Then proceed to [Choosing where to store pokeemerald Expansion (Linux)](#choosing-where-to-store-pokeemerald-expansion-linux).
<details>
<summary><i>Note for legacy repos...</i></summary>
@ -341,19 +368,51 @@ Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to
> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
</details>
### Installing devkitARM on Debian/Ubuntu-based distributions
1. Change directory to somewhere you can download a packages, like a Downloads folder. Then, run the following commands to install devkitARM:
```bash
wget https://apt.devkitpro.org/install-devkitpro-pacman
chmod +x ./install-devkitpro-pacman
sudo ./install-devkitpro-pacman
sudo dkp-pacman -S gba-dev
```
The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
4. Run the following command to set devkitPro related environment variables (alternatively, close and re-open the Terminal):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
### Arch Linux
Run this command as root to install the necessary packages:
```bash
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 for the arm-none-eabi packages, and follow the instructions to
> [install devkitARM on Arch Linux](#installing-devkitarm-on-arch-linux).
</details>
### Installing devkitARM on Arch Linux
1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
2. Install `gba-dev`: run the following command as root.
```console
pacman -S gba-dev
```
This will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
3. Run the following command to set devkitPro related environment variables (alternatively, close and re-open the Terminal):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
Then proceed to [Choosing where to store pokeemerald Expansion (Linux)](#choosing-where-to-store-pokeemerald-expansion-linux).
### Other distributions
_(Specific instructions for other distributions would be greatly appreciated!)_
@ -375,8 +434,8 @@ _(Specific instructions for other distributions would be greatly appreciated!)_
The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
### Choosing where to store pokeemerald (Linux)
At this point, you can choose a folder to store pokeemerald (and agbcc) into. If so, you'll have to account for the modified folder path when changing directory to the pokeemerald folder.
### Choosing where to store pokeemerald Expansion (Linux)
At this point, you can choose a folder to store pokeemerald Expansion into. If so, you'll have to account for the modified folder path when changing directory to the pokeemerald-expansion folder.
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
@ -385,12 +444,12 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
<details>
<summary><i>Note for Windows users...</i></summary>
> Consider adding an exception for the `pokeemerald` and/or `decomps` folder in Windows Security using
> Consider adding an exception for the `pokeemerald-expansion` and/or `decomps` folder in Windows Security using
> [these instructions](https://support.microsoft.com/help/4028485). This prevents Microsoft Defender from
> scanning them which might improve performance while building.
</details>
1. If pokeemerald is not already downloaded (some users may prefer to download pokeemerald via a git client like GitHub Desktop), run:
1. If pokeemerald Expansion is not already downloaded (some users may prefer to download pokeemerald Expansion via a git client like GitHub Desktop), run:
```bash
git clone https://github.com/rh-hideout/pokeemerald-expansion
@ -404,57 +463,18 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
> cd
> sudo umount /mnt/c
> sudo mount -t drvfs C: /mnt/c -o metadata,noatime
> cd <folder where pokeemerald is to be stored>
> cd <folder where pokeemerald-expansion is to be stored>
> ```
> Where *\<folder where pokeemerald is to be stored>* is the path of the folder [where you chose to store pokeemerald](#Choosing-where-to-store-pokeemerald-WSL1). Then run the `git clone` command again.
> Where *\<folder where pokeemerald-expansion is to be stored>* is the path of the folder [where you chose to store pokeemerald Expansion](#Choosing-where-to-store-pokeemerald-expansion-WSL1). Then run the `git clone` command again.
</details>
Now you're ready to build pokeemerald Expansion.
<details>
<summary><i>Depreciated; installing agbcc is optional since 1.7.0</i>.</summary>
2. Install agbcc into pokeemerald. The commands to run depend on certain conditions. **You should only follow one of the listed instructions**:
- If agbcc has **not been built before** in the folder where you chose to store pokeemerald, run the following commands to build and install it into pokeemerald:
## Build pokeemerald Expansion
```bash
git clone https://github.com/pret/agbcc
cd agbcc
./build.sh
./install.sh ../pokeemerald
```
- **Otherwise**, if agbcc has been built before (e.g. if the git clone above fails), but was **last built on a different terminal** than the one currently used (only relevant to Windows, e.g. switching from msys2 to WSL1), then run the following commands to build and install it into pokeemerald:
```bash
cd agbcc
git clean -fX
./build.sh
./install.sh ../pokeemerald
```
- **Otherwise**, if agbcc has been built before on the same terminal, run the following commands to install agbcc into pokeemerald:
```bash
cd agbcc
./install.sh ../pokeemerald
```
<details>
<summary><i>Note...</i></summary>
> If building agbcc or pokeemerald results in an error, try deleting the agbcc folder and re-installing agbcc as if it has not been built before.
</details>
3. Once agbcc is installed, change directory back to the base directory where pokeemerald and agbcc are stored:
```bash
cd ..
```
</details>
Now you're ready to [build **pokeemerald**](#build-pokeemerald)
## Build pokeemerald
If you aren't in the pokeemerald directory already, then **change directory** to the pokeemerald folder:
If you aren't in the pokeemerald-expansion directory already, then **change directory** to the pokeemerald-expansion folder:
```bash
cd pokeemerald
cd pokeemerald-expansion
```
To build **pokeemerald.gba** (Note: to speed up builds, see [Parallel builds](#parallel-builds)):
```bash
@ -484,116 +504,6 @@ Replace `<output of nproc>` with the number that the `nproc` command returned.
`nproc` is not available on macOS. The alternative is `sysctl -n hw.ncpu` ([relevant Stack Overflow thread](https://stackoverflow.com/questions/1715580)).
## Compare ROM to the original
For contributing, or if you'd simply like to verify that your ROM is identical to the original game, run:
```bash
make compare
```
If it matches, you will see the following at the end of the output:
```bash
pokeemerald.gba: OK
```
If there are any changes from the original game, you will instead see:
```bash
pokeemerald.gba: FAILED
shasum: WARNING: 1 computed checksum did NOT match
```
## devkitARM's C compiler
This project supports the `arm-none-eabi-gcc` compiler included with devkitARM. If devkitARM (a.k.a. gba-dev) has already been installed as part of the platform-specific instructions, simply run:
```bash
make modern
```
Otherwise, follow the instructions below to install devkitARM.
### Installing devkitARM on WSL1
1. `gdebi-core` must be installed beforehand in order to install devkitPro pacman (which facilitates the installation of devkitARM). Install this with the following command:
```bash
sudo apt install gdebi-core
```
<details>
<summary><i>Note...</i></summary>
> If the above command does not work, try the above command but replacing `apt` with `apt-get`.
</details>
2. Once `gdebi-core` is done installing, download the devkitPro pacman package [here](https://github.com/devkitPro/pacman/releases). The file to download is `devkitpro-pacman.amd64.deb`.
3. Change directory to where the package was downloaded. For example, if the package file was saved to **C:\Users\\_\<user>_\Downloads** (the Downloads location for most users), enter this command, where *\<user> is your **Windows** username:
```bash
cd /mnt/c/Users/<user>/Downloads
```
4. Once the directory has been changed to the folder containing the devkitPro pacman package, run the following commands to install devkitARM.
```bash
sudo gdebi devkitpro-pacman.amd64.deb
sudo dkp-pacman -Sy
sudo dkp-pacman -S gba-dev
```
The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
<details>
<summary><i>Note...</i></summary>
> Note: `devkitpro-pacman.amd64.deb` is the expected filename of the devkitPro package downloaded (for the first command). If the downloaded package filename differs, then use that filename instead.
</details>
5. Run the following command to set devkitPro related environment variables (alternatively, close and re-open WSL):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
### Installing devkitARM on Debian/Ubuntu-based distributions
1. If `gdebi-core` is not installed, run the following command:
```bash
sudo apt install gdebi-core
```
2. Download the devkitPro pacman package [here](https://github.com/devkitPro/pacman/releases). The file to download is `devkitpro-pacman.amd64.deb`.
3. Change directory to where the package was downloaded. Then, run the following commands to install devkitARM:
```bash
sudo gdebi devkitpro-pacman.amd64.deb
sudo dkp-pacman -Sy
sudo dkp-pacman -S gba-dev
```
The last command will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
> Note: `devkitpro-pacman.amd64.deb` is the expected filename of the devkitPro package downloaded (for the first command). If the downloaded package filename differs, then use that filename instead.
4. Run the following command to set devkitPro related environment variables (alternatively, close and re-open the Terminal):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
### Installing devkitARM on Arch Linux
1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
2. Install `gba-dev`: run the following command as root.
```console
pacman -S gba-dev
```
This will ask for the selection of packages to install. Just press Enter to install all of them, followed by entering Y to proceed with the installation.
3. Run the following command to set devkitPro related environment variables (alternatively, close and re-open the Terminal):
```bash
source /etc/profile.d/devkit-env.sh
```
devkitARM is now installed.
### Other toolchains
To build using a toolchain other than devkitARM, override the `TOOLCHAIN` environment variable with the path to your toolchain, which must contain the subdirectory `bin`.
@ -606,16 +516,64 @@ make TOOLCHAIN="/usr/local/arm-none-eabi"
```
To compile the `modern` target with this toolchain, the subdirectories `lib`, `include`, and `arm-none-eabi` must also be present.
### Building with debug info under a modern toolchain
### Building with debug info
To build **pokeemerald.elf** with debug symbols under a modern toolchain:
```bash
make modern DINFO=1
make DINFO=1
```
Note that this is not necessary for a non-modern build since those are built with debug symbols by default.
Note that this is not necessary for a non-modern (agbcc) build since those are built with debug symbols by default.
### agbcc
<details>
<summary><i>Deprecated; installing agbcc is optional since 1.7.0</i>.</summary>
2. Install agbcc into pokeemerald-expansion. The commands to run depend on certain conditions. **You should only follow one of the listed instructions**:
- If agbcc has **not been built before** in the folder where you chose to store pokeemerald Expansion, run the following commands to build and install it into pokeemerald-expansion:
```bash
git clone https://github.com/pret/agbcc
cd agbcc
./build.sh
./install.sh ../pokeemerald-expansion
```
- **Otherwise**, if agbcc has been built before (e.g. if the git clone above fails), but was **last built on a different terminal** than the one currently used (only relevant to Windows, e.g. switching from msys2 to WSL1), then run the following commands to build and install it into pokeemerald-expansion:
```bash
cd agbcc
git clean -fX
./build.sh
./install.sh ../pokeemerald-expansion
```
- **Otherwise**, if agbcc has been built before on the same terminal, run the following commands to install agbcc into pokeemerald-expansion:
```bash
cd agbcc
./install.sh ../pokeemerald-expansion
```
<details>
<summary><i>Note...</i></summary>
> If building agbcc or pokeemerald results in an error, try deleting the agbcc folder and re-installing agbcc as if it has not been built before.
</details>
3. Once agbcc is installed, change directory back to the base directory where pokeemerald-expansion and agbcc are stored:
```bash
cd ..
```
4. To compile with agbcc:
```make agbcc```
</details>
# Useful additional tools
* [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
* [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript))
* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps

View File

@ -7,7 +7,7 @@ pokeemerald-expansion is a decomp hack base project based off pret's [pokeemeral
If you use pokeemerald-expansion in your hack, please add RHH (Rom Hacking Hideout) to your credits list. Optionally, you can list the version used, so it can help players know what features to expect.
You can phrase it as the following:
```
Based off RHH's pokeemerald-expansion v1.7.1 https://github.com/rh-hideout/pokeemerald-expansion/
Based off RHH's pokeemerald-expansion v1.7.2 https://github.com/rh-hideout/pokeemerald-expansion/
```
## What features are included?
@ -167,7 +167,7 @@ With this, you'll get the latest version of pokeemerald-expansion, plus a couple
## **How do I update my version of 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.7.1`.
- Once you have your remote set up, run the command `git pull RHH expansion/1.7.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 :)

View File

@ -92,19 +92,30 @@
.4byte \ptr
.endm
.macro seteffectwithchance
.macro setadditionaleffects
1:
.byte 0x15
jumpifhalfword CMP_EQUAL, sMOVE_EFFECT, MOVE_EFFECT_CONTINUE, 1b
.endm
.macro seteffectprimary
.macro seteffectprimary moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.byte 0x16
.endm
.macro seteffectsecondary
.macro seteffectsecondary moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.byte 0x17
.endm
.macro clearstatusfromeffect battler:req
.macro clearstatusfromeffect battler:req, moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.byte 0x18
.byte \battler
.endm
@ -764,7 +775,7 @@
.byte 0x8b
.endm
.macro confuseifrepeatingattackends
.macro unused0x8C
.byte 0x8c
.endm
@ -1175,8 +1186,10 @@
.4byte \jumpInstr
.endm
.macro getsecretpowereffect
.macro jumpifnotcurrentmoveargtype battler:req, failInstr:req
.byte 0xe4
.byte \battler
.4byte \failInstr
.endm
.macro pickup
@ -1810,8 +1823,8 @@
.4byte \jumpInstr
.endm
.macro argumentstatuseffect
various BS_ATTACKER, VARIOUS_ARGUMENT_STATUS_EFFECT
.macro setargtobattledamage
various BS_ATTACKER, VARIOUS_SET_ARG_TO_BATTLE_DAMAGE
.endm
.macro tryhitswitchtarget failInstr:req
@ -1855,10 +1868,6 @@
various \battler, VARIOUS_POWER_TRICK
.endm
.macro argumenttomoveeffect
various BS_ATTACKER, VARIOUS_ARGUMENT_TO_MOVE_EFFECT
.endm
.macro jumpifnotgrounded battler:req, jumpInstr:req
various \battler, VARIOUS_JUMP_IF_NOT_GROUNDED
.4byte \jumpInstr

View File

@ -28,6 +28,10 @@
.2byte \x, \y
.byte \elevation
.byte \movement_type
.if \x_radius > 15
@ This warning is relevant for GetItemBallIdAndAmountFromTemplate
.error "movementRangeX has a bitfield of 4 bytes, so values over 15 will overflow. Use a custom script for item balls that should give the player more than 15 items."
.endif
.byte ((\y_radius << 4) | \x_radius)
.space 1 @ Padding
.2byte \trainer_type

View File

@ -3316,28 +3316,91 @@ InitRoomAnimation:
createvisualtask AnimTask_ScaleMonAndRestore, 5, -6, -6, 15, ANIM_TARGET, 1
return
@ Credits to Skeli
Move_DRACO_METEOR:
loadspritegfx ANIM_TAG_WARM_ROCK
loadspritegfx ANIM_TAG_GOLD_STARS
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_ICE_SPIKES
playsewithpan SE_M_CHARGE, SOUND_PAN_TARGET
fadetobg BG_COSMIC
waitbgfadein
loadspritegfx ANIM_TAG_ROCKS @Rocks
loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS @Gray Colour
loadspritegfx ANIM_TAG_WATER_GUN @Sparkles Trail
loadspritegfx ANIM_TAG_FIRE_PLUME @Eruption
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, 0x2C41
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WATER_GUN, 0, 10, 10, RGB_PURPLE @;Purple
monbg ANIM_TARGET
setalpha 12, 8
waitforvisualfinish
createsprite gDracoMeteorSmashSpriteTemplate, 131, 5, -47, -63, 72, 32, 30
delay 10
createsprite gDracoMeteorSmashSpriteTemplate, 131, 5, -111, -63, 8, 32, 30
delay 40
createsprite gDracoMetorSpriteTemplate, 131, 4, 0, 0, 0, 30
createsprite gDracoMeteorSmashSpriteTemplate, 131, 5, -79, -63, 40, 32, 30
delay 20
playsewithpan SE_FALL, SOUND_PAN_ATTACKER
@setblends 0x80C
call DracoMeteor1
delay 7
call DracoMeteor2
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
delay 10
restorebg
waitbgfadein
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x28, 0x20 @; For Meteor 1
createvisualtask AnimTask_HorizontalShake, 5, 3, 5, 2, 0x1
delay 7
call DracoMeteor3
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0xFFF8, 0x20 @; For Meteor 2
delay 7
call DracoMeteor4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x15, 0x20 @; For Meteor 3
delay 7
call DracoMeteor1
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0xFFF8, 0x20 @; For Meteor 4
createvisualtask AnimTask_HorizontalShake, 5, 3, 5, 2, 0x1
delay 7
call DracoMeteor2
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x28, 0x20 @; For Meteor 1
delay 7
call DracoMeteor3
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x15, 0x20 @; For Meteor 3
delay 15
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x15, 0x20 @; For Meteor 3
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 2, 1
delay 7
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, 0x2C41
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
end
DracoMeteor1:
createsprite gDracoMeteorRocksSpriteTemplate 0x83, 5, 0xffd0, 0xffc0, 0x28, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffd0, 0xffc0, 0x28, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffd0, 0xffc0, 0x28, 0x20, 0x19
return
DracoMeteor2:
createsprite gDracoMeteorRocksSpriteTemplate 0x83, 5, 0xff90, 0xffc0, 0xFFF8, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xff90, 0xffc0, 0xFFF8, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xff90, 0xffc0, 0xFFF8, 0x20, 0x19
return
DracoMeteor3:
createsprite gDracoMeteorRocksSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0x18, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0x18, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0x18, 0x20, 0x19
return
DracoMeteor4:
createsprite gDracoMeteorRocksSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0xFFF8, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0xFFF8, 0x20, 0x19
delay 2
createsprite gDracoMeteorTailSpriteTemplate 0x83, 5, 0xffb0, 0xffc0, 0xFFF8, 0x20, 0x19
return
Move_DISCHARGE:
loadspritegfx ANIM_TAG_IMPACT
@ -7027,6 +7090,10 @@ HurricaneGust:
createsprite gEllipticalGustSpriteTemplate, ANIM_ATTACKER, 2, 0, -16
createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
return
HurricaneGustCentered:
createsprite gEllipticalGustCenteredSpriteTemplate, ANIM_ATTACKER, 2, 0, -16
createvisualtask AnimTask_AnimateGustTornadoPalette, 5, 1, 70
return
Move_HEAD_CHARGE:
loadspritegfx ANIM_TAG_IMPACT
@ -15920,36 +15987,36 @@ Move_SPRINGTIDE_STORM::
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_RED_HEART
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 6, 0, 11, RGB(31, 22, 30)
call HurricaneGust
createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
createvisualtask AnimTask_BlendColorCycle, 0x2, F_PAL_TARGET, 0x2, 0x6, 0x0, 0xB, 0x7ADF
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGust
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGust
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGust
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGust
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGust
call HurricaneGustCentered
call SpringtideStormHeartSwirl
waitforvisualfinish
stopsound
end
SpringtideStormHeartSwirl:
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@ -16490,19 +16557,19 @@ Move_BLEAKWIND_STORM::
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_ICE_CRYSTALS
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1
createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x7FFF
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGust
call HurricaneGustCentered
call BleakwindStormIceSwirl
waitforvisualfinish
stopsound
@ -16510,17 +16577,17 @@ Move_BLEAKWIND_STORM::
waitforvisualfinish
end
BleakwindStormIceSwirl:
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@ -16533,19 +16600,19 @@ Move_WILDBOLT_STORM::
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xff00, 0x0, 0x1, 0xffff
waitbgfadein
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x07FE
call HurricaneGust
createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x07FE
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGust
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGust
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGust
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGust
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGust
call HurricaneGustCentered
call WildboltStormSparkSwirl
waitforvisualfinish
stopsound
@ -16555,17 +16622,17 @@ Move_WILDBOLT_STORM::
end
WildboltStormSparkSwirl:
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
delay 0x2
createsprite gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@ -16575,19 +16642,19 @@ Move_SANDSEAR_STORM::
loadspritegfx ANIM_TAG_SMALL_EMBER
createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_GUST, 0x0, 0xA, 0xA, 0x190B
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 88, 1
createvisualtaskontargets AnimTask_ShakeMon2, 2, 0, ANIM_TARGET, 0, 4, 0x58, 1
createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xB, 0x1F
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGust
call HurricaneGustCentered
call SandsearStormFireSpin
waitforvisualfinish
stopsound
@ -16596,17 +16663,17 @@ Move_SANDSEAR_STORM::
end
SandsearStormFireSpin:
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_TARGET
delay 0x2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_TARGET
delay 0x2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_TARGET
delay 0x2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_TARGET
delay 0x2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_TARGET
delay 0x2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_TARGET
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_TARGET
return
@ -16715,40 +16782,32 @@ Move_DOUBLE_SHOCK::
loadspritegfx ANIM_TAG_ELECTRIC_ORBS
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_LIGHTNING
monbg ANIM_TARGET
setalpha 12, 8
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, 1, 3, 0, 12, RGB_BLACK
waitforvisualfinish
fadetobg BG_MAX_LIGHTNING
waitbgfadeout
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xff00, 0x0, 0x1, 0xffff
waitbgfadein
createvisualtask AnimTask_ElectricChargingParticles, 0x2, ANIM_ATTACKER, 30, 0, 3 @;Amount, Slowness, Slowness, Compaction
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
delay 12
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 0, 0x0
waitforvisualfinish
delay 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_BLACK
delay 1
delay 2
waitforvisualfinish
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
delay 1
createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, -32
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, -32
delay 1
delay 2
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -16, -16
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, -16
delay 1
delay 2
createsprite gLightningSpriteTemplate, ANIM_TARGET, 6, -16, 16
createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 24, 16
delay 1
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
delay 2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
delay 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 11, 1
waitforvisualfinish
call UnsetPsychicBg
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
end
Move_SYRUP_BOMB::
@ -16952,6 +17011,155 @@ Move_ALLURING_VOICE::
waitforvisualfinish
end
@ Credits to Z-nogyroP
Move_AQUA_CUTTER::
loadspritegfx ANIM_TAG_SLASH_2
loadspritegfx ANIM_TAG_SMALL_BUBBLES
loadspritegfx ANIM_TAG_ICE_CRYSTALS
loadspritegfx ANIM_TAG_WATER_IMPACT
createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 32
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
delay 2
createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 48
delay 2
createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 64
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
delay 2
createsprite gFalseSwipePositionedSliceSpriteTemplate, ANIM_TARGET, 2, 80
delay 2
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 4
waitforvisualfinish
loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 20, 3
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 8, 1
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 10, 10, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 20, -20, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -15, 15, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -10, -20, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 16, -8, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 5, 8, 20, ANIM_TARGET
delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 20, ANIM_TARGET
waitforvisualfinish
end
@ Credits to Z-nogyroP
Move_GIGATON_HAMMER::
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_WOOD_HAMMER_HAMMER
loadspritegfx ANIM_TAG_CLAW_SLASH
loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 2, 4
createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
createsprite gWoodHammerHammerSpriteTemplate, ANIM_TARGET, 2
delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
delay 18
createvisualtask AnimTask_SquishTarget, 0x2
delay 6
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 10, 50
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 10, 50
call GigatonHammerImpact
waitforvisualfinish
end
GigatonHammerImpact:
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xfff4, 0x20, 0x3, 0x4
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0x8, 0x1f, 0x2, 0x2
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xfffc, 0x1c, 0x2, 0x3
createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 0xc, 0x1e, 0x4, 0x3
return
@ Credits to Z-nogyroP
Move_ICE_SPINNER::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_RAPID_SPIN
monbg ANIM_ATTACKER
createsprite gRapidSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 32, -32, 40, -2
createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 0
loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 8, 4
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 47, 1
call IceCrystalSpinEffect
call IceCrystalSpinEffect
waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 10, 1, 0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
waitforvisualfinish
delay 8
createvisualtask AnimTask_RapinSpinMonElevation, 2, 0, 2, 1
loopsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER, 8, 4
loadspritegfx ANIM_TAG_ICE_CRYSTALS
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 47, 1
call IceCrystalSpinEffect
call IceCrystalSpinEffect
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
IceCrystalSpinEffect:
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 528, 30, 13, 50, ANIM_ATTACKER
delay 2
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 32, 480, 20, 16, -46, ANIM_ATTACKER
delay 2
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 576, 20, 8, 42, ANIM_ATTACKER
delay 2
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 31, 400, 25, 11, -42, ANIM_ATTACKER
delay 2
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 28, 512, 25, 16, 46, ANIM_ATTACKER
delay 2
createsprite gIceCrystalSpinSpriteTemplate, ANIM_ATTACKER, 2, 0, 33, 464, 30, 15, -50, ANIM_ATTACKER
delay 2
return
@ Credits to Z-nogyroP
Move_RAGING_BULL::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_ANGER
loadspritegfx ANIM_TAG_BREATH
createsprite gBreathPuffSpriteTemplate, ANIM_ATTACKER, 2
loopsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 4, 2
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, -20, -28
delay 20
createsprite gAngerMarkSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, -28
waitforvisualfinish
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
waitforvisualfinish
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
call SetImpactBackground
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
delay 3
waitforvisualfinish
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
delay 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
waitforvisualfinish
restorebg
waitbgfadein
end
Move_TERA_BLAST::
Move_AXE_KICK::
Move_LAST_RESPECTS::
@ -16961,7 +17169,6 @@ Move_JET_PUNCH::
Move_SPICY_EXTRACT::
Move_SPIN_OUT::
Move_POPULATION_BOMB::
Move_ICE_SPINNER::
Move_GLAIVE_RUSH::
Move_REVIVAL_BLESSING::
Move_SALT_CURE::
@ -16973,7 +17180,6 @@ Move_KOWTOW_CLEAVE::
Move_FLOWER_TRICK::
Move_TORCH_SONG::
Move_AQUA_STEP::
Move_RAGING_BULL::
Move_MAKE_IT_RAIN::
Move_RUINATION::
Move_COLLISION_COURSE::
@ -16987,9 +17193,7 @@ Move_HYPER_DRILL::
Move_TWIN_BEAM::
Move_RAGE_FIST::
Move_ARMOR_CANNON::
Move_GIGATON_HAMMER::
Move_COMEUPPANCE::
Move_AQUA_CUTTER::
Move_BLAZING_TORQUE::
Move_WICKED_TORQUE::
Move_NOXIOUS_TORQUE::

File diff suppressed because it is too large Load Diff

View File

@ -49,11 +49,17 @@ BattleScript_UseItemMessage:
BattleScript_ItemRestoreHP::
call BattleScript_UseItemMessage
itemrestorehp
jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_ItemRestoreHP_SendOutRevivedBattler
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG
end
BattleScript_ItemRestoreHP_Party::
jumpifbyte CMP_EQUAL, gBattleCommunication, TRUE, BattleScript_ItemRestoreHP_SendOutRevivedBattler
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG
end
@ -67,7 +73,7 @@ BattleScript_ItemRestoreHP_SendOutRevivedBattler:
BattleScript_ItemCureStatus::
call BattleScript_UseItemMessage
itemcurestatus
updatestatusicon BS_ATTACKER
updatestatusicon BS_SCRIPTING
printstring STRINGID_ITEMCUREDSPECIESSTATUS
waitmessage B_WAIT_TIME_LONG
end
@ -80,9 +86,9 @@ BattleScript_ItemHealAndCureStatus::
waitmessage B_WAIT_TIME_LONG
bichalfword gMoveResultFlags, MOVE_RESULT_NO_EFFECT
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER
datahpupdate BS_ATTACKER
updatestatusicon BS_ATTACKER
healthbarupdate BS_SCRIPTING
datahpupdate BS_SCRIPTING
updatestatusicon BS_SCRIPTING
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG
end

View File

@ -947,6 +947,10 @@ gText_PlayerFoundOneTMHM::
.string "{PLAYER} found one {STR_VAR_1}\n"
.string "{STR_VAR_2}!$"
gText_PlayerFoundTMHMs::
.string "{PLAYER} found {STR_VAR_3} {STR_VAR_1}\n"
.string "{STR_VAR_2}!$"
gText_Sudowoodo_Attacked::
.string "The weird tree doesn't like the\n"
.string "WAILMER PAIL!\p"

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_CaptainsOffice_EventScript_ItemStorageKey",
"trainer_sight_or_berry_tree_id": "ITEM_STORAGE_KEY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemLuxuryBall",
"trainer_sight_or_berry_tree_id": "ITEM_LUXURY_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemScanner",
"trainer_sight_or_berry_tree_id": "ITEM_SCANNER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_2_SCANNER"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTMRainDance",
"trainer_sight_or_berry_tree_id": "ITEM_TM_RAIN_DANCE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_RAIN_DANCE"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemWaterStone",
"trainer_sight_or_berry_tree_id": "ITEM_WATER_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTMIceBeam",
"trainer_sight_or_berry_tree_id": "ITEM_TM_ICE_BEAM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_ICE_BEAM"
}
],

View File

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_1F_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE"
},
{

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms2_B1F_EventScript_ItemDiveBall",
"trainer_sight_or_berry_tree_id": "ITEM_DIVE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL"
}
],

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_1F_EventScript_ItemHarborMail",
"trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL"
},
{

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Rooms_B1F_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE"
}
],

View File

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemMasterBall",
"trainer_sight_or_berry_tree_id": "ITEM_MASTER_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_MASTER_BALL"
},
{
@ -101,8 +101,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B1F_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B1F_NUGGET"
},
{

View File

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "AquaHideout_B2F_EventScript_ItemNestBall",
"trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_1F_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ArtisanCave_B1F_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP"
}
],

View File

@ -18,12 +18,14 @@ DesertUnderpass_EventScript_Fossil::
DesertUnderpass_EventScript_GiveClawFossil::
giveitem ITEM_CLAW_FOSSIL
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
removeobject LOCALID_FOSSIL
release
end
DesertUnderpass_EventScript_GiveRootFossil::
giveitem ITEM_ROOT_FOSSIL
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
removeobject LOCALID_FOSSIL
release
end

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_ItemTMToxic",
"trainer_sight_or_berry_tree_id": "ITEM_TM_TOXIC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_FIERY_PATH_TM_TOXIC"
},
{
@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "FieryPath_EventScript_ItemFireStone",
"trainer_sight_or_berry_tree_id": "ITEM_FIRE_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_FIERY_PATH_FIRE_STONE"
}
],

View File

@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_1F_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B1F_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_ItemRepel",
"trainer_sight_or_berry_tree_id": "ITEM_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_REPEL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "GraniteCave_B2F_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY"
},
{

View File

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "JaggedPass_EventScript_ItemBurnHeal",
"trainer_sight_or_berry_tree_id": "ITEM_BURN_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_JAGGED_PASS_BURN_HEAL"
},
{

View File

@ -164,8 +164,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_EventScript_ItemMaxRepel",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_LILYCOVE_CITY_MAX_REPEL"
},
{

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_1F_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY"
},
{

View File

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_2F_2R_EventScript_ItemFullRestore",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_RESTORE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE"
}
],

View File

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_1R_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET"
}
],

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_2R_EventScript_ItemPPMax",
"trainer_sight_or_berry_tree_id": "ITEM_PP_MAX",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_3F_3R_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE"
}
],

View File

@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MagmaHideout_4F_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE"
}
],

View File

@ -148,8 +148,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_ItemXSpeed",
"trainer_sight_or_berry_tree_id": "ITEM_X_SPEED",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MAUVILLE_CITY_X_SPEED"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemTMIronTail",
"trainer_sight_or_berry_tree_id": "ITEM_TM_IRON_TAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_TM_IRON_TAIL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemMoonStone",
"trainer_sight_or_berry_tree_id": "ITEM_MOON_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_1F_1R_EventScript_ItemPPUP",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_1F_1R_PP_UP"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MeteorFalls_B1F_2R_EventScript_ItemTMDragonClaw",
"trainer_sight_or_berry_tree_id": "ITEM_TM_DRAGON_CLAW",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_DRAGON_CLAW"
}
],

View File

@ -10,6 +10,7 @@ MirageTower_4F_EventScript_RootFossil::
msgbox MirageTower_4F_Text_TakeRootFossil, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, MirageTower_4F_EventScript_LeaveRootFossil
giveitem ITEM_ROOT_FOSSIL
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
closemessage
setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL
setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
@ -30,6 +31,7 @@ MirageTower_4F_EventScript_ClawFossil::
msgbox MirageTower_4F_Text_TakeClawFossil, MSGBOX_YESNO
goto_if_eq VAR_RESULT, NO, MirageTower_4F_EventScript_LeaveClawFossil
giveitem ITEM_CLAW_FOSSIL
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
closemessage
setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL
setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL

View File

@ -104,8 +104,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_ItemNetBall",
"trainer_sight_or_berry_tree_id": "ITEM_NET_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MOSSDEEP_CITY_NET_BALL"
},
{

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_2F_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL"
},
{

View File

@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_3F_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL"
},
{

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_4F_EventScript_ItemSeaIncense",
"trainer_sight_or_berry_tree_id": "ITEM_SEA_INCENSE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE"
}
],

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_5F_EventScript_ItemLaxIncense",
"trainer_sight_or_berry_tree_id": "ITEM_LAX_INCENSE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE"
}
],

View File

@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_6F_EventScript_ItemTMShadowBall",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SHADOW_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_6F_TM_SHADOW_BALL"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_ItemMaxPotion",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "MtPyre_Exterior_EventScript_ItemTMSkillSwap",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SKILL_SWAP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_MT_PYRE_EXTERIOR_TM_SKILL_SWAP"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemEscapeRope",
"trainer_sight_or_berry_tree_id": "ITEM_ESCAPE_ROPE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE"
},
{
@ -49,8 +49,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemThunderStone",
"trainer_sight_or_berry_tree_id": "ITEM_THUNDER_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_FULL_HEAL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "NewMauville_Inside_EventScript_ItemParalyzeHeal",
"trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_NEW_MAUVILLE_PARALYZE_HEAL"
},
{

View File

@ -99,8 +99,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_CITY_MAX_REVIVE"
},
{
@ -112,8 +112,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgCity_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_CITY_ETHER"
},
{

View File

@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_GREAT_BALL"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemXAttack",
"trainer_sight_or_berry_tree_id": "ITEM_X_ATTACK",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_X_ATTACK"
},
{
@ -101,8 +101,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_ETHER"
},
{
@ -166,8 +166,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "PetalburgWoods_EventScript_ItemParalyzeHeal",
"trainer_sight_or_berry_tree_id": "ITEM_PARALYZE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_PETALBURG_WOODS_PARALYZE_HEAL"
},
{

View File

@ -99,8 +99,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route102_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_102_POTION"
},
{

View File

@ -190,8 +190,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_ItemGuardSpec",
"trainer_sight_or_berry_tree_id": "ITEM_GUARD_SPEC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_103_GUARD_SPEC"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route103_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_103_PP_UP"
}
],

View File

@ -299,8 +299,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_PP_UP"
},
{
@ -377,8 +377,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_POKE_BALL"
},
{
@ -403,8 +403,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemXAccuracy",
"trainer_sight_or_berry_tree_id": "ITEM_X_ACCURACY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_X_ACCURACY"
},
{
@ -429,8 +429,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route104_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_104_POTION"
},
{

View File

@ -91,8 +91,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route105_EventScript_ItemIron",
"trainer_sight_or_berry_tree_id": "ITEM_IRON",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_105_IRON"
},
{

View File

@ -86,8 +86,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route106_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_106_PROTEIN"
}
],

View File

@ -112,8 +112,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route108_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_108_STAR_PIECE"
}
],

View File

@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_109_PP_UP"
},
{
@ -320,8 +320,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route109_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_109_POTION"
},
{

View File

@ -273,8 +273,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemDireHit",
"trainer_sight_or_berry_tree_id": "ITEM_DIRE_HIT",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_DIRE_HIT"
},
{
@ -286,8 +286,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_RARE_CANDY"
},
{
@ -481,8 +481,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_110_ELIXIR"
},
{

View File

@ -179,8 +179,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle1_EventScript_ItemOrangeMail",
"trainer_sight_or_berry_tree_id": "ITEM_ORANGE_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_ORANGE_MAIL"
},
{

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemWaveMail",
"trainer_sight_or_berry_tree_id": "ITEM_WAVE_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle2_EventScript_ItemHarborMail",
"trainer_sight_or_berry_tree_id": "ITEM_HARBOR_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL"
}
],

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemWoodMail",
"trainer_sight_or_berry_tree_id": "ITEM_WOOD_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_WOOD_MAIL"
},
{
@ -75,8 +75,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle3_EventScript_ItemShadowMail",
"trainer_sight_or_berry_tree_id": "ITEM_SHADOW_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_SHADOW_MAIL"
},
{

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle4_EventScript_ItemMechMail",
"trainer_sight_or_berry_tree_id": "ITEM_MECH_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_MECH_MAIL"
},
{

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle6_EventScript_ItemGlitterMail",
"trainer_sight_or_berry_tree_id": "ITEM_GLITTER_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL"
}
],

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle7_EventScript_ItemTropicMail",
"trainer_sight_or_berry_tree_id": "ITEM_TROPIC_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_TROPIC_MAIL"
},
{

View File

@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route110_TrickHousePuzzle8_EventScript_ItemBeadMail",
"trainer_sight_or_berry_tree_id": "ITEM_BEAD_MAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL"
}
],

View File

@ -260,8 +260,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemTMSandstorm",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SANDSTORM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_TM_SANDSTORM"
},
{
@ -351,8 +351,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemStardust",
"trainer_sight_or_berry_tree_id": "ITEM_STARDUST",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_STARDUST"
},
{
@ -364,8 +364,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_HP_UP"
},
{
@ -572,8 +572,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route111_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_111_ELIXIR"
},
{

View File

@ -182,8 +182,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route112_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_112_NUGGET"
},
{

View File

@ -104,8 +104,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemMaxEther",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_MAX_ETHER"
},
{
@ -117,8 +117,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_SUPER_REPEL"
},
{
@ -182,8 +182,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route113_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_113_HYPER_POTION"
},
{

View File

@ -138,8 +138,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_RARE_CANDY"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_PROTEIN"
},
{
@ -359,8 +359,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route114_EventScript_ItemEnergyPowder",
"trainer_sight_or_berry_tree_id": "ITEM_ENERGY_POWDER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_114_ENERGY_POWDER"
},
{

View File

@ -151,8 +151,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemSuperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_SUPER_POTION"
},
{
@ -164,8 +164,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemTMFocusPunch",
"trainer_sight_or_berry_tree_id": "ITEM_TM_FOCUS_PUNCH",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_TM_FOCUS_PUNCH"
},
{
@ -177,8 +177,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemIron",
"trainer_sight_or_berry_tree_id": "ITEM_IRON",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_IRON"
},
{
@ -229,8 +229,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_GREAT_BALL"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_PP_UP"
},
{
@ -320,8 +320,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route115_EventScript_ItemHealPowder",
"trainer_sight_or_berry_tree_id": "ITEM_HEAL_POWDER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_115_HEAL_POWDER"
}
],

View File

@ -112,8 +112,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemEther",
"trainer_sight_or_berry_tree_id": "ITEM_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_ETHER"
},
{
@ -125,8 +125,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemRepel",
"trainer_sight_or_berry_tree_id": "ITEM_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_REPEL"
},
{
@ -216,8 +216,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemHPUp",
"trainer_sight_or_berry_tree_id": "ITEM_HP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_HP_UP"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemXSpecial",
"trainer_sight_or_berry_tree_id": "ITEM_X_SPECIAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_X_SPECIAL"
},
{
@ -346,8 +346,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route116_EventScript_ItemPotion",
"trainer_sight_or_berry_tree_id": "ITEM_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_116_POTION"
},
{

View File

@ -203,8 +203,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_ItemGreatBall",
"trainer_sight_or_berry_tree_id": "ITEM_GREAT_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_117_GREAT_BALL"
},
{
@ -229,8 +229,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route117_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_117_REVIVE"
},
{

View File

@ -286,8 +286,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route118_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_118_HYPER_POTION"
},
{

View File

@ -242,8 +242,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemSuperRepel",
"trainer_sight_or_berry_tree_id": "ITEM_SUPER_REPEL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_SUPER_REPEL"
},
{
@ -255,8 +255,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ZINC"
},
{
@ -268,8 +268,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_1"
},
{
@ -281,8 +281,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemLeafStone",
"trainer_sight_or_berry_tree_id": "ITEM_LEAF_STONE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_LEAF_STONE"
},
{
@ -294,8 +294,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_RARE_CANDY"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_1"
},
{
@ -437,8 +437,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemHyperPotion2",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_HYPER_POTION_2"
},
{
@ -554,8 +554,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_NUGGET"
},
{
@ -567,8 +567,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_ItemElixir2",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_119_ELIXIR_2"
},
{

View File

@ -229,8 +229,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_NUGGET"
},
{
@ -307,8 +307,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_FULL_HEAL"
},
{
@ -385,8 +385,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemNestBall",
"trainer_sight_or_berry_tree_id": "ITEM_NEST_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_NEST_BALL"
},
{
@ -398,8 +398,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemHyperPotion",
"trainer_sight_or_berry_tree_id": "ITEM_HYPER_POTION",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
},
{
@ -593,8 +593,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_120_REVIVE"
}
],

View File

@ -299,8 +299,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_CARBOS"
},
{
@ -390,8 +390,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemRevive",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_REVIVE"
},
{
@ -403,8 +403,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route121_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_121_ZINC"
}
],

View File

@ -294,8 +294,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemCalcium",
"trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_CALCIUM"
},
{
@ -437,8 +437,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemUltraBall",
"trainer_sight_or_berry_tree_id": "ITEM_ULTRA_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_ULTRA_BALL"
},
{
@ -450,8 +450,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemElixir",
"trainer_sight_or_berry_tree_id": "ITEM_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_ELIXIR"
},
{
@ -541,8 +541,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_PP_UP"
},
{
@ -580,8 +580,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route123_EventScript_ItemRevivalHerb",
"trainer_sight_or_berry_tree_id": "ITEM_REVIVAL_HERB",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_123_REVIVAL_HERB"
}
],

View File

@ -114,8 +114,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemRedShard",
"trainer_sight_or_berry_tree_id": "ITEM_RED_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_RED_SHARD"
},
{
@ -127,8 +127,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemBlueShard",
"trainer_sight_or_berry_tree_id": "ITEM_BLUE_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_BLUE_SHARD"
},
{
@ -140,8 +140,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route124_EventScript_ItemYellowShard",
"trainer_sight_or_berry_tree_id": "ITEM_YELLOW_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_124_YELLOW_SHARD"
},
{

View File

@ -156,8 +156,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route125_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_125_BIG_PEARL"
}
],

View File

@ -91,8 +91,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route126_EventScript_ItemGreenShard",
"trainer_sight_or_berry_tree_id": "ITEM_GREEN_SHARD",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_126_GREEN_SHARD"
},
{

View File

@ -70,8 +70,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemZinc",
"trainer_sight_or_berry_tree_id": "ITEM_ZINC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_ZINC"
},
{
@ -83,8 +83,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_CARBOS"
},
{
@ -174,8 +174,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route127_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_127_RARE_CANDY"
}
],

View File

@ -60,8 +60,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_132_RARE_CANDY"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route132_EventScript_ItemProtein",
"trainer_sight_or_berry_tree_id": "ITEM_PROTEIN",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_132_PROTEIN"
}
],

View File

@ -73,8 +73,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_BIG_PEARL"
},
{
@ -86,8 +86,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_STAR_PIECE"
},
{
@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route133_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_133_MAX_REVIVE"
}
],

View File

@ -151,8 +151,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_ItemCarbos",
"trainer_sight_or_berry_tree_id": "ITEM_CARBOS",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_134_CARBOS"
},
{
@ -164,8 +164,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "Route134_EventScript_ItemStarPiece",
"trainer_sight_or_berry_tree_id": "ITEM_STAR_PIECE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_ROUTE_134_STAR_PIECE"
}
],

View File

@ -182,8 +182,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RustboroCity_EventScript_ItemXDefend",
"trainer_sight_or_berry_tree_id": "ITEM_X_DEFEND",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTBORO_CITY_X_DEFEND"
},
{

View File

@ -49,8 +49,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_ItemPokeBall",
"trainer_sight_or_berry_tree_id": "ITEM_POKE_BALL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL"
},
{
@ -62,8 +62,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "RusturfTunnel_EventScript_ItemMaxEther",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ETHER",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_RUSTURF_TUNNEL_MAX_ETHER"
},
{

View File

@ -143,8 +143,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_North_EventScript_ItemCalcium",
"trainer_sight_or_berry_tree_id": "ITEM_CALCIUM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM"
}
],

View File

@ -138,8 +138,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northeast_EventScript_ItemNugget",
"trainer_sight_or_berry_tree_id": "ITEM_NUGGET",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET"
}
],

View File

@ -47,8 +47,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Northwest_EventScript_ItemTMSolarBeam",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SOLAR_BEAM",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_SOLAR_BEAM"
}
],

View File

@ -73,8 +73,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southeast_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL"
},
{

View File

@ -47,8 +47,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SafariZone_Southwest_EventScript_ItemMaxRevive",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_REVIVE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ScorchedSlab_EventScript_ItemTMSunnyDay",
"trainer_sight_or_berry_tree_id": "ITEM_TM_SUNNY_DAY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SCORCHED_SLAB_TM_SUNNY_DAY"
}
],

View File

@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SeafloorCavern_Room9_EventScript_ItemTMEarthquake",
"trainer_sight_or_berry_tree_id": "ITEM_TM_EARTHQUAKE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_EARTHQUAKE"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideEntranceRoom_EventScript_ItemBigPearl",
"trainer_sight_or_berry_tree_id": "ITEM_BIG_PEARL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL"
},
{

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_ItemTMHail",
"trainer_sight_or_berry_tree_id": "ITEM_TM_HAIL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_HAIL"
},
{
@ -36,8 +36,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideIceRoom_EventScript_ItemNeverMeltIce",
"trainer_sight_or_berry_tree_id": "ITEM_NEVER_MELT_ICE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideInnerRoom_EventScript_ItemRareCandy",
"trainer_sight_or_berry_tree_id": "ITEM_RARE_CANDY",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY"
}
],

View File

@ -23,8 +23,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "ShoalCave_LowTideStairsRoom_EventScript_ItemIceHeal",
"trainer_sight_or_berry_tree_id": "ITEM_ICE_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL"
}
],

View File

@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_1F_EventScript_ItemMaxElixir",
"trainer_sight_or_berry_tree_id": "ITEM_MAX_ELIXIR",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_MAX_ELIXIR"
},
{
@ -88,8 +88,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_1F_EventScript_ItemPPUp",
"trainer_sight_or_berry_tree_id": "ITEM_PP_UP",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_1F_PP_UP"
},
{

View File

@ -244,8 +244,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_ItemTMPsychic",
"trainer_sight_or_berry_tree_id": "ITEM_TM_PSYCHIC",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_TM_PSYCHIC"
},
{
@ -257,8 +257,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B1F_EventScript_ItemFullRestore",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_RESTORE",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B1F_FULL_RESTORE"
},
{

View File

@ -75,8 +75,8 @@
"movement_range_x": 1,
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "VictoryRoad_B2F_EventScript_ItemFullHeal",
"trainer_sight_or_berry_tree_id": "ITEM_FULL_HEAL",
"script": "Common_EventScript_FindItem",
"flag": "FLAG_ITEM_VICTORY_ROAD_B2F_FULL_HEAL"
},
{

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