Merge branch 'master' into doc-playerpc

.github/workflows/build.yml

@@ -7,11 +7,29 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
+    env:
+      GAME_VERSION: EMERALD
+      GAME_REVISION: 0
+      GAME_LANGUAGE: ENGLISH
+      MODERN: 0
+      COMPARE: 1
     steps:
       - name: Checkout
         uses: actions/checkout@master
 
+      - name: Checkout syms
+        uses: actions/checkout@master
+        with:
+          path: symbols
+          ref: symbols
+
+      - name: Checkout agbcc
+        uses: actions/checkout@master
+        with:
+          path: agbcc
+          repository: pret/agbcc
+
       - name: Install binutils
         run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi
         # build-essential, git, and libpng-dev are already installed
@@ -20,16 +38,18 @@ jobs:
 
       - name: Install agbcc
         run: |
-          git clone https://github.com/pret/agbcc.git
-          cd agbcc 
           ./build.sh
           ./install.sh ../
+        working-directory: agbcc
 
       - name: Compare
-        run: make -j${nproc} compare
+        run: make -j${nproc} all syms
 
       - name: Modern
-        run: make -j${nproc} modern
+        env:
+          MODERN: 1
+          COMPARE: 0
+        run: make -j${nproc} all
 
       - name: Webhook
         if: ${{ github.event_name == 'push' }}
@@ -38,3 +58,18 @@ jobs:
           CALCROM_DISCORD_WEBHOOK_AVATAR_URL: https://i.imgur.com/38BQHdd.png
           CALCROM_DISCORD_WEBHOOK_URL: ${{ secrets.CALCROM_DISCORD_WEBHOOK_URL }}
         run: sh .github/calcrom/webhook.sh pokeemerald
+
+      - name: Move symfiles
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          cp -v *.sym symbols/
+          export GITHUB_COMMIT_MSG="$( git log --format=%s ${GITHUB_SHA} )"
+
+      - name: Update symfiles
+        if: ${{ github.event_name == 'push' }}
+        uses: EndBug/add-and-commit@v7
+        with:
+          branch: symbols
+          cwd: "./symbols"
+          add: "*.sym"
+          message: $GITHUB_COMMIT_MSG

INSTALL.md

@@ -1,96 +1,570 @@
-# Prerequisites
+# Instructions
 
-| Linux | macOS | Windows 10
+These instructions explain how to set up the tools required to build **pokeemerald**, which assembles the source files into a ROM.
-| - | - | -
-| none | [Xcode Command Line Tools Package][xcode] | [Windows Terminal][terminal] and [Windows Subsystem for Linux (WSL)][wsl]
 
-[xcode]: https://developer.apple.com/library/archive/technotes/tn2339/_index.html
+These instructions come with notes which can be expanded by clicking the "<i>Note...</i>" text.
-[terminal]: https://docs.microsoft.com/windows/terminal/get-started
+In general, you should not need to open these unless if you get an error or if you need additional clarification.
-[wsl]: https://docs.microsoft.com/windows/wsl/install-win10
 
-Independently from the specific OS, make sure that the `gcc`, `g++`, `make`, `git`, and `libpng-dev` packages or their equivalents are installed and accessible to the development tools that are used by the project (this means that, for example, on Windows, the packages have to be installed in the WSL environment). The package names and installation methods may vary with each OS.
+If you run into trouble, ask for help on Discord or IRC (see [README.md](README.md)).
 
-Install the devkitARM toolchain of devkitPro as per [the instructions on their wiki](https://devkitpro.org/wiki/devkitPro_pacman). On Windows, follow the Linux instructions inside WSL as any steps about the Windows installer do not apply.
+## Windows
+Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors.
+- [Windows 10 (WSL1)](#windows-10-wsl1) (**Fastest, highly recommended**, Windows 10 only)
+- [Windows (msys2)](#windows-msys2) (Second fastest)
+- [Windows (Cygwin)](#windows-cygwin) (Slowest)
 
-**Debian-based distro users:** This applies to Debian, Ubuntu, and similar distros, including in WSL. If necessary, install the `libarchive13`, `pkg-config`, and `gdebi-core` packages to be able to install devkitPro.
+Unscientific benchmarks suggest **msys2 is 2x slower** than WSL1, and **Cygwin is 5-6x slower** than WSL1.
+<details>
+    <summary><i>Note for advanced users: <b>WSL2</b>...</i></summary>
 
-**Windows 10 users:** WSL 2 is available in the 1903 release (build 18362) and later, therefore existing WSL 1 and [prerelease WSL](https://docs.microsoft.com/windows/wsl/install-legacy) users are recommended to update. Right-click the Start button or press `Win`+`X`, choose Run, and run `ms-settings:about` to determine the Windows version. Also check Windows Update to make sure your installation is up-to-date.
+>   <b>WSL2</b> is an option and is even faster than <b>WSL1</b> if files are stored on the WSL2 file system, but some tools may have trouble interacting
+>   with the WSL2 file system over the network drive. For example, tools which use Qt versions before 5.15.2 such as <a href="https://github.com/huderlem/porymap">porymap</a>
+>   may <a href="https://bugreports.qt.io/browse/QTBUG-86277">have problems with parsing the <code>\\wsl$</code> network drive path</a>.
+</details>
 
-**Windows 7 and 8.1 users:** pret is no longer focusing on support in pokeemerald for [old versions of Windows](https://support.microsoft.com/help/13853) so consider upgrading to a current release of Windows 10 or try a third-party guide like [this one](https://www.pokecommunity.com/showthread.php?t=425246) instead.
+All of the Windows instructions assume that the default drive is C:\\. If this differs to your actual drive letter, then replace C with the correct drive letter when reading the instructions.
 
+**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.
 
-# Installation
+## Windows 10 (WSL1)
+WSL1 is the preferred terminal to build **pokeemerald**. 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).
 
-To set up the repository:
+### 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).
 
-	git clone https://github.com/pret/pokeemerald
+    ```powershell
-	git clone https://github.com/pret/agbcc
+    dism.exe /online /enable-feature /featurename:Microsoft-Windows-Subsystem-Linux /all /norestart
+    ```
 
-	cd ./agbcc
+2. Once the process finishes, restart your machine.
-	./build.sh
-	./install.sh ../pokeemerald
 
-	cd ../pokeemerald
+3. The next step is to choose and install a Linux distribution from the Microsoft Store. The following instructions will assume Ubuntu as the Linux distribution of choice.
+    <details>
+        <summary><i>Note for advanced users...</i></summary>
     
-To build **pokeemerald.gba** for the first time and confirm it matches the official ROM image:
+    >   You can pick a preferred Linux distribution, but setup instructions may differ. Debian should work with the given instructions, but has not been tested. 
+    </details>
 
-	make compare
+4. Open the [Microsoft Store Linux Selection](https://aka.ms/wslstore), click Ubuntu, then click Get, which will install the Ubuntu distribution.
+    <details>
+        <summary><i>Notes...</i></summary>
 
+    >   Note 1: If a dialog pops up asking for you to sign into a Microsoft Account, then just close the dialog.  
+    >   Note 2: If the link does not work, then open the Microsoft Store manually, and search for the Ubuntu app (choose the one with no version number).
+    </details>
+
+### Setting up WSL1
+Some tips before proceeding:
+- In WSL, Copy and Paste is either done via
+    - **right-click** (selection + right click to Copy, right click with no selection to Paste)
+    - **Ctrl+Shift+C/Ctrl+Shift+V** (enabled by right-clicking the title bar, going to Properties, then checking the checkbox next to "Use Ctrl+Shift+C/V as Copy/Paste").
+- Some of the commands that you'll run will ask for your WSL password and/or confirmation to perform the stated action. This is to be expected, just enter your WSL password and/or the yes action when necessary.
+
+1. Open **Ubuntu** (e.g. using Search).
+2. WSL/Ubuntu will set up its own installation when it runs for the first time. Once WSL/Ubuntu finishes installing, it will ask for a username and password (to be input in).
+    <details>
+        <summary><i>Note...</i></summary>
+
+    >   When typing in the password, there will be no visible response, but the terminal will still read in input.
+    </details>
+
+3. Update WSL/Ubuntu before continuing. Do this by running the following command. These commands will likely take a long time to finish:
+
+    ```bash
+    sudo apt update && sudo apt upgrade
+    ```
+
+> 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:
+
+    ```bash
+    sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
+    ```
+    <details>
+        <summary><i>Note...</i></summary>
+
+    >   If the above command does not work, try the above command but replacing `apt` with `apt-get`.
+    </details>
+
+### 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.
+
+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:
+
+```bash
+cd /mnt/c/Users/<user>/Desktop/decomps
+```
+
+<details>
+    <summary><i>Notes...</i></summary>
+
+>   Note 1: The Windows C:\ drive is called /mnt/c/ in WSL.  
+>   Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`.  
+>   Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
+</details>
+    
+If this works, then proceed to [Installation](#installation).
+
+Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2).
+
+## Windows (msys2)
+
+- 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).
+
+### Installing devkitARM
+1. Download the devkitPro installer [here](https://github.com/devkitPro/installer/releases).
+2. Run the devkitPro installer. In the "Choose Components" screen, uncheck everything except GBA Development unless if you plan to install other devkitPro components for other purposes. Keep the install location as C:\devkitPro and leave the Start Menu option unchanged.
+
+### Setting up msys2
+
+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 command:
+
+    ```bash
+    pacman -S make gcc zlib-devel git
+    ```
+    <details>
+        <summary><i>Note...</i></summary>
+
+    >   This command will ask for confirmation, just enter the yes action when prompted.
+    </details>
+
+3. Download [libpng](https://sourceforge.net/projects/libpng/files/libpng16/1.6.37/libpng-1.6.37.tar.xz/download).
+
+4. Change directory to where libpng was downloaded. By default, msys2 will start in the current user's profile folder, located at **C:\Users\\&#8288;_\<user>_**, where *\<user>* is your Windows username. In most cases, libpng should be saved within a subfolder of the profile folder. For example, if libpng was saved to **C:\Users\\_\<user>_\Downloads** (the Downloads location for most users), enter this command:
+
+    ```bash
+    cd Downloads
+    ```
+
+    <details>
+        <summary><i>Notes...</i></summary>
+
+    >   Note 1: While not shown, msys uses forward slashes `/` instead of backwards slashes `\` as the directory separator.  
+    >   Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Downloads/My Downloads"`.  
+    >   Note 3: Windows path names are case-insensitive so adhering to capitalization isn’t needed.   
+    >   Note 4: If libpng was saved elsewhere, you will need to specify the full path to where libpng was downloaded, e.g. `cd c:/devkitpro/msys2` if it was saved there.
+    </details>
+
+5. Run the following commands to uncompress and install libpng.
+
+    ```bash
+    tar xf libpng-1.6.37.tar.xz
+    cd libpng-1.6.37
+    ./configure --prefix=/usr
+    make check
+    make install
+    ```
+
+6. Then finally, run the following command to change back to the user profile folder.
+
+    ```bash
+    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.
+
+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:
+
+```bash
+cd Desktop/decomps
+```
+
+If this works, then proceed to [Installation](#installation).
+
+Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using Cygwin](#windows-cygwin).
+
+## Windows (Cygwin)
+1. If devkitARM is **not installed**, then follow the instructions used to [install devkitARM](#installing-devkitarm) for the msys2 setup before continuing. *Remember to not continue following the msys2 instructions by mistake!*
+
+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)
+
+### Installing Cygwin
+1. Download [Cygwin](https://cygwin.com/install.html): setup-x86_64.exe for 64-bit Windows, setup-x86.exe for 32-bit.
+
+2. Run the Cygwin setup. Within the Cygwin setup, leave the default settings until the "Choose A Download Site" screen.
+
+3. At "Choose a Download Site", select any mirror within the Available Download Sites.
+
+4. At "Select Packages", set the view to "Full" (top left) and search for the following packages:
+    - `make`
+    - `git`
+    - `gcc-core`
+    - `gcc-g++`
+    - `libpng-devel`
+
+    To quickly find these, use the search bar and type the name of each package. Ensure that the selected package name is the **exact** same as the one you're trying to download, e.g. `cmake` is **NOT** the same as `make`.
+
+5. For each package, double click on the text that says "**Skip**" next to each package to select the most recent version to install. If the text says anything other than "**Skip**", (e.g. Keep or a version number), then the package is or will be installed and you don't need to do anything.
+
+6. Once all required packages have been selected, finish the installation.
+
+### Configuring devkitARM for Cygwin
+
+Note that in Cygwin, Copy is Ctrl+Insert and Paste is Shift+Insert.
+
+1. Open **Cygwin**.
+
+2. Run the following commands to configure devkitPro to work with Cygwin.
+
+    ```bash
+    export DEVKITPRO=/cygdrive/c/devkitpro
+    echo export DEVKITPRO=$DEVKITPRO >> ~/.bashrc
+    export DEVKITARM=$DEVKITPRO/devkitARM
+    echo export DEVKITARM=$DEVKITARM >> ~/.bashrc
+    ```
+
+    <details>
+        <summary><i>Note...</i></summary>
+
+    >   Replace the drive letter c with the actual drive letter if it is not c.
+    </details>
+
+### Choosing where to store pokeemerald (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.
+
+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:
+```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.
+
+<details>
+    <summary><i>Notes...</i></summary>
+
+>   Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`.  
+>   Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed  
+</details>
+    
+If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
+
+## macOS
+1. If the Xcode Command Line Tools are not installed, download the tools [here](https://developer.apple.com/xcode/resources/), open your Terminal, and run the following command:
+
+    ```bash
+    xcode-select --install
+    ```
+
+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)
+
+### Installing libpng (macOS)
+<details>
+    <summary><i>Note for advanced users...</i></summary>
+
+>   This guide installs libpng via Homebrew as it is the easiest method, however advanced users can install libpng through other means if they so desire.
+</details>
+
+1. Open the Terminal.
+2. If Homebrew is not installed, then install [Homebrew](https://brew.sh/) by following the instructions on the website.
+3. Run the following command to install libpng.
+
+    ```bash
+    brew install libpng
+    ```
+    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).
+
+### Installing devkitARM (macOS)
+1. Download the `devkitpro-pacman-installer.pkg` package from [here](https://github.com/devkitPro/pacman/releases).
+2. Open the package to install devkitPro pacman.
+3. In the Terminal, run the following commands to install devkitARM:
+
+    ```bash
+    sudo dkp-pacman -Sy
+    sudo dkp-pacman -S gba-dev
+    sudo dkp-pacman -S devkitarm-rules
+    ```
+
+    The command with gba-dev 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. After the tools are installed, devkitARM must now be made accessible from anywhere by the system. To do so, run the following commands:
+
+    ```bash
+    export DEVKITPRO=/opt/devkitpro
+    echo "export DEVKITPRO=$DEVKITPRO" >> ~/.bashrc
+    export DEVKITARM=$DEVKITPRO/devkitARM
+    echo "export DEVKITARM=$DEVKITARM" >> ~/.bashrc
+
+    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.
+
+For example, if you want to store pokeemerald (and agbcc) 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.
+
+<details>
+    <summary><i>Note..</i>.</summary>
+    
+>   Note: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "Desktop/decomp folder"`  
+</details>
+
+If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
+
+## Linux
+Open Terminal and enter the following commands, depending on which distro you're using.
+
+### Debian/Ubuntu-based distributions
+Run the following command to install the necessary packages:
+```bash
+sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
+```
+Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to-store-pokeemerald-linux).
+<details>
+    <summary><i>Note for legacy repos...</i></summary>
+
+>   If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokeemerald/blob/571c598/INSTALL.md)**,
+>   then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
+>   [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
+</details>
+
+### Other distributions
+_(Specific instructions for other distributions would be greatly appreciated!)_
+
+1. Try to find the required software in its repositories:
+    - `gcc`
+    - `g++`
+    - `make`
+    - `git`
+    - `libpng-dev`
+
+2. Follow the instructions [here](https://devkitpro.org/wiki/devkitPro_pacman) to install devkitPro pacman. As a reminder, the goal is to configure an existing pacman installation to recognize devkitPro's repositories.
+3. Once devkitPro pacman is configured, run the following commands:
+
+    ```bash
+    sudo pacman -Sy
+    sudo 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.
+
+### 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.
+
+If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
+
+## Installation
+
+<details>
+    <summary><i>Note for Windows users...</i></summary>
+
+>   Consider adding an exception for the `pokeemerald` 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:
+
+    ```bash
+    git clone https://github.com/pret/pokeemerald
+    ```
+
+    <details>
+        <summary><i>Note for WSL1...</i></summary>
+
+    >   If you get an error stating `fatal: could not set 'core.filemode' to 'false'`, then run the following commands:
+    >   ```bash
+    >   cd
+    >   sudo umount /mnt/c
+    >   sudo mount -t drvfs C: /mnt/c -o metadata,noatime
+    >   cd <folder where pokeemerald 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.
+    </details>
+
+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:
+
+    ```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 ..
+    ```
+
+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:
+```bash
+cd pokeemerald
+```
+To build **pokeemerald.gba** for the first time and confirm it matches the official ROM image (Note: to speed up builds, see [Parallel builds](#parallel-builds)):
+```bash
+make compare
+```
 If an OK is returned, then the installation went smoothly.
-
+<details>
-**Windows users:** Consider adding exceptions for the `pokeemerald` and `agbcc` folders 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.
+<summary>Note for Windows...</summary>
-
+> If you switched terminals since the last build (e.g. from msys2 to WSL1), you must run `make clean-tools` once before any subsequent `make` commands.
-
+</details>
-# Start
 
 To build **pokeemerald.gba** with your changes:
-
+```bash
-	make
+make
-
+```
-**macOS users:** If the base tools are not found in new Terminal sessions after the first successful build, run `echo "if [ -f ~/.bashrc ]; then . ~/.bashrc; fi" >> ~/.bash_profile` once to prevent the issue from occurring again. Verify that the `devkitarm-rules` package is installed as well; if not, install it by running `sudo dkp-pacman -S devkitarm-rules`.
-
 
 # Building guidance
 
-
 ## Parallel builds
 
 See [the GNU docs](https://www.gnu.org/software/make/manual/html_node/Parallel.html) and [this Stack Exchange thread](https://unix.stackexchange.com/questions/208568) for more information.
 
-To speed up building, run:
+To speed up building, first get the value of `nproc` by running the following command:
-
+```bash
-	make -j$(nproc)
+nproc
+```
+Builds can then be sped up by running the following command:
+```bash
+make -j<output of nproc>
+```
+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)).
 
-
 ## Debug info
 
 To build **pokeemerald.elf** with enhanced debug info:
-
+```bash
-	make DINFO=1
+make DINFO=1
-
+```
 
 ## devkitARM's C compiler
 
-This project supports the `arm-none-eabi-gcc` compiler included with devkitARM r52. To build this target, simply run:
+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
 
-	make modern
+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.
 
 ## 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`.
-
+```bash
-	make TOOLCHAIN="/path/to/toolchain/here"
+make TOOLCHAIN="/path/to/toolchain/here"
-
+```
 The following is an example:
-
+```bash
-	make TOOLCHAIN="/usr/local/arm-none-eabi"
+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.
 
-
 # Useful additional tools
 
 * [porymap](https://github.com/huderlem/porymap) for viewing and editing maps

Makefile

@@ -1,29 +1,34 @@
 TOOLCHAIN := $(DEVKITARM)
 COMPARE ?= 0
 
-ifeq ($(CC),)
+ifeq (compare,$(MAKECMDGOALS))
-HOSTCC := gcc
+  COMPARE := 1
-else
-HOSTCC := $(CC)
 endif
 
-ifeq ($(CXX),)
+# don't use dkP's base_tools anymore
-HOSTCXX := g++
+# because the redefinition of $(CC) conflicts
-else
+# with when we want to use $(CC) to preprocess files
-HOSTCXX := $(CXX)
+# thus, manually create the variables for the bin
-endif
+# files, or use arm-none-eabi binaries on the system
+# if dkP is not installed on this system
 
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
+ifneq (,$(TOOLCHAIN))
-include $(TOOLCHAIN)/base_tools
+ifneq ($(wildcard $(TOOLCHAIN)/bin),)
-else
 export PATH := $(TOOLCHAIN)/bin:$(PATH)
+endif
+endif
+
 PREFIX := arm-none-eabi-
 OBJCOPY := $(PREFIX)objcopy
-export CC := $(PREFIX)gcc
+OBJDUMP := $(PREFIX)objdump
-export AS := $(PREFIX)as
+AS := $(PREFIX)as
-endif
+
-export CPP := $(PREFIX)cpp
+LD := $(PREFIX)ld
-export LD := $(PREFIX)ld
+
+# note: the makefile must be set up so MODERNCC is never called
+# if MODERN=0
+MODERNCC := $(PREFIX)gcc
+PATH_MODERNCC := PATH=$(TOOLCHAIN)/bin:PATH $(MODERNCC)
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -37,10 +42,42 @@ MAKER_CODE  := 01
 REVISION    := 0
 MODERN      ?= 0
 
+ifeq (modern,$(MAKECMDGOALS))
+  MODERN := 1
+endif
+
+# use arm-none-eabi-cpp for macOS
+# as macOS's default compiler is clang
+# and clang's preprocessor will warn on \u
+# when preprocessing asm files, expecting a unicode literal
+# we can't unconditionally use arm-none-eabi-cpp
+# as installations which install binutils-arm-none-eabi
+# don't come with it
+ifneq ($(MODERN),1)
+  ifeq ($(shell uname -s),Darwin)
+    CPP := $(PREFIX)cpp
+  else
+    CPP := $(CC) -E
+  endif
+else
+  CPP := $(PREFIX)cpp
+endif
+
+ROM_NAME := pokeemerald.gba
+ELF_NAME := $(ROM_NAME:.gba=.elf)
+MAP_NAME := $(ROM_NAME:.gba=.map)
+OBJ_DIR_NAME := build/emerald
+
+MODERN_ROM_NAME := pokeemerald_modern.gba
+MODERN_ELF_NAME := $(MODERN_ROM_NAME:.gba=.elf)
+MODERN_MAP_NAME := $(MODERN_ROM_NAME:.gba=.map)
+MODERN_OBJ_DIR_NAME := build/modern
+
 SHELL := /bin/bash -o pipefail
 
 ELF = $(ROM:.gba=.elf)
 MAP = $(ROM:.gba=.map)
+SYM = $(ROM:.gba=.sym)
 
 C_SUBDIR = src
 GFLIB_SUBDIR = gflib
@@ -64,26 +101,26 @@ ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN)
 ifeq ($(MODERN),0)
 CC1             := tools/agbcc/bin/agbcc$(EXE)
 override CFLAGS += -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm -g
-ROM := pokeemerald.gba
+ROM := $(ROM_NAME)
-OBJ_DIR := build/emerald
+OBJ_DIR := $(OBJ_DIR_NAME)
 LIBPATH := -L ../../tools/agbcc/lib
+LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
 else
-CC1              = $(shell $(CC) --print-prog-name=cc1) -quiet
+CC1              = $(shell $(PATH_MODERNCC) --print-prog-name=cc1) -quiet
 override CFLAGS += -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast -g
-ROM := pokeemerald_modern.gba
+ROM := $(MODERN_ROM_NAME)
-OBJ_DIR := build/modern
+OBJ_DIR := $(MODERN_OBJ_DIR_NAME)
-LIBPATH := -L "$(dir $(shell $(CC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(CC) -mthumb -print-file-name=libc.a))"
+LIBPATH := -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_MODERNCC) -mthumb -print-file-name=libc.a))"
+LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
 endif
 
 CPPFLAGS := -iquote include -iquote $(GFLIB_SUBDIR) -Wno-trigraphs -DMODERN=$(MODERN)
-ifeq ($(MODERN),0)
+ifneq ($(MODERN),1)
-CPPFLAGS += -I tools/agbcc/include -I tools/agbcc
+CPPFLAGS += -I tools/agbcc/include -I tools/agbcc -nostdinc -undef
 endif
 
 LDFLAGS = -Map ../../$(MAP)
 
-LIB := $(LIBPATH) -lgcc -lc -L../../libagbsyscall -lagbsyscall
-
 SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 GFX := tools/gbagfx/gbagfx$(EXE)
 AIF := tools/aif2pcm/aif2pcm$(EXE)
@@ -95,6 +132,8 @@ FIX := tools/gbafix/gbafix$(EXE)
 MAPJSON := tools/mapjson/mapjson$(EXE)
 JSONPROC := tools/jsonproc/jsonproc$(EXE)
 
+PERL := perl
+
 TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*))
 TOOLBASE = $(TOOLDIRS:tools/%=%)
 TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
@@ -111,18 +150,34 @@ MAKEFLAGS += --no-print-directory
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix libagbsyscall modern
+.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) berry_fix libagbsyscall modern tidymodern tidynonmodern
 
 infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
 
 # Build tools when building the rom
 # Disable dependency scanning for clean/tidy/tools
-ifeq (,$(filter-out all rom compare modern berry_fix libagbsyscall,$(MAKECMDGOALS)))
+# Use a separate minimal makefile for speed
-$(call infoshell, $(MAKE) tools)
+# Since we don't need to reload most of this makefile
+ifeq (,$(filter-out all rom compare modern berry_fix libagbsyscall syms,$(MAKECMDGOALS)))
+$(call infoshell, $(MAKE) -f make_tools.mk)
 else
-NODEP := 1
+NODEP ?= 1
 endif
 
+# check if we need to scan dependencies based on the rule
+ifeq (,$(MAKECMDGOALS))
+  SCAN_DEPS ?= 1
+else
+  # clean, tidy, tools, mostlyclean, clean-tools, $(TOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
+  # berry_fix and libagbsyscall do their own thing
+  ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) tidymodern tidynonmodern berry_fix libagbsyscall,$(MAKECMDGOALS)))
+    SCAN_DEPS ?= 0
+  else
+    SCAN_DEPS ?= 1
+  endif
+endif
+
+ifeq ($(SCAN_DEPS),1)
 C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
 C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
 C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
@@ -152,17 +207,19 @@ OBJS     := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $
 OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
 
 SUBDIRS  := $(sort $(dir $(OBJS)))
+$(shell mkdir -p $(SUBDIRS))
+endif
 
 AUTO_GEN_TARGETS :=
 
-$(shell mkdir -p $(SUBDIRS))
-
 all: rom
 
 tools: $(TOOLDIRS)
 
+syms: $(SYM)
+
 $(TOOLDIRS):
-	@$(MAKE) -C $@ CC=$(HOSTCC) CXX=$(HOSTCXX)
+	@$(MAKE) -C $@
 
 rom: $(ROM)
 ifeq ($(COMPARE),1)
@@ -170,14 +227,14 @@ ifeq ($(COMPARE),1)
 endif
 
 # For contributors to make sure a change didn't affect the contents of the ROM.
-compare: ; @$(MAKE) COMPARE=1
+compare: all
 
 clean: mostlyclean clean-tools
 
 clean-tools:
 	@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
 
-mostlyclean: tidy
+mostlyclean: tidynonmodern tidymodern
 	rm -f $(SAMPLE_SUBDIR)/*.bin
 	rm -f $(CRY_SUBDIR)/*.bin
 	rm -f $(MID_SUBDIR)/*.s
@@ -189,12 +246,15 @@ mostlyclean: tidy
 	@$(MAKE) clean -C berry_fix
 	@$(MAKE) clean -C libagbsyscall
 
-tidy:
+tidy: tidynonmodern tidymodern
-	rm -f $(ROM) $(ELF) $(MAP)
+
-	rm -r $(OBJ_DIR)
+tidynonmodern:
-ifeq ($(MODERN),0)
+	rm -f $(ROM_NAME) $(ELF_NAME) $(MAP_NAME)
-	@$(MAKE) tidy MODERN=1
+	rm -rf $(OBJ_DIR_NAME)
-endif
+
+tidymodern:
+	rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
+	rm -rf $(MODERN_OBJ_DIR_NAME)
 	
 ifneq ($(MODERN),0)
 $(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
@@ -223,7 +283,7 @@ sound/%.bin: sound/%.aif ; $(AIF) $< $@
 
 
 ifeq ($(MODERN),0)
-$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
 $(C_BUILDDIR)/libc.o: CFLAGS := -O2
 
 $(C_BUILDDIR)/siirtc.o: CFLAGS := -mthumb-interwork
@@ -232,56 +292,88 @@ $(C_BUILDDIR)/agb_flash.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_1m.o: CFLAGS := -O -mthumb-interwork
 $(C_BUILDDIR)/agb_flash_mx.o: CFLAGS := -O -mthumb-interwork
 
-$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
+$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc$(EXE)
 
 $(C_BUILDDIR)/record_mixing.o: CFLAGS += -ffreestanding
-$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm
+$(C_BUILDDIR)/librfu_intr.o: CC1 := tools/agbcc/bin/agbcc_arm$(EXE)
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -O2 -mthumb-interwork -quiet
 else
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
 endif
 
-ifeq ($(NODEP),1)
-$(C_BUILDDIR)/%.o: c_dep :=
-else
-$(C_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(C_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(C_SUBDIR)/$*.c)
-endif
-
 ifeq ($(DINFO),1)
 override CFLAGS += -g
 endif
 
-$(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
-	@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
-	@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
-	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
-
-ifeq ($(NODEP),1)
-$(GFLIB_BUILDDIR)/%.o: c_dep :=
-else
-$(GFLIB_BUILDDIR)/%.o: c_dep = $(shell [[ -f $(GFLIB_SUBDIR)/$*.c ]] && $(SCANINC) -I include -I tools/agbcc/include -I gflib $(GFLIB_SUBDIR)/$*.c)
-endif
-
-$(GFLIB_BUILDDIR)/%.o : $(GFLIB_SUBDIR)/%.c $$(c_dep)
-	@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
-	@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
-	@echo -e ".text\n\t.align\t2, 0\n" >> $(GFLIB_BUILDDIR)/$*.s
-	$(AS) $(ASFLAGS) -o $@ $(GFLIB_BUILDDIR)/$*.s
-
-ifeq ($(NODEP),1)
-$(C_BUILDDIR)/%.o: c_asm_dep :=
-else
-$(C_BUILDDIR)/%.o: c_asm_dep = $(shell [[ -f $(C_SUBDIR)/$*.s ]] && $(SCANINC) -I "" $(C_SUBDIR)/$*.s)
-endif
-
-$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s $$(c_asm_dep)
-	$(AS) $(ASFLAGS) -o $@ $<
-
 # The dep rules have to be explicit or else missing files won't be reported.
 # As a side effect, they're evaluated immediately instead of when the rule is invoked.
 # It doesn't look like $(shell) can be deferred so there might not be a better way.
 
+ifeq ($(SCAN_DEPS),1)
+ifeq ($(NODEP),1)
+$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.c
+ifeq (,$(KEEP_TEMPS))
+	@echo "$(CC1) <flags> -o $@ $<"
+	@$(CPP) $(CPPFLAGS) $< | $(PREPROC) $< charmap.txt -i | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
+else
+	@$(CPP) $(CPPFLAGS) $< -o $(C_BUILDDIR)/$*.i
+	@$(PREPROC) $(C_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(C_BUILDDIR)/$*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $(C_BUILDDIR)/$*.s
+	$(AS) $(ASFLAGS) -o $@ $(C_BUILDDIR)/$*.s
+endif
+else
+define C_DEP
+$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
+ifeq (,$$(KEEP_TEMPS))
+	@echo "$$(CC1) <flags> -o $$@ $$<"
+	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
+else
+	@$$(CPP) $$(CPPFLAGS) $$< -o $$(C_BUILDDIR)/$3.i
+	@$$(PREPROC) $$(C_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(C_BUILDDIR)/$3.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $$(C_BUILDDIR)/$3.s
+	$$(AS) $$(ASFLAGS) -o $$@ $$(C_BUILDDIR)/$3.s
+endif
+endef
+$(foreach src, $(C_SRCS), $(eval $(call C_DEP,$(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(src)),$(src),$(patsubst $(C_SUBDIR)/%.c,%,$(src)))))
+endif
+
+ifeq ($(NODEP),1)
+$(GFLIB_BUILDDIR)/%.o: $(GFLIB_SUBDIR)/%.c $$(c_dep)
+ifeq (,$(KEEP_TEMPS))
+	@echo "$(CC1) <flags> -o $@ $<"
+	@$(CPP) $(CPPFLAGS) $< | $(PREPROC) $< charmap.txt -i | $(CC1) $(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $(AS) $(ASFLAGS) -o $@ -
+else
+	@$(CPP) $(CPPFLAGS) $< -o $(GFLIB_BUILDDIR)/$*.i
+	@$(PREPROC) $(GFLIB_BUILDDIR)/$*.i charmap.txt | $(CC1) $(CFLAGS) -o $(GFLIB_BUILDDIR)/$*.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $(GFLIB_BUILDDIR)/$*.s
+	$(AS) $(ASFLAGS) -o $@ $(GFLIB_BUILDDIR)/$*.s
+endif
+else
+define GFLIB_DEP
+$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib $2)
+ifeq (,$$(KEEP_TEMPS))
+	@echo "$$(CC1) <flags> -o $$@ $$<"
+	@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
+else
+	@$$(CPP) $$(CPPFLAGS) $$< -o $$(GFLIB_BUILDDIR)/$3.i
+	@$$(PREPROC) $$(GFLIB_BUILDDIR)/$3.i charmap.txt | $$(CC1) $$(CFLAGS) -o $$(GFLIB_BUILDDIR)/$3.s
+	@echo -e ".text\n\t.align\t2, 0\n" >> $$(GFLIB_BUILDDIR)/$3.s
+	$$(AS) $$(ASFLAGS) -o $$@ $$(GFLIB_BUILDDIR)/$3.s
+endif
+endef
+$(foreach src, $(GFLIB_SRCS), $(eval $(call GFLIB_DEP,$(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o, $(src)),$(src),$(patsubst $(GFLIB_SUBDIR)/%.c,%, $(src)))))
+endif
+
+ifeq ($(NODEP),1)
+$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
+	$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
+else
+define SRC_ASM_DATA_DEP
+$1: $2 $$(shell $(SCANINC) -I include -I "" $2)
+	$$(PREPROC) $$< charmap.txt | $$(CPP) -I include - | $$(AS) $$(ASFLAGS) -o $$@
+endef
+$(foreach src, $(C_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o, $(src)),$(src))))
+endif
 
 ifeq ($(NODEP),1)
 $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s
@@ -296,14 +388,10 @@ endif
 
 ifeq ($(NODEP),1)
 $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
-	$(PREPROC) $< charmap.txt | $(CPP) -I include | $(AS) $(ASFLAGS) -o $@
+	$(PREPROC) $< charmap.txt | $(CPP) -I include - | $(AS) $(ASFLAGS) -o $@
 else
-define DATA_ASM_DEP
+$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call SRC_ASM_DATA_DEP,$(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o, $(src)),$(src))))
-$1: $2 $$(shell $(SCANINC) -I include -I "" $2)
+endif
-	$$(PREPROC) $$< charmap.txt | $$(CPP) -I include | $$(AS) $$(ASFLAGS) -o $$@
-endef
-$(foreach src, $(REGULAR_DATA_ASM_SRCS), $(eval $(call DATA_ASM_DEP,$(patsubst $(DATA_ASM_SUBDIR)/%.s,$(DATA_ASM_BUILDDIR)/%.o, $(src)),$(src))))
-$(foreach src, $(C_ASM_SRCS), $(eval $(call DATA_ASM_DEP,$(patsubst $(C_SUBDIR)/%.s,$(C_BUILDDIR)/%.o, $(src)),$(src))))
 endif
 
 $(SONG_BUILDDIR)/%.o: $(SONG_SUBDIR)/%.s
@@ -330,19 +418,27 @@ $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
 	cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT) > ld_script.ld
 
 $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS) berry_fix libagbsyscall
-	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
+	@echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ <objects> <lib>"
+	@cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) $(LIB)
 	$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary $< $@
 	$(FIX) $@ -p --silent
 
-modern: ; @$(MAKE) MODERN=1
+modern: all
 
 berry_fix/berry_fix.gba: berry_fix
 
 berry_fix:
-	@$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN)
+	@$(MAKE) -C berry_fix COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
 
 libagbsyscall:
-	@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN)
+	@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
+
+###################
+### Symbol file ###
+###################
+
+$(SYM): $(ELF)
+	$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\S+)$$/\1 \2 \3 \4/g' > $@

README.md

@@ -1,10 +1,5 @@
 # Pokémon Emerald
 
-[![Build Status][travis-badge]][travis]
-
-[travis]: https://travis-ci.org/pret/pokeemerald
-[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master
-
 This is a decompilation of Pokémon Emerald.
 
 It builds the following ROM:

asm/macros/event.inc

@@ -345,11 +345,12 @@
 	.byte 0x32
 	.endm
 
-	@ Plays the specified (song_number) song. The byte is apparently supposed to be 0x00.
+	@ Plays the specified (song_number) song. If save_song is TRUE, the
-	.macro playbgm song_number:req, unknown:req
+	@ specified (song_number) will be saved as if savebgm was called with it.
+	.macro playbgm song_number:req, save_song:req
 	.byte 0x33
 	.2byte \song_number
-	.byte \unknown
+	.byte \save_song
 	.endm
 
 	@ Saves the specified (song_number) song to be played later.
@@ -812,12 +813,12 @@
 	.byte 0x68
 	.endm
 
-	@ Ceases movement for all Objects on-screen.
+	@ Freezes all objects immediately except the player. The player is frozen once their movement is finished.
 	.macro lockall
 	.byte 0x69
 	.endm
 
-	@ If the script was called by an Object, then that Object's movement will cease.
+	@ Freezes all objects immediately except the player and the selected object. The player and selected object are frozen once their movement is finished.
 	.macro lock
 	.byte 0x6a
 	.endm
@@ -918,10 +919,10 @@
 	.byte 0x76
 	.endm
 
-	@ Draws an image of the winner of the contest. In FireRed, this command is a nop. (The argument is discarded.)
+	@ Draws an image of the winner of the contest. winnerId is any CONTEST_WINNER_* constant.
-	.macro showcontestwinner a:req
+	.macro showcontestpainting winnerId:req
 	.byte 0x77
-	.byte \a
+	.byte \winnerId
 	.endm
 
 	@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille 

asmdiff.sh

@@ -1,11 +1,19 @@
 #!/bin/bash
 
-OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
+if [[ -d "$DEVKITARM/bin/" ]]; then
+    OBJDUMP_BIN="$DEVKITARM/bin/arm-none-eabi-objdump"
+else
+    OBJDUMP_BIN="arm-none-eabi-objdump"
+fi
+
+OBJDUMP="$OBJDUMP_BIN -D -bbinary -marmv4t -Mforce-thumb"
+
 if [ $(($1)) -ge $((0x8000000)) ]; then
     OPTIONS="--adjust-vma=0x8000000 --start-address=$(($1)) --stop-address=$(($1 + $2))"
 else
     OPTIONS="--start-address=$(($1)) --stop-address=$(($1 + $2))"
 fi
+
 $OBJDUMP $OPTIONS baserom.gba > baserom.dump
 $OBJDUMP $OPTIONS pokeemerald.gba > pokeemerald.dump
 diff -u baserom.dump pokeemerald.dump

berry_fix/Makefile

@@ -1,29 +1,27 @@
 TOOLCHAIN := $(DEVKITARM)
 COMPARE ?= 0
 
-ifeq ($(CC),)
+# don't use dkP's base_tools anymore
-HOSTCC := gcc
+# because the redefinition of $(CC) conflicts
-else
+# with when we want to use $(CC) to preprocess files
-HOSTCC := $(CC)
+# thus, manually create the variables for the bin
-endif
+# files, or use arm-none-eabi binaries on the system
+# if dkP is not installed on this system
 
-ifeq ($(CXX),)
+ifneq (,$(TOOLCHAIN))
-HOSTCXX := g++
+ifneq ($(wildcard $(TOOLCHAIN)/bin),)
-else
-HOSTCXX := $(CXX)
-endif
-
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
-include $(TOOLCHAIN)/base_tools
-else
 export PATH := $(TOOLCHAIN)/bin:$(PATH)
+endif
+endif
+
 PREFIX := arm-none-eabi-
 OBJCOPY := $(PREFIX)objcopy
-export CC := $(PREFIX)gcc
+AS := $(PREFIX)as
-export AS := $(PREFIX)as
+LD := $(PREFIX)ld
-endif
+
-export CPP := $(PREFIX)cpp
+# note: the makefile must be set up so MODERNCC is never called
-export LD := $(PREFIX)ld
+# if MODERN=0
+MODERNCC := $(PREFIX)gcc
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -31,6 +29,23 @@ else
 EXE :=
 endif
 
+# use arm-none-eabi-cpp for macOS
+# as macOS's default compiler is clang
+# and clang's preprocessor will warn on \u
+# when preprocessing asm files, expecting a unicode literal
+# we can't unconditionally use arm-none-eabi-cpp
+# as installations which install binutils-arm-none-eabi
+# don't come with it
+ifneq ($(MODERN),1)
+  ifeq ($(shell uname -s),Darwin)
+    CPP := $(PREFIX)cpp
+  else
+    CPP := $(CC) -E
+  endif
+else
+  CPP := $(PREFIX)cpp
+endif
+
 GAME_CODE  := AGBJ
 MAKER_CODE := 01
 REVISION   := 0
@@ -166,7 +181,7 @@ $(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
 endif
 
 payload:
-	@$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN)
+	@$(MAKE) -C payload COMPARE=$(COMPARE) TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)
 
 payload/payload.gba: payload
 

berry_fix/payload/Makefile

@@ -1,29 +1,27 @@
 TOOLCHAIN := $(DEVKITARM)
 COMPARE ?= 0
 
-ifeq ($(CC),)
+# don't use dkP's base_tools anymore
-HOSTCC := gcc
+# because the redefinition of $(CC) conflicts
-else
+# with when we want to use $(CC) to preprocess files
-HOSTCC := $(CC)
+# thus, manually create the variables for the bin
-endif
+# files, or use arm-none-eabi binaries on the system
+# if dkP is not installed on this system
 
-ifeq ($(CXX),)
+ifneq (,$(TOOLCHAIN))
-HOSTCXX := g++
+ifneq ($(wildcard $(TOOLCHAIN)/bin),)
-else
-HOSTCXX := $(CXX)
-endif
-
-ifneq (,$(wildcard $(TOOLCHAIN)/base_tools))
-include $(TOOLCHAIN)/base_tools
-else
 export PATH := $(TOOLCHAIN)/bin:$(PATH)
+endif
+endif
+
 PREFIX := arm-none-eabi-
 OBJCOPY := $(PREFIX)objcopy
-export CC := $(PREFIX)gcc
+AS := $(PREFIX)as
-export AS := $(PREFIX)as
+LD := $(PREFIX)ld
-endif
+
-export CPP := $(PREFIX)cpp
+# note: the makefile must be set up so MODERNCC is never called
-export LD := $(PREFIX)ld
+# if MODERN=0
+MODERNCC := $(PREFIX)gcc
 
 ifeq ($(OS),Windows_NT)
 EXE := .exe
@@ -31,6 +29,23 @@ else
 EXE :=
 endif
 
+# use arm-none-eabi-cpp for macOS
+# as macOS's default compiler is clang
+# and clang's preprocessor will warn on \u
+# when preprocessing asm files, expecting a unicode literal
+# we can't unconditionally use arm-none-eabi-cpp
+# as installations which install binutils-arm-none-eabi
+# don't come with it
+ifneq ($(MODERN),1)
+  ifeq ($(shell uname -s),Darwin)
+    CPP := $(PREFIX)cpp
+  else
+    CPP := $(CC) -E
+  endif
+else
+  CPP := $(PREFIX)cpp
+endif
+
 SHELL := /bin/bash -o pipefail
 
 CPPFLAGS := -I ../../tools/agbcc/include -I ../../tools/agbcc -iquote include -nostdinc -undef

berry_fix/payload/include/gba/m4a_internal.h

@@ -419,7 +419,7 @@ void SetPokemonCryPitch(s16 val);
 void SetPokemonCryLength(u16 val);
 void SetPokemonCryRelease(u8 val);
 void SetPokemonCryProgress(u32 val);
-int IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
+bool32 IsPokemonCryPlaying(struct MusicPlayerInfo *mplayInfo);
 void SetPokemonCryChorus(s8 val);
 void SetPokemonCryStereo(u32 val);
 void SetPokemonCryPriority(u8 val);

data/battle_anim_scripts.s

@@ -1656,12 +1656,12 @@ Explosion1:
 Move_DEFENSE_CURL:
 	loadspritegfx ANIM_TAG_ECLIPSING_ORB
 	loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0
 	createvisualtask AnimTask_DefenseCurlDeformMon, 5
 	waitforvisualfinish
 	createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
 	waitforvisualfinish
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
 	waitforvisualfinish
 	end
 
@@ -7254,7 +7254,7 @@ Move_IRON_TAIL:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
 	clearmonbg ANIM_TARGET
 	blendoff
 	waitforvisualfinish
@@ -7274,7 +7274,7 @@ Move_POISON_TAIL:
 	createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
 	playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
 	waitforvisualfinish
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1
 	clearmonbg ANIM_TARGET
 	blendoff
 	call PoisonBubblesEffect
@@ -7551,7 +7551,7 @@ Move_DISABLE:
 	playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
 	createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 24, -16
 	waitforvisualfinish
-	createvisualtask AnimTask_GrowAndGreyscale, 5
+	createvisualtask AnimTask_GrowAndGrayscale, 5
 	loopsewithpan SE_M_BIND, SOUND_PAN_TARGET, 15, 4
 	waitforvisualfinish
 	delay 1
@@ -7946,16 +7946,16 @@ Move_PERISH_SONG:
 	panse_1B SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
 	delay 80
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 0
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 0
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 0
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 0
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0
 	delay 100
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 4, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 5, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 6, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, 7, 1
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1
 	waitforvisualfinish
 	end
 
@@ -9573,7 +9573,7 @@ Move_DOOM_DESIRE:
 	createvisualtask GetIsDoomDesireHitTurn, 2
 	delay 1
 	monbg ANIM_ATK_PARTNER
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, FALSE
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, FALSE
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 0, 4, RGB_BLACK
 	waitforvisualfinish
 	setalpha 8, 8
@@ -9581,7 +9581,7 @@ Move_DOOM_DESIRE:
 	createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_ATTACKER, 1
 	waitforvisualfinish
 	delay 20
-	createvisualtask AnimTask_SetGreyscaleOrOriginalPal, 5, ANIM_TARGET, TRUE
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, TRUE
 	createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 1, 1, 4, 0, RGB_BLACK
 	waitforvisualfinish
 	clearmonbg ANIM_ATK_PARTNER

data/battle_scripts_1.s

@@ -16,244 +16,222 @@
 	.section script_data, "aw", %progbits
 	
 .align 2
-gBattleScriptsForMoveEffects:: @ 82D86A8
+gBattleScriptsForMoveEffects::
-	.4byte BattleScript_EffectHit
+	.4byte BattleScript_EffectHit                    @ EFFECT_HIT
-	.4byte BattleScript_EffectSleep
+	.4byte BattleScript_EffectSleep                  @ EFFECT_SLEEP
-	.4byte BattleScript_EffectPoisonHit
+	.4byte BattleScript_EffectPoisonHit              @ EFFECT_POISON_HIT
-	.4byte BattleScript_EffectAbsorb
+	.4byte BattleScript_EffectAbsorb                 @ EFFECT_ABSORB
-	.4byte BattleScript_EffectBurnHit
+	.4byte BattleScript_EffectBurnHit                @ EFFECT_BURN_HIT
-	.4byte BattleScript_EffectFreezeHit
+	.4byte BattleScript_EffectFreezeHit              @ EFFECT_FREEZE_HIT
-	.4byte BattleScript_EffectParalyzeHit
+	.4byte BattleScript_EffectParalyzeHit            @ EFFECT_PARALYZE_HIT
-	.4byte BattleScript_EffectExplosion
+	.4byte BattleScript_EffectExplosion              @ EFFECT_EXPLOSION
-	.4byte BattleScript_EffectDreamEater
+	.4byte BattleScript_EffectDreamEater             @ EFFECT_DREAM_EATER
-	.4byte BattleScript_EffectMirrorMove
+	.4byte BattleScript_EffectMirrorMove             @ EFFECT_MIRROR_MOVE
-	.4byte BattleScript_EffectAttackUp
+	.4byte BattleScript_EffectAttackUp               @ EFFECT_ATTACK_UP
-	.4byte BattleScript_EffectDefenseUp
+	.4byte BattleScript_EffectDefenseUp              @ EFFECT_DEFENSE_UP
-	.4byte BattleScript_EffectSpeedUp
+	.4byte BattleScript_EffectHit                    @ EFFECT_SPEED_UP
-	.4byte BattleScript_EffectSpecialAttackUp
+	.4byte BattleScript_EffectSpecialAttackUp        @ EFFECT_SPECIAL_ATTACK_UP
-	.4byte BattleScript_EffectSpecialDefenseUp
+	.4byte BattleScript_EffectHit                    @ EFFECT_SPECIAL_DEFENSE_UP
-	.4byte BattleScript_EffectAccuracyUp
+	.4byte BattleScript_EffectHit                    @ EFFECT_ACCURACY_UP
-	.4byte BattleScript_EffectEvasionUp
+	.4byte BattleScript_EffectEvasionUp              @ EFFECT_EVASION_UP
-	.4byte BattleScript_EffectAlwaysHit
+	.4byte BattleScript_EffectHit                    @ EFFECT_ALWAYS_HIT
-	.4byte BattleScript_EffectAttackDown
+	.4byte BattleScript_EffectAttackDown             @ EFFECT_ATTACK_DOWN
-	.4byte BattleScript_EffectDefenseDown
+	.4byte BattleScript_EffectDefenseDown            @ EFFECT_DEFENSE_DOWN
-	.4byte BattleScript_EffectSpeedDown
+	.4byte BattleScript_EffectSpeedDown              @ EFFECT_SPEED_DOWN
-	.4byte BattleScript_EffectSpecialAttackDown
+	.4byte BattleScript_EffectHit                    @ EFFECT_SPECIAL_ATTACK_DOWN
-	.4byte BattleScript_EffectSpecialDefenseDown
+	.4byte BattleScript_EffectHit                    @ EFFECT_SPECIAL_DEFENSE_DOWN
-	.4byte BattleScript_EffectAccuracyDown
+	.4byte BattleScript_EffectAccuracyDown           @ EFFECT_ACCURACY_DOWN
-	.4byte BattleScript_EffectEvasionDown
+	.4byte BattleScript_EffectEvasionDown            @ EFFECT_EVASION_DOWN
-	.4byte BattleScript_EffectHaze
+	.4byte BattleScript_EffectHaze                   @ EFFECT_HAZE
-	.4byte BattleScript_EffectBide
+	.4byte BattleScript_EffectBide                   @ EFFECT_BIDE
-	.4byte BattleScript_EffectRampage
+	.4byte BattleScript_EffectRampage                @ EFFECT_RAMPAGE
-	.4byte BattleScript_EffectRoar
+	.4byte BattleScript_EffectRoar                   @ EFFECT_ROAR
-	.4byte BattleScript_EffectMultiHit
+	.4byte BattleScript_EffectMultiHit               @ EFFECT_MULTI_HIT
-	.4byte BattleScript_EffectConversion
+	.4byte BattleScript_EffectConversion             @ EFFECT_CONVERSION
-	.4byte BattleScript_EffectFlinchHit
+	.4byte BattleScript_EffectFlinchHit              @ EFFECT_FLINCH_HIT
-	.4byte BattleScript_EffectRestoreHp
+	.4byte BattleScript_EffectRestoreHp              @ EFFECT_RESTORE_HP
-	.4byte BattleScript_EffectToxic
+	.4byte BattleScript_EffectToxic                  @ EFFECT_TOXIC
-	.4byte BattleScript_EffectPayDay
+	.4byte BattleScript_EffectPayDay                 @ EFFECT_PAY_DAY
-	.4byte BattleScript_EffectLightScreen
+	.4byte BattleScript_EffectLightScreen            @ EFFECT_LIGHT_SCREEN
-	.4byte BattleScript_EffectTriAttack
+	.4byte BattleScript_EffectTriAttack              @ EFFECT_TRI_ATTACK
-	.4byte BattleScript_EffectRest
+	.4byte BattleScript_EffectRest                   @ EFFECT_REST
-	.4byte BattleScript_EffectOHKO
+	.4byte BattleScript_EffectOHKO                   @ EFFECT_OHKO
-	.4byte BattleScript_EffectRazorWind
+	.4byte BattleScript_EffectRazorWind              @ EFFECT_RAZOR_WIND
-	.4byte BattleScript_EffectSuperFang
+	.4byte BattleScript_EffectSuperFang              @ EFFECT_SUPER_FANG
-	.4byte BattleScript_EffectDragonRage
+	.4byte BattleScript_EffectDragonRage             @ EFFECT_DRAGON_RAGE
-	.4byte BattleScript_EffectTrap
+	.4byte BattleScript_EffectTrap                   @ EFFECT_TRAP
-	.4byte BattleScript_EffectHighCritical
+	.4byte BattleScript_EffectHit                    @ EFFECT_HIGH_CRITICAL
-	.4byte BattleScript_EffectDoubleHit
+	.4byte BattleScript_EffectDoubleHit              @ EFFECT_DOUBLE_HIT
-	.4byte BattleScript_EffectRecoilIfMiss
+	.4byte BattleScript_EffectRecoilIfMiss           @ EFFECT_RECOIL_IF_MISS
-	.4byte BattleScript_EffectMist
+	.4byte BattleScript_EffectMist                   @ EFFECT_MIST
-	.4byte BattleScript_EffectFocusEnergy
+	.4byte BattleScript_EffectFocusEnergy            @ EFFECT_FOCUS_ENERGY
-	.4byte BattleScript_EffectRecoil
+	.4byte BattleScript_EffectRecoil                 @ EFFECT_RECOIL
-	.4byte BattleScript_EffectConfuse
+	.4byte BattleScript_EffectConfuse                @ EFFECT_CONFUSE
-	.4byte BattleScript_EffectAttackUp2
+	.4byte BattleScript_EffectAttackUp2              @ EFFECT_ATTACK_UP_2
-	.4byte BattleScript_EffectDefenseUp2
+	.4byte BattleScript_EffectDefenseUp2             @ EFFECT_DEFENSE_UP_2
-	.4byte BattleScript_EffectSpeedUp2
+	.4byte BattleScript_EffectSpeedUp2               @ EFFECT_SPEED_UP_2
-	.4byte BattleScript_EffectSpecialAttackUp2
+	.4byte BattleScript_EffectSpecialAttackUp2       @ EFFECT_SPECIAL_ATTACK_UP_2
-	.4byte BattleScript_EffectSpecialDefenseUp2
+	.4byte BattleScript_EffectSpecialDefenseUp2      @ EFFECT_SPECIAL_DEFENSE_UP_2
-	.4byte BattleScript_EffectAccuracyUp2
+	.4byte BattleScript_EffectHit                    @ EFFECT_ACCURACY_UP_2
-	.4byte BattleScript_EffectEvasionUp2
+	.4byte BattleScript_EffectHit                    @ EFFECT_EVASION_UP_2
-	.4byte BattleScript_EffectTransform
+	.4byte BattleScript_EffectTransform              @ EFFECT_TRANSFORM
-	.4byte BattleScript_EffectAttackDown2
+	.4byte BattleScript_EffectAttackDown2            @ EFFECT_ATTACK_DOWN_2
-	.4byte BattleScript_EffectDefenseDown2
+	.4byte BattleScript_EffectDefenseDown2           @ EFFECT_DEFENSE_DOWN_2
-	.4byte BattleScript_EffectSpeedDown2
+	.4byte BattleScript_EffectSpeedDown2             @ EFFECT_SPEED_DOWN_2
-	.4byte BattleScript_EffectSpecialAttackDown2
+	.4byte BattleScript_EffectHit                    @ EFFECT_SPECIAL_ATTACK_DOWN_2
-	.4byte BattleScript_EffectSpecialDefenseDown2
+	.4byte BattleScript_EffectSpecialDefenseDown2    @ EFFECT_SPECIAL_DEFENSE_DOWN_2
-	.4byte BattleScript_EffectAccuracyDown2
+	.4byte BattleScript_EffectHit                    @ EFFECT_ACCURACY_DOWN_2
-	.4byte BattleScript_EffectEvasionDown2
+	.4byte BattleScript_EffectHit                    @ EFFECT_EVASION_DOWN_2
-	.4byte BattleScript_EffectReflect
+	.4byte BattleScript_EffectReflect                @ EFFECT_REFLECT
-	.4byte BattleScript_EffectPoison
+	.4byte BattleScript_EffectPoison                 @ EFFECT_POISON
-	.4byte BattleScript_EffectParalyze
+	.4byte BattleScript_EffectParalyze               @ EFFECT_PARALYZE
-	.4byte BattleScript_EffectAttackDownHit
+	.4byte BattleScript_EffectAttackDownHit          @ EFFECT_ATTACK_DOWN_HIT
-	.4byte BattleScript_EffectDefenseDownHit
+	.4byte BattleScript_EffectDefenseDownHit         @ EFFECT_DEFENSE_DOWN_HIT
-	.4byte BattleScript_EffectSpeedDownHit
+	.4byte BattleScript_EffectSpeedDownHit           @ EFFECT_SPEED_DOWN_HIT
-	.4byte BattleScript_EffectSpecialAttackDownHit
+	.4byte BattleScript_EffectSpecialAttackDownHit   @ EFFECT_SPECIAL_ATTACK_DOWN_HIT
-	.4byte BattleScript_EffectSpecialDefenseDownHit
+	.4byte BattleScript_EffectSpecialDefenseDownHit  @ EFFECT_SPECIAL_DEFENSE_DOWN_HIT
-	.4byte BattleScript_EffectAccuracyDownHit
+	.4byte BattleScript_EffectAccuracyDownHit        @ EFFECT_ACCURACY_DOWN_HIT
-	.4byte BattleScript_EffectEvasionDownHit
+	.4byte BattleScript_EffectHit                    @ EFFECT_EVASION_DOWN_HIT
-	.4byte BattleScript_EffectSkyAttack
+	.4byte BattleScript_EffectSkyAttack              @ EFFECT_SKY_ATTACK
-	.4byte BattleScript_EffectConfuseHit
+	.4byte BattleScript_EffectConfuseHit             @ EFFECT_CONFUSE_HIT
-	.4byte BattleScript_EffectTwineedle
+	.4byte BattleScript_EffectTwineedle              @ EFFECT_TWINEEDLE
-	.4byte BattleScript_EffectVitalThrow
+	.4byte BattleScript_EffectHit                    @ EFFECT_VITAL_THROW
-	.4byte BattleScript_EffectSubstitute
+	.4byte BattleScript_EffectSubstitute             @ EFFECT_SUBSTITUTE
-	.4byte BattleScript_EffectRecharge
+	.4byte BattleScript_EffectRecharge               @ EFFECT_RECHARGE
-	.4byte BattleScript_EffectRage
+	.4byte BattleScript_EffectRage                   @ EFFECT_RAGE
-	.4byte BattleScript_EffectMimic
+	.4byte BattleScript_EffectMimic                  @ EFFECT_MIMIC
-	.4byte BattleScript_EffectMetronome
+	.4byte BattleScript_EffectMetronome              @ EFFECT_METRONOME
-	.4byte BattleScript_EffectLeechSeed
+	.4byte BattleScript_EffectLeechSeed              @ EFFECT_LEECH_SEED
-	.4byte BattleScript_EffectSplash
+	.4byte BattleScript_EffectSplash                 @ EFFECT_SPLASH
-	.4byte BattleScript_EffectDisable
+	.4byte BattleScript_EffectDisable                @ EFFECT_DISABLE
-	.4byte BattleScript_EffectLevelDamage
+	.4byte BattleScript_EffectLevelDamage            @ EFFECT_LEVEL_DAMAGE
-	.4byte BattleScript_EffectPsywave
+	.4byte BattleScript_EffectPsywave                @ EFFECT_PSYWAVE
-	.4byte BattleScript_EffectCounter
+	.4byte BattleScript_EffectCounter                @ EFFECT_COUNTER
-	.4byte BattleScript_EffectEncore
+	.4byte BattleScript_EffectEncore                 @ EFFECT_ENCORE
-	.4byte BattleScript_EffectPainSplit
+	.4byte BattleScript_EffectPainSplit              @ EFFECT_PAIN_SPLIT
-	.4byte BattleScript_EffectSnore
+	.4byte BattleScript_EffectSnore                  @ EFFECT_SNORE
-	.4byte BattleScript_EffectConversion2
+	.4byte BattleScript_EffectConversion2            @ EFFECT_CONVERSION_2
-	.4byte BattleScript_EffectLockOn
+	.4byte BattleScript_EffectLockOn                 @ EFFECT_LOCK_ON
-	.4byte BattleScript_EffectSketch
+	.4byte BattleScript_EffectSketch                 @ EFFECT_SKETCH
-	.4byte BattleScript_EffectUnused60//Thaw
+	.4byte BattleScript_EffectHit                    @ EFFECT_UNUSED_60
-	.4byte BattleScript_EffectSleepTalk
+	.4byte BattleScript_EffectSleepTalk              @ EFFECT_SLEEP_TALK
-	.4byte BattleScript_EffectDestinyBond
+	.4byte BattleScript_EffectDestinyBond            @ EFFECT_DESTINY_BOND
-	.4byte BattleScript_EffectFlail
+	.4byte BattleScript_EffectFlail                  @ EFFECT_FLAIL
-	.4byte BattleScript_EffectSpite
+	.4byte BattleScript_EffectSpite                  @ EFFECT_SPITE
-	.4byte BattleScript_EffectFalseSwipe
+	.4byte BattleScript_EffectHit                    @ EFFECT_FALSE_SWIPE
-	.4byte BattleScript_EffectHealBell
+	.4byte BattleScript_EffectHealBell               @ EFFECT_HEAL_BELL
-	.4byte BattleScript_EffectQuickAttack
+	.4byte BattleScript_EffectHit                    @ EFFECT_QUICK_ATTACK
-	.4byte BattleScript_EffectTripleKick
+	.4byte BattleScript_EffectTripleKick             @ EFFECT_TRIPLE_KICK
-	.4byte BattleScript_EffectThief
+	.4byte BattleScript_EffectThief                  @ EFFECT_THIEF
-	.4byte BattleScript_EffectMeanLook
+	.4byte BattleScript_EffectMeanLook               @ EFFECT_MEAN_LOOK
-	.4byte BattleScript_EffectNightmare
+	.4byte BattleScript_EffectNightmare              @ EFFECT_NIGHTMARE
-	.4byte BattleScript_EffectMinimize
+	.4byte BattleScript_EffectMinimize               @ EFFECT_MINIMIZE
-	.4byte BattleScript_EffectCurse
+	.4byte BattleScript_EffectCurse                  @ EFFECT_CURSE
-	.4byte BattleScript_EffectUnused6e
+	.4byte BattleScript_EffectHit                    @ EFFECT_UNUSED_6E
-	.4byte BattleScript_EffectProtect
+	.4byte BattleScript_EffectProtect                @ EFFECT_PROTECT
-	.4byte BattleScript_EffectSpikes
+	.4byte BattleScript_EffectSpikes                 @ EFFECT_SPIKES
-	.4byte BattleScript_EffectForesight
+	.4byte BattleScript_EffectForesight              @ EFFECT_FORESIGHT
-	.4byte BattleScript_EffectPerishSong
+	.4byte BattleScript_EffectPerishSong             @ EFFECT_PERISH_SONG
-	.4byte BattleScript_EffectSandstorm
+	.4byte BattleScript_EffectSandstorm              @ EFFECT_SANDSTORM
-	.4byte BattleScript_EffectEndure
+	.4byte BattleScript_EffectEndure                 @ EFFECT_ENDURE
-	.4byte BattleScript_EffectRollout
+	.4byte BattleScript_EffectRollout                @ EFFECT_ROLLOUT
-	.4byte BattleScript_EffectSwagger
+	.4byte BattleScript_EffectSwagger                @ EFFECT_SWAGGER
-	.4byte BattleScript_EffectFuryCutter
+	.4byte BattleScript_EffectFuryCutter             @ EFFECT_FURY_CUTTER
-	.4byte BattleScript_EffectAttract
+	.4byte BattleScript_EffectAttract                @ EFFECT_ATTRACT
-	.4byte BattleScript_EffectReturn
+	.4byte BattleScript_EffectReturn                 @ EFFECT_RETURN
-	.4byte BattleScript_EffectPresent
+	.4byte BattleScript_EffectPresent                @ EFFECT_PRESENT
-	.4byte BattleScript_EffectFrustration
+	.4byte BattleScript_EffectFrustration            @ EFFECT_FRUSTRATION
-	.4byte BattleScript_EffectSafeguard
+	.4byte BattleScript_EffectSafeguard              @ EFFECT_SAFEGUARD
-	.4byte BattleScript_EffectThawHit
+	.4byte BattleScript_EffectThawHit                @ EFFECT_THAW_HIT
-	.4byte BattleScript_EffectMagnitude
+	.4byte BattleScript_EffectMagnitude              @ EFFECT_MAGNITUDE
-	.4byte BattleScript_EffectBatonPass
+	.4byte BattleScript_EffectBatonPass              @ EFFECT_BATON_PASS
-	.4byte BattleScript_EffectPursuit
+	.4byte BattleScript_EffectHit                    @ EFFECT_PURSUIT
-	.4byte BattleScript_EffectRapidSpin
+	.4byte BattleScript_EffectRapidSpin              @ EFFECT_RAPID_SPIN
-	.4byte BattleScript_EffectSonicboom
+	.4byte BattleScript_EffectSonicboom              @ EFFECT_SONICBOOM
-	.4byte BattleScript_EffectUnused83
+	.4byte BattleScript_EffectHit                    @ EFFECT_UNUSED_83
-	.4byte BattleScript_EffectMorningSun
+	.4byte BattleScript_EffectMorningSun             @ EFFECT_MORNING_SUN
-	.4byte BattleScript_EffectSynthesis
+	.4byte BattleScript_EffectSynthesis              @ EFFECT_SYNTHESIS
-	.4byte BattleScript_EffectMoonlight
+	.4byte BattleScript_EffectMoonlight              @ EFFECT_MOONLIGHT
-	.4byte BattleScript_EffectHiddenPower
+	.4byte BattleScript_EffectHiddenPower            @ EFFECT_HIDDEN_POWER
-	.4byte BattleScript_EffectRainDance
+	.4byte BattleScript_EffectRainDance              @ EFFECT_RAIN_DANCE
-	.4byte BattleScript_EffectSunnyDay
+	.4byte BattleScript_EffectSunnyDay               @ EFFECT_SUNNY_DAY
-	.4byte BattleScript_EffectDefenseUpHit
+	.4byte BattleScript_EffectDefenseUpHit           @ EFFECT_DEFENSE_UP_HIT
-	.4byte BattleScript_EffectAttackUpHit
+	.4byte BattleScript_EffectAttackUpHit            @ EFFECT_ATTACK_UP_HIT
-	.4byte BattleScript_EffectAllStatsUpHit
+	.4byte BattleScript_EffectAllStatsUpHit          @ EFFECT_ALL_STATS_UP_HIT
-	.4byte BattleScript_EffectUnused8d
+	.4byte BattleScript_EffectHit                    @ EFFECT_UNUSED_8D
-	.4byte BattleScript_EffectBellyDrum
+	.4byte BattleScript_EffectBellyDrum              @ EFFECT_BELLY_DRUM
-	.4byte BattleScript_EffectPsychUp
+	.4byte BattleScript_EffectPsychUp                @ EFFECT_PSYCH_UP
-	.4byte BattleScript_EffectMirrorCoat
+	.4byte BattleScript_EffectMirrorCoat             @ EFFECT_MIRROR_COAT
-	.4byte BattleScript_EffectSkullBash
+	.4byte BattleScript_EffectSkullBash              @ EFFECT_SKULL_BASH
-	.4byte BattleScript_EffectTwister
+	.4byte BattleScript_EffectTwister                @ EFFECT_TWISTER
-	.4byte BattleScript_EffectEarthquake
+	.4byte BattleScript_EffectEarthquake             @ EFFECT_EARTHQUAKE
-	.4byte BattleScript_EffectFutureSight
+	.4byte BattleScript_EffectFutureSight            @ EFFECT_FUTURE_SIGHT
-	.4byte BattleScript_EffectGust
+	.4byte BattleScript_EffectGust                   @ EFFECT_GUST
-	.4byte BattleScript_EffectStomp
+	.4byte BattleScript_EffectStomp                  @ EFFECT_FLINCH_MINIMIZE_HIT
-	.4byte BattleScript_EffectSolarbeam
+	.4byte BattleScript_EffectSolarbeam              @ EFFECT_SOLARBEAM
-	.4byte BattleScript_EffectThunder
+	.4byte BattleScript_EffectThunder                @ EFFECT_THUNDER
-	.4byte BattleScript_EffectTeleport
+	.4byte BattleScript_EffectTeleport               @ EFFECT_TELEPORT
-	.4byte BattleScript_EffectBeatUp
+	.4byte BattleScript_EffectBeatUp                 @ EFFECT_BEAT_UP
-	.4byte BattleScript_EffectSemiInvulnerable
+	.4byte BattleScript_EffectSemiInvulnerable       @ EFFECT_SEMI_INVULNERABLE
-	.4byte BattleScript_EffectDefenseCurl
+	.4byte BattleScript_EffectDefenseCurl            @ EFFECT_DEFENSE_CURL
-	.4byte BattleScript_EffectSoftboiled
+	.4byte BattleScript_EffectSoftboiled             @ EFFECT_SOFTBOILED
-	.4byte BattleScript_EffectFakeOut
+	.4byte BattleScript_EffectFakeOut                @ EFFECT_FAKE_OUT
-	.4byte BattleScript_EffectUproar
+	.4byte BattleScript_EffectUproar                 @ EFFECT_UPROAR
-	.4byte BattleScript_EffectStockpile
+	.4byte BattleScript_EffectStockpile              @ EFFECT_STOCKPILE
-	.4byte BattleScript_EffectSpitUp
+	.4byte BattleScript_EffectSpitUp                 @ EFFECT_SPIT_UP
-	.4byte BattleScript_EffectSwallow
+	.4byte BattleScript_EffectSwallow                @ EFFECT_SWALLOW
-	.4byte BattleScript_EffectUnusedA3
+	.4byte BattleScript_EffectHit                    @ EFFECT_UNUSED_A3
-	.4byte BattleScript_EffectHail
+	.4byte BattleScript_EffectHail                   @ EFFECT_HAIL
-	.4byte BattleScript_EffectTorment
+	.4byte BattleScript_EffectTorment                @ EFFECT_TORMENT
-	.4byte BattleScript_EffectFlatter
+	.4byte BattleScript_EffectFlatter                @ EFFECT_FLATTER
-	.4byte BattleScript_EffectWillOWisp
+	.4byte BattleScript_EffectWillOWisp              @ EFFECT_WILL_O_WISP
-	.4byte BattleScript_EffectMemento
+	.4byte BattleScript_EffectMemento                @ EFFECT_MEMENTO
-	.4byte BattleScript_EffectFacade
+	.4byte BattleScript_EffectFacade                 @ EFFECT_FACADE
-	.4byte BattleScript_EffectFocusPunch
+	.4byte BattleScript_EffectFocusPunch             @ EFFECT_FOCUS_PUNCH
-	.4byte BattleScript_EffectSmellingsalt
+	.4byte BattleScript_EffectSmellingsalt           @ EFFECT_SMELLINGSALT
-	.4byte BattleScript_EffectFollowMe
+	.4byte BattleScript_EffectFollowMe               @ EFFECT_FOLLOW_ME
-	.4byte BattleScript_EffectNaturePower
+	.4byte BattleScript_EffectNaturePower            @ EFFECT_NATURE_POWER
-	.4byte BattleScript_EffectCharge
+	.4byte BattleScript_EffectCharge                 @ EFFECT_CHARGE
-	.4byte BattleScript_EffectTaunt
+	.4byte BattleScript_EffectTaunt                  @ EFFECT_TAUNT
-	.4byte BattleScript_EffectHelpingHand
+	.4byte BattleScript_EffectHelpingHand            @ EFFECT_HELPING_HAND
-	.4byte BattleScript_EffectTrick
+	.4byte BattleScript_EffectTrick                  @ EFFECT_TRICK
-	.4byte BattleScript_EffectRolePlay
+	.4byte BattleScript_EffectRolePlay               @ EFFECT_ROLE_PLAY
-	.4byte BattleScript_EffectWish
+	.4byte BattleScript_EffectWish                   @ EFFECT_WISH
-	.4byte BattleScript_EffectAssist
+	.4byte BattleScript_EffectAssist                 @ EFFECT_ASSIST
-	.4byte BattleScript_EffectIngrain
+	.4byte BattleScript_EffectIngrain                @ EFFECT_INGRAIN
-	.4byte BattleScript_EffectSuperpower
+	.4byte BattleScript_EffectSuperpower             @ EFFECT_SUPERPOWER
-	.4byte BattleScript_EffectMagicCoat
+	.4byte BattleScript_EffectMagicCoat              @ EFFECT_MAGIC_COAT
-	.4byte BattleScript_EffectRecycle
+	.4byte BattleScript_EffectRecycle                @ EFFECT_RECYCLE
-	.4byte BattleScript_EffectRevenge
+	.4byte BattleScript_EffectRevenge                @ EFFECT_REVENGE
-	.4byte BattleScript_EffectBrickBreak
+	.4byte BattleScript_EffectBrickBreak             @ EFFECT_BRICK_BREAK
-	.4byte BattleScript_EffectYawn
+	.4byte BattleScript_EffectYawn                   @ EFFECT_YAWN
-	.4byte BattleScript_EffectKnockOff
+	.4byte BattleScript_EffectKnockOff               @ EFFECT_KNOCK_OFF
-	.4byte BattleScript_EffectEndeavor
+	.4byte BattleScript_EffectEndeavor               @ EFFECT_ENDEAVOR
-	.4byte BattleScript_EffectEruption
+	.4byte BattleScript_EffectEruption               @ EFFECT_ERUPTION
-	.4byte BattleScript_EffectSkillSwap
+	.4byte BattleScript_EffectSkillSwap              @ EFFECT_SKILL_SWAP
-	.4byte BattleScript_EffectImprison
+	.4byte BattleScript_EffectImprison               @ EFFECT_IMPRISON
-	.4byte BattleScript_EffectRefresh
+	.4byte BattleScript_EffectRefresh                @ EFFECT_REFRESH
-	.4byte BattleScript_EffectGrudge
+	.4byte BattleScript_EffectGrudge                 @ EFFECT_GRUDGE
-	.4byte BattleScript_EffectSnatch
+	.4byte BattleScript_EffectSnatch                 @ EFFECT_SNATCH
-	.4byte BattleScript_EffectLowKick
+	.4byte BattleScript_EffectLowKick                @ EFFECT_LOW_KICK
-	.4byte BattleScript_EffectSecretPower
+	.4byte BattleScript_EffectSecretPower            @ EFFECT_SECRET_POWER
-	.4byte BattleScript_EffectDoubleEdge
+	.4byte BattleScript_EffectDoubleEdge             @ EFFECT_DOUBLE_EDGE
-	.4byte BattleScript_EffectTeeterDance
+	.4byte BattleScript_EffectTeeterDance            @ EFFECT_TEETER_DANCE
-	.4byte BattleScript_EffectBlazeKick
+	.4byte BattleScript_EffectBurnHit                @ EFFECT_BLAZE_KICK
-	.4byte BattleScript_EffectMudSport
+	.4byte BattleScript_EffectMudSport               @ EFFECT_MUD_SPORT
-	.4byte BattleScript_EffectPoisonFang
+	.4byte BattleScript_EffectPoisonFang             @ EFFECT_POISON_FANG
-	.4byte BattleScript_EffectWeatherBall
+	.4byte BattleScript_EffectWeatherBall            @ EFFECT_WEATHER_BALL
-	.4byte BattleScript_EffectOverheat
+	.4byte BattleScript_EffectOverheat               @ EFFECT_OVERHEAT
-	.4byte BattleScript_EffectTickle
+	.4byte BattleScript_EffectTickle                 @ EFFECT_TICKLE
-	.4byte BattleScript_EffectCosmicPower
+	.4byte BattleScript_EffectCosmicPower            @ EFFECT_COSMIC_POWER
-	.4byte BattleScript_EffectSkyUppercut
+	.4byte BattleScript_EffectSkyUppercut            @ EFFECT_SKY_UPPERCUT
-	.4byte BattleScript_EffectBulkUp
+	.4byte BattleScript_EffectBulkUp                 @ EFFECT_BULK_UP
-	.4byte BattleScript_EffectPoisonTail
+	.4byte BattleScript_EffectPoisonHit              @ EFFECT_POISON_TAIL
-	.4byte BattleScript_EffectWaterSport
+	.4byte BattleScript_EffectWaterSport             @ EFFECT_WATER_SPORT
-	.4byte BattleScript_EffectCalmMind
+	.4byte BattleScript_EffectCalmMind               @ EFFECT_CALM_MIND
-	.4byte BattleScript_EffectDragonDance
+	.4byte BattleScript_EffectDragonDance            @ EFFECT_DRAGON_DANCE
-	.4byte BattleScript_EffectCamouflage
+	.4byte BattleScript_EffectCamouflage             @ EFFECT_CAMOUFLAGE
 
-BattleScript_EffectSpeedUp::
-BattleScript_EffectSpecialDefenseUp::
-BattleScript_EffectAccuracyUp::
-BattleScript_EffectAlwaysHit::
-BattleScript_EffectSpecialAttackDown::
-BattleScript_EffectSpecialDefenseDown::
-BattleScript_EffectHighCritical::
-BattleScript_EffectAccuracyUp2::
-BattleScript_EffectEvasionUp2::
-BattleScript_EffectSpecialAttackDown2::
-BattleScript_EffectAccuracyDown2::
-BattleScript_EffectEvasionDown2::
-BattleScript_EffectEvasionDownHit::
-BattleScript_EffectVitalThrow::
-BattleScript_EffectUnused60::
-BattleScript_EffectFalseSwipe::
-BattleScript_EffectQuickAttack::
-BattleScript_EffectUnused6e::
-BattleScript_EffectPursuit::
-BattleScript_EffectUnused83::
-BattleScript_EffectUnused8d::
-BattleScript_EffectUnusedA3::
 BattleScript_EffectHit::
 	jumpifnotmove MOVE_SURF, BattleScript_HitFromAtkCanceler
 	jumpifnostatus3 BS_TARGET, STATUS3_UNDERWATER, BattleScript_HitFromAtkCanceler
@@ -338,7 +316,6 @@ BattleScript_CantMakeAsleep::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectPoisonHit::
-BattleScript_EffectPoisonTail::
 	setmoveeffect MOVE_EFFECT_POISON
 	goto BattleScript_EffectHit
 
@@ -382,7 +359,6 @@ BattleScript_AbsorbTryFainting::
 	goto BattleScript_MoveEnd
 
 BattleScript_EffectBurnHit::
-BattleScript_EffectBlazeKick::
 	setmoveeffect MOVE_EFFECT_BURN
 	goto BattleScript_EffectHit
 
@@ -1120,7 +1096,7 @@ BattleScript_SubstituteAnim::
 	healthbarupdate BS_ATTACKER
 	datahpupdate BS_ATTACKER
 BattleScript_SubstituteString::
-	printfromtable gSubsituteUsedStringIds
+	printfromtable gSubstituteUsedStringIds
 	waitmessage B_WAIT_TIME_LONG
 	goto BattleScript_MoveEnd
 BattleScript_AlreadyHasSubstitute::

data/battle_scripts_2.s

@@ -12,7 +12,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gBattlescriptsForBallThrow:: @ 82DBD08
+gBattlescriptsForBallThrow::
 	.4byte BattleScript_BallThrow        @ ITEM_NONE
 	.4byte BattleScript_BallThrow        @ ITEM_MASTER_BALL
 	.4byte BattleScript_BallThrow        @ ITEM_ULTRA_BALL
@@ -28,7 +28,7 @@ gBattlescriptsForBallThrow:: @ 82DBD08
 	.4byte BattleScript_BallThrow        @ ITEM_PREMIER_BALL
 
 	.align 2
-gBattlescriptsForUsingItem:: @ 82DBD3C
+gBattlescriptsForUsingItem::
 	.4byte BattleScript_PlayerUsesItem
 	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_FULL_RESTORE
 	.4byte BattleScript_OpponentUsesHealItem        @ AI_ITEM_HEAL_HP
@@ -37,11 +37,11 @@ gBattlescriptsForUsingItem:: @ 82DBD3C
 	.4byte BattleScript_OpponentUsesGuardSpec       @ AI_ITEM_GUARD_SPEC
 
 	.align 2
-gBattlescriptsForRunningByItem:: @ 82DBD54
+gBattlescriptsForRunningByItem::
 	.4byte BattleScript_RunByUsingItem
 
 	.align 2
-gBattlescriptsForSafariActions:: @ 82DBD58
+gBattlescriptsForSafariActions::
 	.4byte BattleScript_ActionWatchesCarefully
 	.4byte BattleScript_ActionGetNear
 	.4byte BattleScript_ActionThrowPokeblock

data/contest_ai_scripts.s

@@ -13,7 +13,7 @@
 	enum MON_4
 
 	.align 2
-gContestAI_ScriptsTable:: @ 82DE350
+gContestAI_ScriptsTable::
 	.4byte AI_CheckBadMove      @ CONTEST_AI_CHECK_BAD_MOVE
 	.4byte AI_CheckCombo        @ CONTEST_AI_CHECK_COMBO
 	.4byte AI_CheckBoring       @ CONTEST_AI_CHECK_BORING

data/event_scripts.s

@@ -61,7 +61,7 @@
 @ 81DB67C
 	.include "data/script_cmd_table.inc"
 
-gSpecialVars:: @ 81DBA0C
+gSpecialVars::
 	.4byte gSpecialVar_0x8000
 	.4byte gSpecialVar_0x8001
 	.4byte gSpecialVar_0x8002
@@ -87,7 +87,7 @@ gSpecialVars:: @ 81DBA0C
 
 	.include "data/specials.inc"
 
-gStdScripts:: @ 81DC2A0
+gStdScripts::
 	.4byte Std_ObtainItem              @ STD_OBTAIN_ITEM
 	.4byte Std_FindItem                @ STD_FIND_ITEM
 	.4byte Std_MsgboxNPC               @ MSGBOX_NPC
@@ -99,7 +99,7 @@ gStdScripts:: @ 81DC2A0
 	.4byte Std_RegisteredInMatchCall   @ STD_REGISTER_MATCH_CALL
 	.4byte Std_MsgboxGetPoints         @ MSGBOX_GETPOINTS
 	.4byte Std_10
-gStdScripts_End:: @ 81DC2CC
+gStdScripts_End::
 
 	.include "data/maps/PetalburgCity/scripts.inc"
 	.include "data/maps/SlateportCity/scripts.inc"
@@ -576,12 +576,12 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/scripts/new_game.inc"
 	.include "data/scripts/hall_of_fame.inc"
 
-EventScript_WhiteOut:: @ 8271857
+EventScript_WhiteOut::
 	call EverGrandeCity_HallOfFame_EventScript_ResetEliteFour
 	goto EventScript_ResetMrBriney
 	end
 
-EventScript_ResetMrBriney:: @ 8271862
+EventScript_ResetMrBriney::
 	compare VAR_BRINEY_LOCATION, 1
 	goto_if_eq EventScript_MoveMrBrineyToHouse
 	compare VAR_BRINEY_LOCATION, 2
@@ -590,7 +590,7 @@ EventScript_ResetMrBriney:: @ 8271862
 	goto_if_eq EventScript_MoveMrBrineyToRoute109
 	end
 
-EventScript_MoveMrBrineyToHouse:: @ 8271884
+EventScript_MoveMrBrineyToHouse::
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
@@ -600,7 +600,7 @@ EventScript_MoveMrBrineyToHouse:: @ 8271884
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	end
 
-EventScript_MoveMrBrineyToDewford:: @ 827189A
+EventScript_MoveMrBrineyToDewford::
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
@@ -611,7 +611,7 @@ EventScript_MoveMrBrineyToDewford:: @ 827189A
 	clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	end
 
-EventScript_MoveMrBrineyToRoute109:: @ 82718B3
+EventScript_MoveMrBrineyToRoute109::
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY
@@ -622,7 +622,7 @@ EventScript_MoveMrBrineyToRoute109:: @ 82718B3
 	clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	end
 
-EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
+EverGrandeCity_HallOfFame_EventScript_ResetEliteFour::
 	clearflag FLAG_DEFEATED_ELITE_4_SIDNEY
 	clearflag FLAG_DEFEATED_ELITE_4_PHOEBE
 	clearflag FLAG_DEFEATED_ELITE_4_GLACIA
@@ -630,7 +630,7 @@ EverGrandeCity_HallOfFame_EventScript_ResetEliteFour:: @ 82718CC
 	setvar VAR_ELITE_4_STATE, 0
 	return
 
-Common_EventScript_UpdateBrineyLocation:: @ 82718DE
+Common_EventScript_UpdateBrineyLocation::
 	goto_if_unset FLAG_RECEIVED_POKENAV, Common_EventScript_NopReturn
 	goto_if_set FLAG_DEFEATED_PETALBURG_GYM, Common_EventScript_NopReturn
 	goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, EventScript_SetBrineyLocation_House
@@ -638,15 +638,15 @@ Common_EventScript_UpdateBrineyLocation:: @ 82718DE
 	goto_if_unset FLAG_HIDE_ROUTE_109_MR_BRINEY, EventScript_SetBrineyLocation_Route109
 	return
 
-EventScript_SetBrineyLocation_House:: @ 827190C
+EventScript_SetBrineyLocation_House::
 	setvar VAR_BRINEY_LOCATION, 1
 	return
 
-EventScript_SetBrineyLocation_Dewford:: @ 8271912
+EventScript_SetBrineyLocation_Dewford::
 	setvar VAR_BRINEY_LOCATION, 2
 	return
 
-EventScript_SetBrineyLocation_Route109:: @ 8271918
+EventScript_SetBrineyLocation_Route109::
 	setvar VAR_BRINEY_LOCATION, 3
 	return
 
@@ -656,32 +656,32 @@ EventScript_SetBrineyLocation_Route109:: @ 8271918
 	.include "data/scripts/pc.inc"
 
 @ scripts/notices.inc? signs.inc? See comment about text/notices.inc
-Common_EventScript_ShowPokemartSign:: @ 8271E6A
+Common_EventScript_ShowPokemartSign::
 	msgbox gText_PokemartSign, MSGBOX_SIGN
 	end
 
-Common_EventScript_ShowPokemonCenterSign:: @ 8271E73
+Common_EventScript_ShowPokemonCenterSign::
 	msgbox gText_PokemonCenterSign, MSGBOX_SIGN
 	end
 
-Common_ShowEasyChatScreen:: @ 8271E7C
+Common_ShowEasyChatScreen::
 	fadescreen FADE_TO_BLACK
 	special ShowEasyChatScreen
 	fadescreen FADE_FROM_BLACK
 	return
 
-Common_EventScript_ReadyPetalburgGymForBattle:: @ 8271E84
+Common_EventScript_ReadyPetalburgGymForBattle::
 	clearflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS
 	return
 
-Common_EventScript_BufferTrendyPhrase:: @ 8271E8B
+Common_EventScript_BufferTrendyPhrase::
 	dotimebasedevents
 	setvar VAR_0x8004, 0
 	special BufferTrendyPhraseString
 	return
 
-EventScript_BackupMrBrineyLocation:: @ 8271E95
+EventScript_BackupMrBrineyLocation::
 	copyvar VAR_0x8008, VAR_BRINEY_LOCATION
 	setvar VAR_BRINEY_LOCATION, 0
 	return
@@ -690,34 +690,34 @@ EventScript_BackupMrBrineyLocation:: @ 8271E95
 	.include "data/scripts/rival_graphics.inc"
 	.include "data/scripts/set_gym_trainers.inc"
 
-Common_EventScript_ShowBagIsFull:: @ 8272054
+Common_EventScript_ShowBagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	release
 	end
 
-Common_EventScript_BagIsFull:: @ 827205E
+Common_EventScript_BagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_ShowNoRoomForDecor:: @ 8272067
+Common_EventScript_ShowNoRoomForDecor::
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
 	end
 
-Common_EventScript_NoRoomForDecor:: @ 8272071
+Common_EventScript_NoRoomForDecor::
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	return
 
-Common_EventScript_SetAbnormalWeather:: @ 827207A
+Common_EventScript_SetAbnormalWeather::
 	setweather WEATHER_ABNORMAL
 	return
 
-Common_EventScript_PlayGymBadgeFanfare:: @ 827207E
+Common_EventScript_PlayGymBadgeFanfare::
 	playfanfare MUS_OBTAIN_BADGE
 	waitfanfare
 	return
 
-Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
+Common_EventScript_OutOfCenterPartyHeal::
 	fadescreen FADE_TO_BLACK
 	playfanfare MUS_HEAL
 	waitfanfare
@@ -725,7 +725,7 @@ Common_EventScript_OutOfCenterPartyHeal:: @ 8272083
 	fadescreen FADE_FROM_BLACK
 	return
 
-EventScript_RegionMap:: @ 827208F
+EventScript_RegionMap::
 	lockall
 	msgbox Common_Text_LookCloserAtMap, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
@@ -734,12 +734,12 @@ EventScript_RegionMap:: @ 827208F
 	releaseall
 	end
 
-Common_EventScript_PlayBrineysBoatMusic:: @ 82720A0
+Common_EventScript_PlayBrineysBoatMusic::
 	setflag FLAG_DONT_TRANSITION_MUSIC
-	playbgm MUS_SAILING, 0
+	playbgm MUS_SAILING, FALSE
 	return
 
-Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
+Common_EventScript_StopBrineysBoatMusic::
 	clearflag FLAG_DONT_TRANSITION_MUSIC
 	fadedefaultbgm
 	return
@@ -747,13 +747,13 @@ Common_EventScript_StopBrineysBoatMusic:: @ 82720A8
 	.include "data/scripts/prof_birch.inc"
 
 @ Below could be split as ferry.inc aside from the Rusturf tunnel script
-Common_EventScript_FerryDepart:: @ 82721E2
+Common_EventScript_FerryDepart::
 	delay 60
 	applymovement VAR_0x8004, Movement_FerryDepart
 	waitmovement 0
 	return
 
-Movement_FerryDepart: @ 82721F0
+Movement_FerryDepart:
 	walk_slow_right
 	walk_slow_right
 	walk_slow_right
@@ -763,7 +763,7 @@ Movement_FerryDepart: @ 82721F0
 	walk_right
 	step_end
 
-EventScript_HideMrBriney:: @ 82721F8
+EventScript_HideMrBriney::
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
@@ -775,7 +775,7 @@ EventScript_HideMrBriney:: @ 82721F8
 	setvar VAR_BRINEY_LOCATION, 0
 	return
 
-RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
+RusturfTunnel_EventScript_SetRusturfTunnelOpen::
 	removeobject LOCALID_WANDAS_BF
 	removeobject LOCALID_WANDA
 	clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WANDAS_BOYFRIEND
@@ -784,7 +784,7 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen:: @ 8272216
 	setflag FLAG_RUSTURF_TUNNEL_OPENED
 	return
 
-EventScript_UnusedBoardFerry:: @ 827222B
+EventScript_UnusedBoardFerry::
 	delay 30
 	applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
@@ -795,11 +795,11 @@ EventScript_UnusedBoardFerry:: @ 827222B
 	delay 30
 	return
 
-Movement_UnusedBoardFerry: @ 827224E
+Movement_UnusedBoardFerry:
 	walk_up
 	step_end
 
-Common_EventScript_FerryDepartIsland:: @ 8272250
+Common_EventScript_FerryDepartIsland::
 	compare VAR_FACING, DIR_SOUTH
 	call_if_eq Ferry_EventScript_DepartIslandSouth
 	compare VAR_FACING, DIR_WEST
@@ -812,13 +812,13 @@ Common_EventScript_FerryDepartIsland:: @ 8272250
 	.include "data/scripts/cave_of_origin.inc"
 	.include "data/scripts/kecleon.inc"
 
-Common_EventScript_NameReceivedPartyMon:: @ 82723DD
+Common_EventScript_NameReceivedPartyMon::
 	fadescreen FADE_TO_BLACK
 	special ChangePokemonNickname
 	waitstate
 	return
 
-Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
+Common_EventScript_PlayerHandedOverTheItem::
 	bufferitemname 0, VAR_0x8004
 	playfanfare MUS_OBTAIN_TMHM
 	message gText_PlayerHandedOverTheItem
@@ -837,32 +837,32 @@ Common_EventScript_PlayerHandedOverTheItem:: @ 82723E4
 	.include "data/text/obtain_item.inc"
 
 @ The below and surf.inc could be split into some text/notices.inc
-gText_PokemartSign:: @ 8272B6A
+gText_PokemartSign::
 	.string "“Selected items for your convenience!”\n"
 	.string "POKéMON MART$"
 
-gText_PokemonCenterSign:: @ 8272B9E
+gText_PokemonCenterSign::
 	.string "“Rejuvenate your tired partners!”\n"
 	.string "POKéMON CENTER$"
 
-gText_MomOrDadMightLikeThisProgram:: @ 8272BCF
+gText_MomOrDadMightLikeThisProgram::
 	.string "{STR_VAR_1} might like this program.\n"
 	.string "… … … … … … … … … … … … … … … …\p"
 	.string "Better get going!$"
 
-gText_WhichFloorWouldYouLike:: @ 8272C1D
+gText_WhichFloorWouldYouLike::
 	.string "Welcome to LILYCOVE DEPARTMENT STORE.\p"
 	.string "Which floor would you like?$"
 
-gText_SandstormIsVicious:: @ 8272C5F
+gText_SandstormIsVicious::
 	.string "The sandstorm is vicious.\n"
 	.string "It's impossible to keep going.$"
 
-gText_SelectWithoutRegisteredItem:: @ 8272C98
+gText_SelectWithoutRegisteredItem::
 	.string "An item in the BAG can be\n"
 	.string "registered to SELECT for easy use.$"
 
-gText_PokemonTrainerSchoolEmail:: @ 8272CD5
+gText_PokemonTrainerSchoolEmail::
 	.string "There's an e-mail from POKéMON TRAINER\n"
 	.string "SCHOOL.\p"
 	.string "… … … … … …\p"
@@ -871,25 +871,25 @@ gText_PokemonTrainerSchoolEmail:: @ 8272CD5
 	.string "move sets chosen for POKéMON.\p"
 	.string "… … … … … …$"
 
-gText_PlayerHouseBootPC:: @ 8272D87
+gText_PlayerHouseBootPC::
 	.string "{PLAYER} booted up the PC.$"
 
-gText_PokeblockLinkCanceled:: @ 8272D9C
+gText_PokeblockLinkCanceled::
 	.string "The link was canceled.$"
 
-gText_UnusedNicknameReceivedPokemon:: @ 8272DB3
+gText_UnusedNicknameReceivedPokemon::
 	.string "Want to give a nickname to\n"
 	.string "the {STR_VAR_2} you received?$"
 
-gText_PlayerWhitedOut:: @ 8272DE3
+gText_PlayerWhitedOut::
 	.string "{PLAYER} is out of usable\n"
 	.string "POKéMON!\p{PLAYER} whited out!$"
 
-gText_RegisteredTrainerinPokeNav:: @ 8272E0F
+gText_RegisteredTrainerinPokeNav::
 	.string "Registered {STR_VAR_1} {STR_VAR_2}\n"
 	.string "in the POKéNAV.$"
 
-gText_ComeBackWithSecretPower:: @ 8272E30
+gText_ComeBackWithSecretPower::
 	.string "Do you know the TM SECRET POWER?\p"
 	.string "Our group, we love the TM SECRET\n"
 	.string "POWER.\p"
@@ -898,7 +898,7 @@ gText_ComeBackWithSecretPower:: @ 8272E30
 	.string "We'll accept you as a member and sell\n"
 	.string "you good stuff in secrecy.$"
 
-gText_PokerusExplanation:: @ 8272F07
+gText_PokerusExplanation::
 	.string "Your POKéMON may be infected with\n"
 	.string "POKéRUS.\p"
 	.string "Little is known about the POKéRUS\n"
@@ -909,94 +909,94 @@ gText_PokerusExplanation:: @ 8272F07
 
 	.include "data/text/surf.inc"
 
-gText_DoorOpenedFarAway:: @ 827301B
+gText_DoorOpenedFarAway::
 	.string "It sounded as if a door opened\n"
 	.string "somewhere far away.$"
 
-gText_BigHoleInTheWall:: @ 827304E
+gText_BigHoleInTheWall::
 	.string "There is a big hole in the wall.$"
 
-gText_SorryWirelessClubAdjustments:: @ 827306F
+gText_SorryWirelessClubAdjustments::
 	.string "I'm terribly sorry.\n"
 	.string "The POKéMON WIRELESS CLUB is\l"
 	.string "undergoing adjustments now.$"
 
-gText_UndergoingAdjustments:: @ 82730BC
+gText_UndergoingAdjustments::
 	.string "It appears to be undergoing\n"
 	.string "adjustments…$"
 
 @ Unused
-gText_SorryTradeCenterInspections:: @ 82730E5
+gText_SorryTradeCenterInspections::
 	.string "I'm terribly sorry. The TRADE CENTER\n"
 	.string "is undergoing inspections.$"
 
 @ Unused
-gText_SorryRecordCornerPreparation:: @ 8273125
+gText_SorryRecordCornerPreparation::
 	.string "I'm terribly sorry. The RECORD CORNER\n"
 	.string "is under preparation.$"
 
-gText_PlayerHandedOverTheItem:: @ 8273161
+gText_PlayerHandedOverTheItem::
 	.string "{PLAYER} handed over the\n"
 	.string "{STR_VAR_1}.$"
 
-gText_ThankYouForAccessingMysteryGift:: @ 8273178
+gText_ThankYouForAccessingMysteryGift::
 	.string "Thank you for accessing the\n"
 	.string "MYSTERY GIFT System.$"
 
-gText_PlayerFoundOneTMHM:: @ 82731A9
+gText_PlayerFoundOneTMHM::
 	.string "{PLAYER} found one {STR_VAR_1}\n"
 	.string "{STR_VAR_2}!$"
 
-gText_Sudowoodo_Attacked:: @ 82731BD
+gText_Sudowoodo_Attacked::
 	.string "The weird tree doesn't like the\n"
 	.string "WAILMER PAIL!\p"
 	.string "The weird tree attacked!$"
 
-gText_LegendaryFlewAway:: @ 8273204
+gText_LegendaryFlewAway::
 	.string "The {STR_VAR_1} flew away!$"
 
 	.include "data/text/pc_transfer.inc"
 	.include "data/text/mevent.inc"
 	.include "data/text/abnormal_weather.inc"
 
-EventScript_SelectWithoutRegisteredItem:: @ 82736B3
+EventScript_SelectWithoutRegisteredItem::
 	msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
 	end
 
 	.include "data/scripts/field_poison.inc"
 
-Common_EventScript_NopReturn:: @ 827374E
+Common_EventScript_NopReturn::
 	return
 
 @ Unused
-EventScript_CableClub_SetVarResult1:: @ 827374F
+EventScript_CableClub_SetVarResult1::
 	setvar VAR_RESULT, 1
 	return
 
-EventScript_CableClub_SetVarResult0:: @ 8273755
+EventScript_CableClub_SetVarResult0::
 	setvar VAR_RESULT, 0
 	return
 
-Common_EventScript_UnionRoomAttendant:: @ 827375B
+Common_EventScript_UnionRoomAttendant::
 	call CableClub_EventScript_UnionRoomAttendant
 	end
 
-Common_EventScript_WirelessClubAttendant:: @ 8273761
+Common_EventScript_WirelessClubAttendant::
 	call CableClub_EventScript_WirelessClubAttendant
 	end
 
-Common_EventScript_DirectCornerAttendant:: @ 8273767
+Common_EventScript_DirectCornerAttendant::
 	call CableClub_EventScript_DirectCornerAttendant
 	end
 
-Common_EventScript_RemoveStaticPokemon:: @ 827376D
+Common_EventScript_RemoveStaticPokemon::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK
 	release
 	end
 
-Common_EventScript_LegendaryFlewAway:: @ 8273776
+Common_EventScript_LegendaryFlewAway::
 	fadescreenswapbuffers FADE_TO_BLACK
 	removeobject VAR_LAST_TALKED
 	fadescreenswapbuffers FADE_FROM_BLACK

data/field_effect_scripts.s

@@ -4,7 +4,7 @@
 	.section script_data, "aw", %progbits
 
 	.align 2
-gFieldEffectScriptPointers:: @ 82DB9D4
+gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_ExclamationMarkIcon1      @ FLDEFF_EXCLAMATION_MARK_ICON
 	.4byte gFieldEffectScript_UseCutOnTallGrass         @ FLDEFF_USE_CUT_ON_GRASS
 	.4byte gFieldEffectScript_UseCutOnTree              @ FLDEFF_USE_CUT_ON_TREE
@@ -73,273 +73,273 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_DestroyDeoxysRock         @ FLDEFF_DESTROY_DEOXYS_ROCK
 	.4byte gFieldEffectScript_MoveDeoxysRock            @ FLDEFF_MOVE_DEOXYS_ROCK
 
-gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
+gFieldEffectScript_ExclamationMarkIcon1::
 	field_eff_callnative FldEff_ExclamationMarkIcon
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
+gFieldEffectScript_UseCutOnTallGrass::
 	field_eff_callnative FldEff_UseCutOnGrass
 	field_eff_end
 
-gFieldEffectScript_UseCutOnTree:: @ 82DBAEC
+gFieldEffectScript_UseCutOnTree::
 	field_eff_callnative FldEff_UseCutOnTree
 	field_eff_end
 
-gFieldEffectScript_Shadow:: @ 82DBAF2
+gFieldEffectScript_Shadow::
 	field_eff_callnative FldEff_Shadow
 	field_eff_end
 
-gFieldEffectScript_TallGrass:: @ 82DBAF8
+gFieldEffectScript_TallGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_TallGrass
 	field_eff_end
 
-gFieldEffectScript_Ripple:: @ 82DBB02
+gFieldEffectScript_Ripple::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ripple
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMon:: @ 82DBB0C
+gFieldEffectScript_FieldMoveShowMon::
 	field_eff_callnative FldEff_FieldMoveShowMon
 	field_eff_end
 
-gFieldEffectScript_Ash:: @ 82DBB12
+gFieldEffectScript_Ash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_Ash
 	field_eff_end
 
-gFieldEffectScript_SurfBlob:: @ 82DBB1C
+gFieldEffectScript_SurfBlob::
 	field_eff_callnative FldEff_SurfBlob
 	field_eff_end
 
-gFieldEffectScript_UseSurf:: @ 82DBB22
+gFieldEffectScript_UseSurf::
 	field_eff_callnative FldEff_UseSurf
 	field_eff_end
 
-gFieldEffectScript_GroundImpactDust:: @ 82DBB28
+gFieldEffectScript_GroundImpactDust::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Dust
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerCave:: @ 82DBB32
+gFieldEffectScript_UseSecretPowerCave::
 	field_eff_callnative FldEff_UseSecretPowerCave
 	field_eff_end
 
-gFieldEffectScript_JumpTallGrass:: @ 82DBB38
+gFieldEffectScript_JumpTallGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpTallGrass
 	field_eff_end
 
-gFieldEffectScript_SandFootprints:: @ 82DBB42
+gFieldEffectScript_SandFootprints::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandFootprints
 	field_eff_end
 
-gFieldEffectScript_JumpBigSplash:: @ 82DBB4C
+gFieldEffectScript_JumpBigSplash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpBigSplash
 	field_eff_end
 
-gFieldEffectScript_Splash:: @ 82DBB56
+gFieldEffectScript_Splash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Splash
 	field_eff_end
 
-gFieldEffectScript_JumpSmallSplash:: @ 82DBB60
+gFieldEffectScript_JumpSmallSplash::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_JumpSmallSplash
 	field_eff_end
 
-gFieldEffectScript_LongGrass:: @ 82DBB6A
+gFieldEffectScript_LongGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_LongGrass
 	field_eff_end
 
-gFieldEffectScript_JumpLongGrass:: @ 82DBB74
+gFieldEffectScript_JumpLongGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_JumpLongGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass:: @ 82DBB7E
+gFieldEffectScript_UnusedGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass
 	field_eff_end
 
-gFieldEffectScript_UnusedGrass2:: @ 82DBB88
+gFieldEffectScript_UnusedGrass2::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_UnusedGrass2
 	field_eff_end
 
-gFieldEffectScript_UnusedSand:: @ 82DBB92
+gFieldEffectScript_UnusedSand::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_UnusedSand
 	field_eff_end
 
-gFieldEffectScript_WaterSurfacing:: @ 82DBB9C
+gFieldEffectScript_WaterSurfacing::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_WaterSurfacing
 	field_eff_end
 
-gFieldEffectScript_BerryTreeGrowthSparkle:: @ 82DBBA6
+gFieldEffectScript_BerryTreeGrowthSparkle::
 	field_eff_callnative FldEff_BerryTreeGrowthSparkle
 	field_eff_end
 
-gFieldEffectScript_DeepSandFootprints:: @ 82DBBAC
+gFieldEffectScript_DeepSandFootprints::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_DeepSandFootprints
 	field_eff_end
 
-gFieldEffectScript_PokeCenterHeal:: @ 82DBBB6
+gFieldEffectScript_PokeCenterHeal::
 	field_eff_loadfadedpal gSpritePalette_PokeballGlow
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_PokecenterHeal
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerTree:: @ 82DBBC5
+gFieldEffectScript_UseSecretPowerTree::
 	field_eff_callnative FldEff_UseSecretPowerTree
 	field_eff_end
 
-gFieldEffectScript_UseSecretPowerShrub:: @ 82DBBCB
+gFieldEffectScript_UseSecretPowerShrub::
 	field_eff_callnative FldEff_UseSecretPowerShrub
 	field_eff_end
 
-gFieldEffectScript_TreeDisguise:: @ 82DBBD1
+gFieldEffectScript_TreeDisguise::
 	field_eff_callnative ShowTreeDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_MountainDisguise:: @ 82DBBD7
+gFieldEffectScript_MountainDisguise::
 	field_eff_callnative ShowMountainDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_NPCUseFly:: @ 82DBBDD
+gFieldEffectScript_NPCUseFly::
 	field_eff_callnative FldEff_NPCFlyOut
 	field_eff_end
 
-gFieldEffectScript_UseFly:: @ 82DBBE3
+gFieldEffectScript_UseFly::
 	field_eff_callnative FldEff_UseFly
 	field_eff_end
 
-gFieldEffectScript_FlyIn:: @ 82DBBE9
+gFieldEffectScript_FlyIn::
 	field_eff_callnative FldEff_FlyIn
 	field_eff_end
 
-gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF
+gFieldEffectScript_QuestionMarkIcon::
 	field_eff_callnative FldEff_QuestionMarkIcon
 	field_eff_end
 
-gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
+gFieldEffectScript_FeetInFlowingWater::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_FeetInFlowingWater
 	field_eff_end
 
-gFieldEffectScript_BikeTireTracks:: @ 82DBBFF
+gFieldEffectScript_BikeTireTracks::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_BikeTireTracks
 	field_eff_end
 
-gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
+gFieldEffectScript_SandDisguisePlaceholder::
 	field_eff_callnative ShowSandDisguiseFieldEffect
 	field_eff_end
 
-gFieldEffectScript_UseRockSmash:: @ 82DBC0F
+gFieldEffectScript_UseRockSmash::
 	field_eff_callnative FldEff_UseRockSmash
 	field_eff_end
 
-gFieldEffectScript_UseStrength:: @ 82DBC15
+gFieldEffectScript_UseStrength::
 	field_eff_callnative FldEff_UseStrength
 	field_eff_end
 
-gFieldEffectScript_UseDig:: @ 82DBC1B
+gFieldEffectScript_UseDig::
 	field_eff_callnative FldEff_UseDig
 	field_eff_end
 
-gFieldEffectScript_SandPile:: @ 82DBC21
+gFieldEffectScript_SandPile::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_SandPile
 	field_eff_end
 
-gFieldEffectScript_ShortGrass:: @ 82DBC2B
+gFieldEffectScript_ShortGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_ShortGrass
 	field_eff_end
 
-gFieldEffectScript_HotSpringsWater:: @ 82DBC35
+gFieldEffectScript_HotSpringsWater::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect1, FldEff_HotSpringsWater
 	field_eff_end
 
-gFieldEffectScript_UseWaterfall:: @ 82DBC3F
+gFieldEffectScript_UseWaterfall::
 	field_eff_callnative FldEff_UseWaterfall
 	field_eff_end
 
-gFieldEffectScript_UseDive:: @ 82DBC45
+gFieldEffectScript_UseDive::
 	field_eff_callnative FldEff_UseDive
 	field_eff_end
 
-gFieldEffectScript_Pokeball:: @ 82DBC4B
+gFieldEffectScript_Pokeball::
 	field_eff_loadpal gSpritePalette_Pokeball
 	field_eff_callnative FldEff_Pokeball
 	field_eff_end
 
-gFieldEffectScript_HeartIcon:: @ 82DBC56
+gFieldEffectScript_HeartIcon::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_HeartIcon
 	field_eff_end
 
-gFieldEffectScript_Nop47:: @ 82DBC60
+gFieldEffectScript_Nop47::
 	field_eff_callnative FldEff_Nop47
 	field_eff_end
 
-gFieldEffectScript_Nop48:: @ 82DBC66
+gFieldEffectScript_Nop48::
 	field_eff_callnative FldEff_Nop48
 	field_eff_end
 
-gFieldEffectScript_AshPuff:: @ 82DBC6C
+gFieldEffectScript_AshPuff::
 	field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshPuff
 	field_eff_end
 
-gFieldEffectScript_AshLaunch:: @ 82DBC76
+gFieldEffectScript_AshLaunch::
 	field_eff_loadfadedpal_callnative gSpritePalette_Ash, FldEff_AshLaunch
 	field_eff_end
 
-gFieldEffectScript_SweetScent:: @ 82DBC80
+gFieldEffectScript_SweetScent::
 	field_eff_callnative FldEff_SweetScent
 	field_eff_end
 
-gFieldEffectScript_SandPillar:: @ 82DBC86
+gFieldEffectScript_SandPillar::
 	field_eff_loadfadedpal_callnative gSpritePalette_SandPillar, FldEff_SandPillar
 	field_eff_end
 
-gFieldEffectScript_Bubbles:: @ 82DBC90
+gFieldEffectScript_Bubbles::
 	field_eff_loadfadedpal_callnative gSpritePalette_GeneralFieldEffect0, FldEff_Bubbles
 	field_eff_end
 
-gFieldEffectScript_Sparkle:: @ 82DBC9A
+gFieldEffectScript_Sparkle::
 	field_eff_loadfadedpal_callnative gSpritePalette_SmallSparkle, FldEff_Sparkle
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerCave:: @ 82DBCA4
+gFieldEffectScript_ShowSecretPowerCave::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Cave, FldEff_SecretPowerCave
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerTree:: @ 82DBCAE
+gFieldEffectScript_ShowSecretPowerTree::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerTree
 	field_eff_end
 
-gFieldEffectScript_ShowSecretPowerShrub:: @ 82DBCB8
+gFieldEffectScript_ShowSecretPowerShrub::
 	field_eff_loadfadedpal_callnative gSpritePalette_SecretPower_Plant, FldEff_SecretPowerShrub
 	field_eff_end
 
-gFieldEffectScript_ShowCutGrass:: @ 82DBCC2
+gFieldEffectScript_ShowCutGrass::
 	field_eff_loadfadedpal_callnative gSpritePalette_CutGrass, FldEff_CutGrass
 	field_eff_end
 
-gFieldEffectScript_FieldMoveShowMonInit:: @ 82DBCCC
+gFieldEffectScript_FieldMoveShowMonInit::
 	field_eff_callnative FldEff_FieldMoveShowMonInit
 	field_eff_end
 
-gFieldEffectScript_UsePuzzleEffect:: @ 82DBCD2
+gFieldEffectScript_UsePuzzleEffect::
 	field_eff_callnative FldEff_UsePuzzleEffect
 	field_eff_end
 
-gFieldEffectScript_SecretBaseBootPC:: @ 82DBCD8
+gFieldEffectScript_SecretBaseBootPC::
 	field_eff_callnative FldEff_SecretBasePCTurnOn
 	field_eff_end
 
-gFieldEffectScript_HallOfFameRecord:: @ 82DBCDE
+gFieldEffectScript_HallOfFameRecord::
 	field_eff_loadfadedpal gSpritePalette_PokeballGlow
 	field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor, FldEff_HallOfFameRecord
 	field_eff_end
 
-gFieldEffectScript_UseTeleport:: @ 82DBCED
+gFieldEffectScript_UseTeleport::
 	field_eff_callnative FldEff_UseTeleport
 	field_eff_end
 
-gFieldEffectScript_RayquazaSpotlight:: @ 82DBCF3
+gFieldEffectScript_RayquazaSpotlight::
 	field_eff_callnative FldEff_RayquazaSpotlight
 	field_eff_end
 
-gFieldEffectScript_DestroyDeoxysRock:: @ 82DBCF9
+gFieldEffectScript_DestroyDeoxysRock::
 	field_eff_callnative FldEff_DestroyDeoxysRock
 	field_eff_end
 
-gFieldEffectScript_MoveDeoxysRock:: @ 82DBCFF
+gFieldEffectScript_MoveDeoxysRock::
 	field_eff_callnative FldEff_MoveDeoxysRock
 	field_eff_end

data/fonts.s

@@ -4,73 +4,73 @@
 	.section .rodata
 
 	.align 2
-gFont8LatinGlyphs:: @ 862BAE4
+gFont8LatinGlyphs::
 	.incbin "graphics/fonts/font8.latfont"
 
 	.align 2
-gFont8LatinGlyphWidths:: @ 8633AE4
+gFont8LatinGlyphWidths::
 	.include "graphics/fonts/font8_latin_widths.inc"
 
 	.align 2
-gFont0LatinGlyphs:: @ 8633CE4
+gFont0LatinGlyphs::
 	.incbin "graphics/fonts/font0.latfont"
 
 	.align 2
-gFont0LatinGlyphWidths:: @ 863BCE4
+gFont0LatinGlyphWidths::
 	.include "graphics/fonts/font0_latin_widths.inc"
 
 	.align 2
-gFont7LatinGlyphs:: @ 863BEE4
+gFont7LatinGlyphs::
 	.incbin "graphics/fonts/font7.latfont"
 
 	.align 2
-gFont7LatinGlyphWidths:: @ 8643EE4
+gFont7LatinGlyphWidths::
 	.include "graphics/fonts/font7_latin_widths.inc"
 
 	.align 2
-gFont2LatinGlyphs:: @ 86440E4
+gFont2LatinGlyphs::
 	.incbin "graphics/fonts/font2.latfont"
 
 	.align 2
-gFont2LatinGlyphWidths:: @ 864C0E4
+gFont2LatinGlyphWidths::
 	.include "graphics/fonts/font2_latin_widths.inc"
 
 	.align 2
-gFont1LatinGlyphs:: @ 864C2E4
+gFont1LatinGlyphs::
 	.incbin "graphics/fonts/font1.latfont"
 
 	.align 2
-gFont1LatinGlyphWidths:: @ 86542E4
+gFont1LatinGlyphWidths::
 	.include "graphics/fonts/font1_latin_widths.inc"
 
 	.align 2
-gFont0JapaneseGlyphs:: @ 86544E4
+gFont0JapaneseGlyphs::
 	.incbin "graphics/fonts/font0.hwjpnfont"
 
 	.align 2
-gFont1JapaneseGlyphs:: @ 86584E4
+gFont1JapaneseGlyphs::
 	.incbin "graphics/fonts/font1.hwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs:: @ 865C4E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs::
 	.incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths:: @ 86644E4
+gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths::
 	.include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs:: @ 86646E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs::
 	.incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
 
 	.align 2
-gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths:: @ 866C6E4
+gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths::
 	.include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
 
 	.align 2
-gFont2JapaneseGlyphs:: @ 866C8E4
+gFont2JapaneseGlyphs::
 	.incbin "graphics/fonts/font2.fwjpnfont"
 
 	.align 2
-gFont2JapaneseGlyphWidths:: @ 86748E4
+gFont2JapaneseGlyphWidths::
 	.include "graphics/fonts/font2_japanese_widths.inc"

data/maps/AbandonedShip_CaptainsOffice/scripts.inc

@@ -1,7 +1,7 @@
-AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1
+AbandonedShip_CaptainsOffice_MapScripts::
 	.byte 0
 
-AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
+AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
 	lock
 	faceplayer
 	goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
@@ -13,30 +13,30 @@ AbandonedShip_CaptainsOffice_EventScript_CaptSternAide:: @ 82387E2
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner:: @ 8238810
+AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner::
 	msgbox AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus:: @ 823881A
+AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus::
 	msgbox AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus, MSGBOX_DEFAULT
 	release
 	end
 
-AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner: @ 8238824
+AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner:
 	.string "I'm investigating this ship on behalf\n"
 	.string "of CAPT. STERN.\p"
 	.string "He also asked me to find a SCANNER,\n"
 	.string "but I haven't had any success…$"
 
-AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner: @ 823889D
+AbandonedShip_CaptainsOffice_Text_OhCanYouDeliverScanner:
 	.string "Oh! That's a SCANNER!\p"
 	.string "Listen, can I get you to deliver that\n"
 	.string "to CAPT. STERN?\p"
 	.string "I want to investigate this ship a\n"
 	.string "little more.$"
 
-AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus: @ 8238918
+AbandonedShip_CaptainsOffice_Text_ThisIsSSCactus:
 	.string "This ship is called S.S. CACTUS.\n"
 	.string "It seems to be from an earlier era.$"
 

data/maps/AbandonedShip_Corridors_1F/scripts.inc

@@ -1,26 +1,26 @@
-AbandonedShip_Corridors_1F_MapScripts:: @ 82379A4
+AbandonedShip_Corridors_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Corridors_1F_EventScript_Youngster:: @ 82379A5
+AbandonedShip_Corridors_1F_EventScript_Youngster::
 	msgbox AbandonedShip_Corridors_1F_Text_IsntItFunHere, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_1F_EventScript_Charlie:: @ 82379AE
+AbandonedShip_Corridors_1F_EventScript_Charlie::
 	trainerbattle_single TRAINER_CHARLIE, AbandonedShip_Corridors_1F_Text_CharlieIntro, AbandonedShip_Corridors_1F_Text_CharlieDefeat
 	msgbox AbandonedShip_Corridors_1F_Text_CharliePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_1F_Text_CharlieIntro: @ 82379C5
+AbandonedShip_Corridors_1F_Text_CharlieIntro:
 	.string "What's so funny about having my inner\n"
 	.string "tube aboard the ship?$"
 
-AbandonedShip_Corridors_1F_Text_CharlieDefeat: @ 8237A01
+AbandonedShip_Corridors_1F_Text_CharlieDefeat:
 	.string "Whoa, you overwhelmed me!$"
 
-AbandonedShip_Corridors_1F_Text_CharliePostBattle: @ 8237A1B
+AbandonedShip_Corridors_1F_Text_CharliePostBattle:
 	.string "It's not easy throwing POKé BALLS\n"
 	.string "while hanging on to an inner tube!$"
 
-AbandonedShip_Corridors_1F_Text_IsntItFunHere: @ 8237A60
+AbandonedShip_Corridors_1F_Text_IsntItFunHere:
 	.string "Isn't it fun here?\n"
 	.string "I get excited just being here!$"

data/maps/AbandonedShip_Corridors_B1F/scripts.inc

@@ -1,30 +1,30 @@
-AbandonedShip_Corridors_B1F_MapScripts:: @ 8237D84
+AbandonedShip_Corridors_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Corridors_B1F_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_Corridors_B1F_OnLoad
 	.byte 0
 
-AbandonedShip_Corridors_B1F_OnResume: @ 8237D8F
+AbandonedShip_Corridors_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_Corridors_B1F_OnLoad: @ 8237D98
+AbandonedShip_Corridors_B1F_OnLoad:
 	call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom
 	call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: @ 8237DAB
+AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom::
 	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: @ 8237DB5
+AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom::
 	setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_Corridors_B1F_EventScript_TuberM:: @ 8237DBF
+AbandonedShip_Corridors_B1F_EventScript_TuberM::
 	msgbox AbandonedShip_Corridors_B1F_Text_YayItsAShip, MSGBOX_NPC
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
+AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor::
 	lockall
 	goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
 	checkitem ITEM_STORAGE_KEY, 1
@@ -39,49 +39,49 @@ AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: @ 8237DC8
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked:: @ 8237DFF
+AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked::
 	msgbox AbandonedShip_Corridors_B1F_Text_DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked:: @ 8237E09
+AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked::
 	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_Corridors_B1F_EventScript_Duncan:: @ 8237E13
+AbandonedShip_Corridors_B1F_EventScript_Duncan::
 	trainerbattle_single TRAINER_DUNCAN, AbandonedShip_Corridors_B1F_Text_DuncanIntro, AbandonedShip_Corridors_B1F_Text_DuncanDefeat
 	msgbox AbandonedShip_Corridors_B1F_Text_DuncanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Corridors_B1F_Text_DuncanIntro: @ 8237E2A
+AbandonedShip_Corridors_B1F_Text_DuncanIntro:
 	.string "When we go out to sea, we SAILORS\n"
 	.string "always bring our POKéMON.\l"
 	.string "How about a quick battle?$"
 
-AbandonedShip_Corridors_B1F_Text_DuncanDefeat: @ 8237E80
+AbandonedShip_Corridors_B1F_Text_DuncanDefeat:
 	.string "Whoops, I'm sunk!$"
 
-AbandonedShip_Corridors_B1F_Text_DuncanPostBattle: @ 8237E92
+AbandonedShip_Corridors_B1F_Text_DuncanPostBattle:
 	.string "The ship's bottom has sunk into the\n"
 	.string "depths.\p"
 	.string "If a POKéMON knew how to go underwater,\n"
 	.string "we might make some progress…$"
 
-AbandonedShip_Corridors_B1F_Text_YayItsAShip: @ 8237F03
+AbandonedShip_Corridors_B1F_Text_YayItsAShip:
 	.string "Yay!\n"
 	.string "It's a ship!$"
 
-AbandonedShip_Corridors_B1F_Text_DoorIsLocked: @ 8237F15
+AbandonedShip_Corridors_B1F_Text_DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“STORAGE” is painted on the door.$"
 
-AbandonedShip_Corridors_B1F_Text_InsertedStorageKey: @ 8237F4B
+AbandonedShip_Corridors_B1F_Text_InsertedStorageKey:
 	.string "{PLAYER} inserted and turned the\n"
 	.string "STORAGE KEY.\p"
 	.string "The inserted KEY stuck fast,\n"
 	.string "but the door opened.$"
 
-AbandonedShip_Text_TheDoorIsOpen: @ 8237FA5
+AbandonedShip_Text_TheDoorIsOpen:
 	.string "The door is open.$"
 

data/maps/AbandonedShip_Deck/scripts.inc

@@ -1,8 +1,8 @@
-AbandonedShip_Deck_MapScripts:: @ 823799A
+AbandonedShip_Deck_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AbandonedShip_Deck_OnTransition
 	.byte 0
 
-AbandonedShip_Deck_OnTransition: @ 82379A0
+AbandonedShip_Deck_OnTransition:
 	setflag FLAG_LANDMARK_ABANDONED_SHIP
 	end
 

data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc

@@ -1,13 +1,13 @@
-AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 823896C
+AbandonedShip_HiddenFloorCorridors_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_HiddenFloorCorridors_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AbandonedShip_HiddenFloorCorridors_OnLoad
 	.byte 0
 
-AbandonedShip_HiddenFloorCorridors_OnResume: @ 8238977
+AbandonedShip_HiddenFloorCorridors_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4
 	end
 
-AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
+AbandonedShip_HiddenFloorCorridors_OnLoad:
 	call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1
 	call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2
 	call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4
@@ -18,39 +18,39 @@ AbandonedShip_HiddenFloorCorridors_OnLoad: @ 8238980
 	call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: @ 82389C9
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1::
 	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: @ 82389D3
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2::
 	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: @ 82389DD
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4::
 	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: @ 82389E7
+AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6::
 	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: @ 82389F1
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1::
 	setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: @ 82389FB
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2::
 	setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: @ 8238A05
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4::
 	setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: @ 8238A0F
+AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6::
 	setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0
 	return
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
+AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_1_KEY, 1
@@ -65,7 +65,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: @ 8238A19
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
+AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_2_KEY, 1
@@ -80,7 +80,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: @ 8238A50
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
+AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_4_KEY, 1
@@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: @ 8238A87
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
+AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door::
 	lockall
 	goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
 	checkitem ITEM_ROOM_6_KEY, 1
@@ -110,48 +110,48 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: @ 8238ABE
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked:: @ 8238AF5
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked:: @ 8238AFF
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked:: @ 8238B09
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked:: @ 8238B13
+AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked::
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen:: @ 8238B1D
+AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen::
 	msgbox AbandonedShip_Text_TheDoorIsOpen, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked: @ 8238B27
+AbandonedShip_HiddenFloorCorridors_Text_Rm1DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 1” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked: @ 8238B5B
+AbandonedShip_HiddenFloorCorridors_Text_Rm2DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 2” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked: @ 8238B8F
+AbandonedShip_HiddenFloorCorridors_Text_Rm4DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 4” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked: @ 8238BC3
+AbandonedShip_HiddenFloorCorridors_Text_Rm6DoorIsLocked:
 	.string "The door is locked.\p"
 	.string "“RM. 6” is painted on the door.$"
 
-AbandonedShip_HiddenFloorCorridors_Text_InsertedKey: @ 8238BF7
+AbandonedShip_HiddenFloorCorridors_Text_InsertedKey:
 	.string "{PLAYER} inserted and turned the\n"
 	.string "KEY.\p"
 	.string "The inserted KEY stuck fast,\n"

data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc

@@ -1,8 +1,8 @@
-AbandonedShip_HiddenFloorRooms_MapScripts:: @ 8238C49
+AbandonedShip_HiddenFloorRooms_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, AbandonedShip_HiddenFloorRooms_OnFrame
 	.byte 0
 
-AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
+AbandonedShip_HiddenFloorRooms_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle
 	.2byte 0
 
@@ -13,7 +13,7 @@ AbandonedShip_HiddenFloorRooms_OnFrame: @ 8238C4F
 @ Upper row,  left column   (Rm 4)
 @ Upper row,  middle column (Rm 5)
 @ Upper row,  right column  (Rm 6)
-AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
+AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle::
 	setvar VAR_TEMP_1, 1
 	getplayerxy VAR_TEMP_2, VAR_TEMP_3
 	setvar VAR_TEMP_4, 1
@@ -32,19 +32,19 @@ AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle:: @ 8238C59
 	case 6, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn:: @ 8238CD1
+AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn::
 	addvar VAR_TEMP_4, 1
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn:: @ 8238CD7
+AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn::
 	addvar VAR_TEMP_4, 2
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow:: @ 8238CDD
+AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow::
 	addvar VAR_TEMP_4, 3
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1::
 	delay 20
 	dofieldeffectsparkle 10, 10, 0
 	specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
@@ -54,10 +54,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1:: @ 8238CE3
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2:: @ 8238D0C
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3::
 	specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
 	compare VAR_RESULT, TRUE
 	goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
@@ -68,10 +68,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: @ 8238D0D
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle:: @ 8238D32
+AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4::
 	delay 20
 	dofieldeffectsparkle 8, 5, 0
 	dofieldeffectsparkle 11, 3, 0
@@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4:: @ 8238D33
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5::
 	delay 20
 	dofieldeffectsparkle 16, 3, 0
 	dofieldeffectsparkle 25, 2, 0
@@ -94,32 +94,32 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5:: @ 8238D6B
 	delay 10
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6:: @ 8238DB2
+AbandonedShip_HiddenFloorRooms_EventScript_EnterRm6::
 	end
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle:: @ 8238DB3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle::
 	dofieldeffectsparkle 42, 10, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle:: @ 8238DC3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle::
 	dofieldeffectsparkle 20, 5, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle:: @ 8238DD3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle::
 	dofieldeffectsparkle 1, 12, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle:: @ 8238DE3
+AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle::
 	dofieldeffectsparkle 1, 2, 0
 	return
 
-AbandonedShip_HiddenFloorRooms_EventScript_Trash:: @ 8238DF3
+AbandonedShip_HiddenFloorRooms_EventScript_Trash::
 	lockall
 	msgbox AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash: @ 8238DFE
+AbandonedShip_HiddenFloorRooms_Text_BrightShinyTrash:
 	.string "It's bright and shiny!\n"
 	.string "But it's just trash…$"
 

data/maps/AbandonedShip_Room_B1F/scripts.inc

@@ -1,3 +1,3 @@
-AbandonedShip_Room_B1F_MapScripts:: @ 82380A5
+AbandonedShip_Room_B1F_MapScripts::
 	.byte 0
 

data/maps/AbandonedShip_Rooms2_1F/scripts.inc

@@ -1,7 +1,7 @@
-AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
+AbandonedShip_Rooms2_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
+AbandonedShip_Rooms2_1F_EventScript_Dan::
 	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -10,18 +10,18 @@ AbandonedShip_Rooms2_1F_EventScript_Dan:: @ 82380A7
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_RegisterDan:: @ 82380D7
+AbandonedShip_Rooms2_1F_EventScript_RegisterDan::
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT  @ Kira speaks for both when registering KiraAndDan
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_DanRematch:: @ 82380F0
+AbandonedShip_Rooms2_1F_EventScript_DanRematch::
 	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanRematchIntro, AbandonedShip_Rooms2_1F_Text_DanRematchDefeat, AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons
 	msgbox AbandonedShip_Rooms2_1F_Text_DanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
+AbandonedShip_Rooms2_1F_EventScript_Kira::
 	trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -30,122 +30,122 @@ AbandonedShip_Rooms2_1F_EventScript_Kira:: @ 823810B
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_RegisterKira:: @ 823813B
+AbandonedShip_Rooms2_1F_EventScript_RegisterKira::
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KIRA_AND_DAN_1
 	release
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_KiraRematch:: @ 8238154
+AbandonedShip_Rooms2_1F_EventScript_KiraRematch::
 	trainerbattle_rematch_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraRematchIntro, AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat, AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons
 	msgbox AbandonedShip_Rooms2_1F_Text_KiraPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Jani:: @ 823816F
+AbandonedShip_Rooms2_1F_EventScript_Jani::
 	trainerbattle_single TRAINER_JANI, AbandonedShip_Rooms2_1F_Text_JaniIntro, AbandonedShip_Rooms2_1F_Text_JaniDefeat
 	msgbox AbandonedShip_Rooms2_1F_Text_JaniPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_EventScript_Garrison:: @ 8238186
+AbandonedShip_Rooms2_1F_EventScript_Garrison::
 	trainerbattle_single TRAINER_GARRISON, AbandonedShip_Rooms2_1F_Text_GarrisonIntro, AbandonedShip_Rooms2_1F_Text_GarrisonDefeat
 	msgbox AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms2_1F_Text_DanIntro: @ 823819D
+AbandonedShip_Rooms2_1F_Text_DanIntro:
 	.string "DAN: While searching for treasures,\n"
 	.string "we discovered a TRAINER!$"
 
-AbandonedShip_Rooms2_1F_Text_DanDefeat: @ 82381DA
+AbandonedShip_Rooms2_1F_Text_DanDefeat:
 	.string "DAN: We couldn't win even though\n"
 	.string "we worked together…$"
 
-AbandonedShip_Rooms2_1F_Text_DanPostBattle: @ 823820F
+AbandonedShip_Rooms2_1F_Text_DanPostBattle:
 	.string "DAN: We can't find any treasures…\n"
 	.string "I wonder if someone got them already?$"
 
-AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons: @ 8238257
+AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons:
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_KiraIntro: @ 82382A4
+AbandonedShip_Rooms2_1F_Text_KiraIntro:
 	.string "KIRA: Oh?\n"
 	.string "We were searching for treasures.\l"
 	.string "But we discovered a TRAINER instead!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraDefeat: @ 82382F4
+AbandonedShip_Rooms2_1F_Text_KiraDefeat:
 	.string "KIRA: Ooh, so strong!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraPostBattle: @ 823830A
+AbandonedShip_Rooms2_1F_Text_KiraPostBattle:
 	.string "KIRA: Where could the treasures be?\p"
 	.string "I've already decided what I'm buying\n"
 	.string "when we find the treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons: @ 823836F
+AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons:
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRegister: @ 82383BB
+AbandonedShip_Rooms2_1F_Text_KiraRegister:
 	.string "KIRA: Oh, you make me so angry!\n"
 	.string "I'm going to register you for that!$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchIntro: @ 82383FF
+AbandonedShip_Rooms2_1F_Text_DanRematchIntro:
 	.string "DAN: We've been searching for\n"
 	.string "treasures all this time.\p"
 	.string "Our POKéMON have grown stronger, too.\n"
 	.string "Let us show you, okay?$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchDefeat: @ 8238473
+AbandonedShip_Rooms2_1F_Text_DanRematchDefeat:
 	.string "DAN: You're strong, as usual!$"
 
-AbandonedShip_Rooms2_1F_Text_DanPostRematch: @ 8238491
+AbandonedShip_Rooms2_1F_Text_DanPostRematch:
 	.string "DAN: We can't find any treasures,\n"
 	.string "we lose at POKéMON…\p"
 	.string "I want to go home… But if I say that,\n"
 	.string "she gets all angry with me…$"
 
-AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons: @ 8238509
+AbandonedShip_Rooms2_1F_Text_DanRematchNotEnoughMons:
 	.string "DAN: You don't even have two POKéMON.\n"
 	.string "You can't expect to beat us like that.$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchIntro: @ 8238556
+AbandonedShip_Rooms2_1F_Text_KiraRematchIntro:
 	.string "KIRA: Oh? We meet again!\p"
 	.string "Just like us, you still haven't given up\n"
 	.string "searching for treasures, have you?\p"
 	.string "Want to make it so the loser has\n"
 	.string "to give up searching?$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat: @ 82385F2
+AbandonedShip_Rooms2_1F_Text_KiraRematchDefeat:
 	.string "KIRA: Oh, we lost again…$"
 
-AbandonedShip_Rooms2_1F_Text_KiraPostRematch: @ 823860B
+AbandonedShip_Rooms2_1F_Text_KiraPostRematch:
 	.string "KIRA: We're not leaving until we raise\n"
 	.string "our POKéMON some more and we find\l"
 	.string "the treasures here!$"
 
-AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons: @ 8238668
+AbandonedShip_Rooms2_1F_Text_KiraRematchNotEnoughMons:
 	.string "KIRA: Oh, you don't have two POKéMON?\n"
 	.string "We'll have to battle some other time!$"
 
-AbandonedShip_Rooms2_1F_Text_JaniIntro: @ 82386B4
+AbandonedShip_Rooms2_1F_Text_JaniIntro:
 	.string "I'm not good at swimming,\n"
 	.string "but I am good at battles!$"
 
-AbandonedShip_Rooms2_1F_Text_JaniDefeat: @ 82386E8
+AbandonedShip_Rooms2_1F_Text_JaniDefeat:
 	.string "Oops.\n"
 	.string "That didn't go very well.$"
 
-AbandonedShip_Rooms2_1F_Text_JaniPostBattle: @ 8238708
+AbandonedShip_Rooms2_1F_Text_JaniPostBattle:
 	.string "Walking around barefoot in this ship\n"
 	.string "is kind of gross.$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonIntro: @ 823873F
+AbandonedShip_Rooms2_1F_Text_GarrisonIntro:
 	.string "Strength and compassion…\n"
 	.string "Those are a TRAINER's treasures!$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonDefeat: @ 8238779
+AbandonedShip_Rooms2_1F_Text_GarrisonDefeat:
 	.string "Ah, there is something about you\n"
 	.string "that sparkles.$"
 
-AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle: @ 82387A9
+AbandonedShip_Rooms2_1F_Text_GarrisonPostBattle:
 	.string "In a cabin somewhere on board,\n"
 	.string "I saw something sparkle.$"

data/maps/AbandonedShip_Rooms2_B1F/scripts.inc

@@ -1,11 +1,11 @@
-AbandonedShip_Rooms2_B1F_MapScripts:: @ 8238024
+AbandonedShip_Rooms2_B1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms2_B1F_EventScript_Camper:: @ 8238025
+AbandonedShip_Rooms2_B1F_EventScript_Camper::
 	msgbox AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring: @ 823802E
+AbandonedShip_Rooms2_B1F_Text_PerfectPlaceToGoExploring:
 	.string "This is a perfect place to go exploring!\n"
 	.string "It's exciting here!\p"
 	.string "I bet there're amazing treasures on\n"

data/maps/AbandonedShip_Rooms_1F/scripts.inc

@@ -1,16 +1,16 @@
-AbandonedShip_Rooms_1F_MapScripts:: @ 8237A92
+AbandonedShip_Rooms_1F_MapScripts::
 	.byte 0
 
-AbandonedShip_Rooms_1F_EventScript_Gentleman:: @ 8237A93
+AbandonedShip_Rooms_1F_EventScript_Gentleman::
 	msgbox AbandonedShip_Rooms_1F_Text_TakingALookAround, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_1F_EventScript_Demetrius:: @ 8237A9C
+AbandonedShip_Rooms_1F_EventScript_Demetrius::
 	trainerbattle_single TRAINER_DEMETRIUS, AbandonedShip_Rooms_1F_Text_DemetriusIntro, AbandonedShip_Rooms_1F_Text_DemetriusDefeat
 	msgbox AbandonedShip_Rooms_1F_Text_DemetriusPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
+AbandonedShip_Rooms_1F_EventScript_Thalia::
 	trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
 	compare VAR_RESULT, TRUE
@@ -19,7 +19,7 @@ AbandonedShip_Rooms_1F_EventScript_Thalia:: @ 8237AB3
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
+AbandonedShip_Rooms_1F_EventScript_RegisterThalia::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox AbandonedShip_Rooms_1F_Text_ThaliaRegister, MSGBOX_DEFAULT
@@ -27,52 +27,52 @@ AbandonedShip_Rooms_1F_EventScript_RegisterThalia:: @ 8237ADF
 	release
 	end
 
-AbandonedShip_Rooms_1F_EventScript_ThaliaRematch:: @ 8237AFE
+AbandonedShip_Rooms_1F_EventScript_ThaliaRematch::
 	trainerbattle_rematch TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro, AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat
 	msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-AbandonedShip_Rooms_1F_Text_TakingALookAround: @ 8237B15
+AbandonedShip_Rooms_1F_Text_TakingALookAround:
 	.string "Ships of this sort are rare, so I'm\n"
 	.string "taking a look around.\p"
 	.string "Hmhm…\n"
 	.string "There appear to be other cabins…$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaIntro: @ 8237B76
+AbandonedShip_Rooms_1F_Text_ThaliaIntro:
 	.string "What on earth would compel you to\n"
 	.string "come here? You must be curious!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaDefeat: @ 8237BB8
+AbandonedShip_Rooms_1F_Text_ThaliaDefeat:
 	.string "Not just curious, but also strong…$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaPostBattle: @ 8237BDB
+AbandonedShip_Rooms_1F_Text_ThaliaPostBattle:
 	.string "The man next door…\p"
 	.string "He says he's just sightseeing,\n"
 	.string "but I don't know about that.$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRegister: @ 8237C2A
+AbandonedShip_Rooms_1F_Text_ThaliaRegister:
 	.string "You're such a tough TRAINER!\n"
 	.string "Let me register you as a memento!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro: @ 8237C69
+AbandonedShip_Rooms_1F_Text_ThaliaRematchIntro:
 	.string "What on earth would compel you to\n"
 	.string "come back? You must really be curious!$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat: @ 8237CB2
+AbandonedShip_Rooms_1F_Text_ThaliaRematchDefeat:
 	.string "Aren't you too strong?$"
 
-AbandonedShip_Rooms_1F_Text_ThaliaPostRematch: @ 8237CC9
+AbandonedShip_Rooms_1F_Text_ThaliaPostRematch:
 	.string "I'm sure that man's up to something!\n"
 	.string "He just acts so suspiciously!$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusIntro: @ 8237D0C
+AbandonedShip_Rooms_1F_Text_DemetriusIntro:
 	.string "Waaah!\n"
 	.string "I've been found! …Huh?$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusDefeat: @ 8237D2A
+AbandonedShip_Rooms_1F_Text_DemetriusDefeat:
 	.string "Oh, you're not my mom.$"
 
-AbandonedShip_Rooms_1F_Text_DemetriusPostBattle: @ 8237D41
+AbandonedShip_Rooms_1F_Text_DemetriusPostBattle:
 	.string "I'm in trouble with my mom, so I ran.\n"
 	.string "Keep it a secret where I am!$"
 

data/maps/AbandonedShip_Rooms_B1F/scripts.inc

@@ -1,16 +1,16 @@
-AbandonedShip_Rooms_B1F_MapScripts:: @ 8237FB7
+AbandonedShip_Rooms_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Rooms_B1F_OnResume
 	.byte 0
 
-AbandonedShip_Rooms_B1F_OnResume: @ 8237FBD
+AbandonedShip_Rooms_B1F_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4
 	end
 
-AbandonedShip_Rooms_B1F_EventScript_FatMan:: @ 8237FC6
+AbandonedShip_Rooms_B1F_EventScript_FatMan::
 	msgbox AbandonedShip_Rooms_B1F_Text_GettingQueasy, MSGBOX_NPC
 	end
 
-AbandonedShip_Rooms_B1F_Text_GettingQueasy: @ 8237FCF
+AbandonedShip_Rooms_B1F_Text_GettingQueasy:
 	.string "Urrrrppp…\p"
 	.string "I'm getting queasy just being aboard\n"
 	.string "this ship…\p"

data/maps/AbandonedShip_Underwater1/scripts.inc

@@ -1,8 +1,8 @@
-AbandonedShip_Underwater1_MapScripts:: @ 8238096
+AbandonedShip_Underwater1_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater1_OnResume
 	.byte 0
 
-AbandonedShip_Underwater1_OnResume: @ 823809C
+AbandonedShip_Underwater1_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10
 	end
 

data/maps/AbandonedShip_Underwater2/scripts.inc

@@ -1,8 +1,8 @@
-AbandonedShip_Underwater2_MapScripts:: @ 823895D
+AbandonedShip_Underwater2_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AbandonedShip_Underwater2_OnResume
 	.byte 0
 
-AbandonedShip_Underwater2_OnResume: @ 8238963
+AbandonedShip_Underwater2_OnResume:
 	setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7
 	end
 

data/maps/AlteringCave/scripts.inc

@@ -1,8 +1,8 @@
-AlteringCave_MapScripts:: @ 823B177
+AlteringCave_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AlteringCave_OnTransition
 	.byte 0
 
-AlteringCave_OnTransition: @ 823B17D
+AlteringCave_OnTransition:
 	setflag FLAG_LANDMARK_ALTERING_CAVE
 	end
 

data/maps/AncientTomb/scripts.inc

@@ -1,34 +1,34 @@
-AncientTomb_MapScripts:: @ 8238FB3
+AncientTomb_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AncientTomb_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, AncientTomb_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, AncientTomb_OnTransition
 	.byte 0
 
-AncientTomb_OnResume: @ 8238FC3
+AncientTomb_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_TryRemoveRegisteel
 	end
 
-AncientTomb_EventScript_TryRemoveRegisteel:: @ 8238FCD
+AncientTomb_EventScript_TryRemoveRegisteel::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-AncientTomb_OnTransition: @ 8238FE1
+AncientTomb_OnTransition:
 	setflag FLAG_LANDMARK_ANCIENT_TOMB
 	call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_ShowRegisteel
 	end
 
-AncientTomb_EventScript_ShowRegisteel:: @ 8238FEE
+AncientTomb_EventScript_ShowRegisteel::
 	clearflag FLAG_HIDE_REGISTEEL
 	return
 
-AncientTomb_OnLoad: @ 8238FF2
+AncientTomb_OnLoad:
 	call_if_unset FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_HideRegiEntrance
 	end
 
-AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
+AncientTomb_EventScript_HideRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -37,7 +37,7 @@ AncientTomb_EventScript_HideRegiEntrance:: @ 8238FFC
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
+AncientTomb_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
 	braillemessage AncientTomb_Braille_ShineInTheMiddle
@@ -46,12 +46,12 @@ AncientTomb_EventScript_CaveEntranceMiddle:: @ 8239033
 	releaseall
 	end
 
-AncientTomb_EventScript_BigHoleInWall:: @ 8239046
+AncientTomb_EventScript_BigHoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
+AncientTomb_EventScript_CaveEntranceSide::
 	lockall
 	braillemessage AncientTomb_Braille_ShineInTheMiddle
 	waitbuttonpress
@@ -59,7 +59,7 @@ AncientTomb_EventScript_CaveEntranceSide:: @ 8239050
 	releaseall
 	end
 
-AncientTomb_EventScript_Registeel:: @ 823905A
+AncientTomb_EventScript_Registeel::
 	lock
 	faceplayer
 	waitse
@@ -82,12 +82,12 @@ AncientTomb_EventScript_Registeel:: @ 823905A
 	release
 	end
 
-AncientTomb_EventScript_DefeatedRegisteel:: @ 82390A1
+AncientTomb_EventScript_DefeatedRegisteel::
 	setflag FLAG_DEFEATED_REGISTEEL
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AncientTomb_EventScript_RanFromRegisteel:: @ 82390AA
+AncientTomb_EventScript_RanFromRegisteel::
 	setvar VAR_0x8004, SPECIES_REGISTEEL
 	goto Common_EventScript_LegendaryFlewAway
 	end

data/maps/AquaHideout_1F/scripts.inc

@@ -1,8 +1,8 @@
-AquaHideout_1F_MapScripts:: @ 8233493
+AquaHideout_1F_MapScripts::
 	.byte 0
 
 @ The below two entrance guards give hints about what to do to progress the story
-AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494
+AquaHideout_1F_EventScript_HideoutEntranceGrunt1::
 	lock
 	faceplayer
 	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint1
@@ -11,17 +11,17 @@ AquaHideout_1F_EventScript_HideoutEntranceGrunt1:: @ 8233494
 	release
 	end
 
-AquaHideout_1F_EventScript_MagmaHideoutHint1:: @ 82334B2
+AquaHideout_1F_EventScript_MagmaHideoutHint1::
 	msgbox AquaHideout_1F_Text_WhereMightMagmaHideoutBe, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_SlateportHint1:: @ 82334BC
+AquaHideout_1F_EventScript_SlateportHint1::
 	msgbox AquaHideout_1F_Text_BossWentToJackASubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6
+AquaHideout_1F_EventScript_HideoutEntranceGrunt2::
 	lock
 	faceplayer
 	goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_SlateportHint2
@@ -30,27 +30,27 @@ AquaHideout_1F_EventScript_HideoutEntranceGrunt2:: @ 82334C6
 	release
 	end
 
-AquaHideout_1F_EventScript_MagmaHideoutHint2:: @ 82334E4
+AquaHideout_1F_EventScript_MagmaHideoutHint2::
 	msgbox AquaHideout_1F_Text_TeamMagmaAtMtChimney, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_SlateportHint2:: @ 82334EE
+AquaHideout_1F_EventScript_SlateportHint2::
 	msgbox AquaHideout_1F_Text_BossIsInSlateportCity, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_EventScript_Grunt1:: @ 82334F8
+AquaHideout_1F_EventScript_Grunt1::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_1, AquaHideout_1F_Text_Grunt1Intro, AquaHideout_1F_Text_Grunt1Defeat, AquaHideout_1F_EventScript_Grunt1Defeated
 	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_1F_EventScript_Grunt1Defeated:: @ 8233513
+AquaHideout_1F_EventScript_Grunt1Defeated::
 	msgbox AquaHideout_1F_Text_Grunt1PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D
+AquaHideout_1F_Text_OurBossIsSnatchingSomething:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's gone off to\n"
@@ -60,7 +60,7 @@ AquaHideout_1F_Text_OurBossIsSnatchingSomething: @ 823351D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3
+AquaHideout_1F_Text_WhereMightMagmaHideoutBe:
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is trying to\n"
@@ -68,7 +68,7 @@ AquaHideout_1F_Text_WhereMightMagmaHideoutBe: @ 82335E3
 	.string "HIDEOUT.\p"
 	.string "But where might their HIDEOUT be?$"
 
-AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D
+AquaHideout_1F_Text_BossWentToJackASubmarine:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -78,7 +78,7 @@ AquaHideout_1F_Text_BossWentToJackASubmarine: @ 823367D
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739
+AquaHideout_1F_Text_BossIsOnRoute122:
 	.string "What? What? What do you want with \n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here! He's on his way to\n"
@@ -88,14 +88,14 @@ AquaHideout_1F_Text_BossIsOnRoute122: @ 8233739
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_TeamMagmaAtMtChimney: @ 82337FA
+AquaHideout_1F_Text_TeamMagmaAtMtChimney:
 	.string "What? What?\n"
 	.string "Are you a TEAM MAGMA grunt?\p"
 	.string "I hear that TEAM MAGMA is after\n"
 	.string "an awesome POKéMON at MT. CHIMNEY.\p"
 	.string "But what is that POKéMON like?$"
 
-AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884
+AquaHideout_1F_Text_BossIsInSlateportCity:
 	.string "What? What? What do you want with\n"
 	.string "TEAM AQUA?\p"
 	.string "Our BOSS isn't here!\n"
@@ -105,15 +105,15 @@ AquaHideout_1F_Text_BossIsInSlateportCity: @ 8233884
 	.string "Wahaha! Do you really think I'd tell\n"
 	.string "you something that crucial?$"
 
-AquaHideout_1F_Text_Grunt1Intro: @ 823393D
+AquaHideout_1F_Text_Grunt1Intro:
 	.string "Ayiyiyi!\n"
 	.string "Suspicious character spotted!$"
 
-AquaHideout_1F_Text_Grunt1Defeat: @ 8233964
+AquaHideout_1F_Text_Grunt1Defeat:
 	.string "Grrrrr…\n"
 	.string "I lost it!$"
 
-AquaHideout_1F_Text_Grunt1PostBattle: @ 8233977
+AquaHideout_1F_Text_Grunt1PostBattle:
 	.string "I took the loss for the TEAM,\n"
 	.string "but I did my job…$"
 

data/maps/AquaHideout_B1F/scripts.inc

@@ -1,33 +1,33 @@
-AquaHideout_B1F_MapScripts:: @ 82339A7
+AquaHideout_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, AquaHideout_B1F_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B1F_OnTransition
 	.byte 0
 
-AquaHideout_B1F_OnResume: @ 82339B2
+AquaHideout_B1F_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_TryRemoveElectrode
 	end
 
-AquaHideout_B1F_EventScript_TryRemoveElectrode:: @ 82339BC
+AquaHideout_B1F_EventScript_TryRemoveElectrode::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-AquaHideout_B1F_OnTransition: @ 82339D0
+AquaHideout_B1F_OnTransition:
 	call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode1
 	call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_ShowElectrode2
 	end
 
-AquaHideout_B1F_EventScript_ShowElectrode1:: @ 82339E3
+AquaHideout_B1F_EventScript_ShowElectrode1::
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_1
 	return
 
-AquaHideout_B1F_EventScript_ShowElectrode2:: @ 82339E7
+AquaHideout_B1F_EventScript_ShowElectrode2::
 	clearflag FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2
 	return
 
-AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
+AquaHideout_B1F_EventScript_Electrode1::
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -49,12 +49,12 @@ AquaHideout_B1F_EventScript_Electrode1:: @ 82339EB
 	release
 	end
 
-AquaHideout_B1F_EventScript_DefeatedElectrode1:: @ 8233A2F
+AquaHideout_B1F_EventScript_DefeatedElectrode1::
 	setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
+AquaHideout_B1F_EventScript_Electrode2::
 	lock
 	faceplayer
 	setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
@@ -76,92 +76,92 @@ AquaHideout_B1F_EventScript_Electrode2:: @ 8233A38
 	release
 	end
 
-AquaHideout_B1F_EventScript_DefeatedElectrode2:: @ 8233A7C
+AquaHideout_B1F_EventScript_DefeatedElectrode2::
 	setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-AquaHideout_B1F_EventScript_Grunt2:: @ 8233A85
+AquaHideout_B1F_EventScript_Grunt2::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_2, AquaHideout_B1F_Text_Grunt2Intro, AquaHideout_B1F_Text_Grunt2Defeat, AquaHideout_B1F_EventScript_Grunt2Defeated
 	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt2Defeated:: @ 8233AA0
+AquaHideout_B1F_EventScript_Grunt2Defeated::
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
 	msgbox AquaHideout_B1F_Text_Grunt2PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_Grunt3:: @ 8233AB0
+AquaHideout_B1F_EventScript_Grunt3::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_3, AquaHideout_B1F_Text_Grunt3Intro, AquaHideout_B1F_Text_Grunt3Defeat, AquaHideout_B1F_EventScript_Grunt3Defeated
 	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt3Defeated:: @ 8233ACB
+AquaHideout_B1F_EventScript_Grunt3Defeated::
 	msgbox AquaHideout_B1F_Text_Grunt3PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B1F_EventScript_Grunt5:: @ 8233AD5
+AquaHideout_B1F_EventScript_Grunt5::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_5, AquaHideout_B1F_Text_Grunt5Intro, AquaHideout_B1F_Text_Grunt5Defeat
 	msgbox AquaHideout_B1F_Text_Grunt5PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_EventScript_Grunt7:: @ 8233AEC
+AquaHideout_B1F_EventScript_Grunt7::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_7, AquaHideout_B1F_Text_Grunt7Intro, AquaHideout_B1F_Text_Grunt7Defeat
 	msgbox AquaHideout_B1F_Text_Grunt7PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B1F_Text_Grunt2Intro: @ 8233B03
+AquaHideout_B1F_Text_Grunt2Intro:
 	.string "If you want to know the secret about\n"
 	.string "our HIDEOUT, you have me to beat!$"
 
-AquaHideout_B1F_Text_Grunt2Defeat: @ 8233B4A
+AquaHideout_B1F_Text_Grunt2Defeat:
 	.string "I can't win at all…$"
 
-AquaHideout_B1F_Text_Grunt2PostBattle: @ 8233B5E
+AquaHideout_B1F_Text_Grunt2PostBattle:
 	.string "Our HIDEOUT's secret?\p"
 	.string "Well, let's just say…\n"
 	.string "There's a submarine at the far end!\p"
 	.string "But, by now…\n"
 	.string "Kekekeke…$"
 
-AquaHideout_B1F_Text_Grunt3Intro: @ 8233BC5
+AquaHideout_B1F_Text_Grunt3Intro:
 	.string "Fuel supply loaded A-OK!\n"
 	.string "In-cruise snacks loaded A-OK!\p"
 	.string "Nothing left to do but KO a pesky\n"
 	.string "meddler!$"
 
-AquaHideout_B1F_Text_Grunt3Defeat: @ 8233C27
+AquaHideout_B1F_Text_Grunt3Defeat:
 	.string "I took a serious licking!$"
 
-AquaHideout_B1F_Text_Grunt3PostBattle: @ 8233C41
+AquaHideout_B1F_Text_Grunt3PostBattle:
 	.string "Humph!\n"
 	.string "This was supposed to happen!\p"
 	.string "My mission was to just hold you up!$"
 
-AquaHideout_B1F_Text_Grunt5Intro: @ 8233C89
+AquaHideout_B1F_Text_Grunt5Intro:
 	.string "Yawn… Keeping watch over the\n"
 	.string "HIDEOUT bores me. I'll take you on.$"
 
-AquaHideout_B1F_Text_Grunt5Defeat: @ 8233CCA
+AquaHideout_B1F_Text_Grunt5Defeat:
 	.string "Yawn…\n"
 	.string "Oh, I lost…$"
 
-AquaHideout_B1F_Text_Grunt5PostBattle: @ 8233CDC
+AquaHideout_B1F_Text_Grunt5PostBattle:
 	.string "If you scurry too much, other TEAM\n"
 	.string "AQUA members might get you.$"
 
-AquaHideout_B1F_Text_Grunt7Intro: @ 8233D1B
+AquaHideout_B1F_Text_Grunt7Intro:
 	.string "Hey!\n"
 	.string "You there!\p"
 	.string "Which do you think is cooler?\n"
 	.string "TEAM AQUA's uniform or TEAM MAGMA's?$"
 
-AquaHideout_B1F_Text_Grunt7Defeat: @ 8233D6E
+AquaHideout_B1F_Text_Grunt7Defeat:
 	.string "I lost in a cool way…$"
 
-AquaHideout_B1F_Text_Grunt7PostBattle: @ 8233D84
+AquaHideout_B1F_Text_Grunt7PostBattle:
 	.string "If you have a cool uniform, you look\n"
 	.string "good even in a loss, don't you think?$"

data/maps/AquaHideout_B2F/scripts.inc

@@ -1,19 +1,19 @@
 .set LOCALID_MATT, 1
 .set LOCALID_SUBMARINE, 4
 
-AquaHideout_B2F_MapScripts:: @ 8233DCF
+AquaHideout_B2F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, AquaHideout_B2F_OnTransition
 	.byte 0
 
-AquaHideout_B2F_OnTransition: @ 8233DD5
+AquaHideout_B2F_OnTransition:
 	call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_PreventMattNoticing
 	end
 
-AquaHideout_B2F_EventScript_PreventMattNoticing:: @ 8233DDF
+AquaHideout_B2F_EventScript_PreventMattNoticing::
 	setvar VAR_TEMP_1, 1
 	return
 
-AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5
+AquaHideout_B2F_EventScript_MattNoticePlayer::
 	lockall
 	setvar VAR_0x8008, LOCALID_MATT
 	playse SE_PIN
@@ -25,13 +25,13 @@ AquaHideout_B2F_EventScript_MattNoticePlayer:: @ 8233DE5
 	releaseall
 	end
 
-AquaHideout_B2F_EventScript_Matt:: @ 8233E09
+AquaHideout_B2F_EventScript_Matt::
 	trainerbattle_single TRAINER_MATT, AquaHideout_B2F_Text_MattIntro, AquaHideout_B2F_Text_MattDefeat, AquaHideout_B2F_EventScript_SubmarineEscape
 	msgbox AquaHideout_B2F_Text_MattPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25
+AquaHideout_B2F_EventScript_SubmarineEscape::
 	setvar VAR_0x8008, LOCALID_MATT
 	setvar VAR_0x8009, LOCALID_SUBMARINE
 	applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
@@ -54,7 +54,7 @@ AquaHideout_B2F_EventScript_SubmarineEscape:: @ 8233E25
 	release
 	end
 
-AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80
+AquaHideout_B2F_Movement_SumbarineDepartLeft:
 	walk_left
 	walk_left
 	walk_left
@@ -62,34 +62,34 @@ AquaHideout_B2F_Movement_SumbarineDepartLeft: @ 8233E80
 	step_end
 
 @ Unused
-AquaHideout_B2F_Movement_SumbarineDepartRight: @ 8233E85
+AquaHideout_B2F_Movement_SumbarineDepartRight:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-AquaHideout_B2F_EventScript_Grunt4:: @ 8233E8A
+AquaHideout_B2F_EventScript_Grunt4::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_4, AquaHideout_B2F_Text_Grunt4Intro, AquaHideout_B2F_Text_Grunt4Defeat, AquaHideout_B2F_EventScript_Grunt4Defeated
 	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_Grunt4Defeated:: @ 8233EA5
+AquaHideout_B2F_EventScript_Grunt4Defeated::
 	msgbox AquaHideout_B2F_Text_Grunt4PostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-AquaHideout_B2F_EventScript_Grunt6:: @ 8233EAF
+AquaHideout_B2F_EventScript_Grunt6::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_6, AquaHideout_B2F_Text_Grunt6Intro, AquaHideout_B2F_Text_Grunt6Defeat
 	msgbox AquaHideout_B2F_Text_Grunt6PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_EventScript_Grunt8:: @ 8233EC6
+AquaHideout_B2F_EventScript_Grunt8::
 	trainerbattle_single TRAINER_GRUNT_AQUA_HIDEOUT_8, AquaHideout_B2F_Text_Grunt8Intro, AquaHideout_B2F_Text_Grunt8Defeat
 	msgbox AquaHideout_B2F_Text_Grunt8PostBattle, MSGBOX_AUTOCLOSE
 	end
 
-AquaHideout_B2F_Text_MattIntro: @ 8233EDD
+AquaHideout_B2F_Text_MattIntro:
 	.string "Hehehe…\p"
 	.string "Got here already, did you?\n"
 	.string "We underestimated you!\p"
@@ -99,16 +99,16 @@ AquaHideout_B2F_Text_MattIntro: @ 8233EDD
 	.string "I'm not stalling for time.\n"
 	.string "I'm going to pulverize you!$"
 
-AquaHideout_B2F_Text_MattDefeat: @ 8233F8D
+AquaHideout_B2F_Text_MattDefeat:
 	.string "Hehehe…\n"
 	.string "So, I lost, too…$"
 
-AquaHideout_B2F_Text_OurBossGotThroughHisPreparations: @ 8233FA6
+AquaHideout_B2F_Text_OurBossGotThroughHisPreparations:
 	.string "Hehehe!\p"
 	.string "While I was toying with you, our BOSS\n"
 	.string "got through his preparations!$"
 
-AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2
+AquaHideout_B2F_Text_MattPostBattle:
 	.string "Hehehe!\p"
 	.string "Our BOSS has already gone on his way to\n"
 	.string "some cave under the sea!\p"
@@ -118,19 +118,19 @@ AquaHideout_B2F_Text_MattPostBattle: @ 8233FF2
 	.string "But will you find it then?\n"
 	.string "Hehehe!$"
 
-AquaHideout_B2F_Text_Grunt4Intro: @ 82340B4
+AquaHideout_B2F_Text_Grunt4Intro:
 	.string "Wahahah, I grew weary of waiting!\n"
 	.string "You owe me a battle, too!$"
 
-AquaHideout_B2F_Text_Grunt4Defeat: @ 82340F0
+AquaHideout_B2F_Text_Grunt4Defeat:
 	.string "Tired of waiting…\n"
 	.string "Lost and dazed…$"
 
-AquaHideout_B2F_Text_Grunt4PostBattle: @ 8234112
+AquaHideout_B2F_Text_Grunt4PostBattle:
 	.string "BOSS…\n"
 	.string "Is this good enough?$"
 
-AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
+AquaHideout_B2F_Text_Grunt6Intro:
 	.string "Warp panels, the HIDEOUT's pride\n"
 	.string "and joy!\p"
 	.string "You're clueless about where you are,\n"
@@ -138,25 +138,25 @@ AquaHideout_B2F_Text_Grunt6Intro: @ 823412D
 	.string "Fluster and tire out the enemy, then\n"
 	.string "lower the boom! That's our plan!$"
 
-AquaHideout_B2F_Text_Grunt6Defeat: @ 82341CE
+AquaHideout_B2F_Text_Grunt6Defeat:
 	.string "What's wrong with you?\n"
 	.string "You're not tired at all!$"
 
-AquaHideout_B2F_Text_Grunt6PostBattle: @ 82341FE
+AquaHideout_B2F_Text_Grunt6PostBattle:
 	.string "That reminds me… I can't remember\n"
 	.string "where I put the MASTER BALL.\p"
 	.string "If I fail to guard it, our BOSS will\n"
 	.string "chew me out…$"
 
-AquaHideout_B2F_Text_Grunt8Intro: @ 823426F
+AquaHideout_B2F_Text_Grunt8Intro:
 	.string "When I joined TEAM AQUA, the first\n"
 	.string "thing I had to learn was how these\l"
 	.string "warp panels connected.$"
 
-AquaHideout_B2F_Text_Grunt8Defeat: @ 82342CC
+AquaHideout_B2F_Text_Grunt8Defeat:
 	.string "I was too occupied thinking about\n"
 	.string "the warp panels…$"
 
-AquaHideout_B2F_Text_Grunt8PostBattle: @ 82342FF
+AquaHideout_B2F_Text_Grunt8PostBattle:
 	.string "I'll have to learn about how I can\n"
 	.string "battle more effectively…$"

data/maps/AquaHideout_UnusedRubyMap1/scripts.inc

@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap1_MapScripts:: @ 823929B
+AquaHideout_UnusedRubyMap1_MapScripts::
 	.byte 0
 

data/maps/AquaHideout_UnusedRubyMap2/scripts.inc

@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap2_MapScripts:: @ 823929C
+AquaHideout_UnusedRubyMap2_MapScripts::
 	.byte 0
 

data/maps/AquaHideout_UnusedRubyMap3/scripts.inc

@@ -1,3 +1,3 @@
-AquaHideout_UnusedRubyMap3_MapScripts:: @ 823929D
+AquaHideout_UnusedRubyMap3_MapScripts::
 	.byte 0
 

data/maps/ArtisanCave_1F/scripts.inc

@@ -1,3 +1,3 @@
-ArtisanCave_1F_MapScripts:: @ 823AFB7
+ArtisanCave_1F_MapScripts::
 	.byte 0
 

data/maps/ArtisanCave_B1F/scripts.inc

@@ -1,8 +1,8 @@
-ArtisanCave_B1F_MapScripts:: @ 823AFAD
+ArtisanCave_B1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, ArtisanCave_B1F_OnTransition
 	.byte 0
 
-ArtisanCave_B1F_OnTransition: @ 823AFB3
+ArtisanCave_B1F_OnTransition:
 	setflag FLAG_LANDMARK_ARTISAN_CAVE
 	end
 

data/maps/BattleColosseum_2P/scripts.inc

@@ -1,3 +1,3 @@
-BattleColosseum_2P_MapScripts:: @ 823B77D
+BattleColosseum_2P_MapScripts::
 	.byte 0
 

data/maps/BattleColosseum_4P/scripts.inc

@@ -1,3 +1,3 @@
-BattleColosseum_4P_MapScripts:: @ 823B780
+BattleColosseum_4P_MapScripts::
 	.byte 0
 

data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc

@@ -7,7 +7,7 @@
 .set LOCALID_PLAYER, 8
 .set LOCALID_ANNOUNCER, 9
 
-BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
+BattleFrontier_BattleArenaBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleArenaBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaBattleRoom_OnWarp
@@ -17,16 +17,16 @@ BattleFrontier_BattleArenaBattleRoom_MapScripts:: @ 8257487
 	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_1
 
-BattleFrontier_BattleArenaBattleRoom_OnResume: @ 825749C
+BattleFrontier_BattleArenaBattleRoom_OnResume:
 	special OffsetCameraForBattle
 	end
 
-BattleFrontier_BattleArenaBattleRoom_OnTransition: @ 82574A0
+BattleFrontier_BattleArenaBattleRoom_OnTransition:
 	frontier_settrainers
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale
@@ -34,19 +34,19 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: @ 82574AE
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: @ 82574C6
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale:: @ 82574CC
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleArenaBattleRoom_OnFrame: @ 82574D2
+BattleFrontier_BattleArenaBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
+BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom::
 	lockall
 	showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom:: @ 82574DC
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
+BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter
@@ -97,7 +97,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers:: @ 825752E
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575DB
+BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner::
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
@@ -108,12 +108,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner:: @ 82575
 	waitmovement 0
 	arena_gettrainername
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost:: @ 8257615
+BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
@@ -134,7 +134,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: @ 8257630
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -163,7 +163,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: @ 82576B0
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8257768
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
@@ -171,7 +171,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -180,18 +180,18 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskRecordBattle:: @ 825779E
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle:: @ 82577D0
+BattleFrontier_BattleArenaBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge:: @ 82577DA
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -200,50 +200,50 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge:: @ 8257808
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge:: @ 825783A
+BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	waitmovement 0
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers
 	waitstate
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon:: @ 8257852
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon::
 	delay 60
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8
 	waitstate
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8257870
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8257877
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent:: @ 825787E
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8257885
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent:: @ 825788C
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8257893
+BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
+BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	arena_save CHALLENGE_STATUS_PAUSED
@@ -253,12 +253,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge:: @ 825789A
 	frontier_reset
 	end
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: @ 82578BC
+BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon::
 	message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -272,7 +272,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: @ 82578D4
 	case 3, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 825792B
+BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
@@ -280,7 +280,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord:: @ 8
 	case 2, BattleFrontier_BattleArenaBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight
@@ -321,14 +321,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta:: @ 8257961
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver:: @ 8257A3F
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -344,7 +344,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: @ 8257A5C
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: @ 8257AA5
+BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold
@@ -358,14 +358,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: @ 8257AA5
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold:: @ 8257AF8
+BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
+BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold::
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -381,12 +381,12 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: @ 8257B15
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle:: @ 8257B5E
+BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle::
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin, MSGBOX_DEFAULT
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
+BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -400,7 +400,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DoArenaBattle:: @ 8257B6C
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
+BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner::
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_1, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
 	applymovement LOCALID_BLACK_BELT_2, BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown
@@ -414,39 +414,39 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner:: @ 8257BA9
 	call BattleFrontier_EventScript_IncrementWinStreak
 	return
 
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter: @ 8257BE2
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter:
 	walk_right
 	walk_right
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong: @ 8257BE4
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForwardLong:
 	walk_right
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward: @ 8257BE5
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward:
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine: @ 8257BE7
+BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine:
 	walk_left
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft: @ 8257BEB
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft:
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight: @ 8257BED
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter: @ 8257BEF
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter:
 	walk_left
 	walk_left
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong: @ 8257BF1
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong:
 	walk_left
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward: @ 8257BF2
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter: @ 8257BF4
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter:
 	walk_fast_left
 	walk_fast_left
 	walk_fast_left
@@ -454,7 +454,7 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaEnter: @ 8257BF4
 	walk_fast_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit: @ 8257BFA
+BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit:
 	walk_right
 	walk_right
 	walk_right
@@ -464,30 +464,30 @@ BattleFrontier_BattleArenaBattleRoom_Movement_OpponentExit: @ 8257BFA
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown: @ 8257C02
+BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceDown:
 	disable_jump_landing_ground_effect
 	jump_in_place_down
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp: @ 8257C05
+BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp:
 	disable_jump_landing_ground_effect
 	jump_in_place_up
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown: @ 8257C08
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown:
 	walk_in_place_fastest_down
 	step_end
 
 @ Unused, redundant
-BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2: @ 8257C0A
+BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_OnWarp: @ 8257C0C
+BattleFrontier_BattleArenaBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects
 	.2byte 0
 
-BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
+BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM
 	removeobject LOCALID_OPPONENT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
@@ -495,7 +495,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects:: @ 8257C16
 	setvar VAR_TEMP_1, 1
 	end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: @ 8257C30
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer:
 	walk_down
 	walk_in_place_fastest_left
 	delay_16
@@ -507,97 +507,97 @@ BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: @ 8257C30
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter: @ 8257C3A
+BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter:
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward: @ 8257C3D
+BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward:
 	.string "REFEREE: TRAINER {PLAYER}!\n"
 	.string "Step forward, please!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward: @ 8257C68
+BattleFrontier_BattleArenaBattleRoom_Text_OpponentStepForward:
 	.string "REFEREE: TRAINER {STR_VAR_1}!\n"
 	.string "Step forward, please!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin: @ 8257C93
+BattleFrontier_BattleArenaBattleRoom_Text_SetKOTourneyBegin:
 	.string "REFEREE: Set KO Tourney!\n"
 	.string "Begin!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer: @ 8257CB3
+BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsPlayer:
 	.string "REFEREE: The winner is {PLAYER}!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent: @ 8257CCE
+BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent:
 	.string "REFEREE: The winner is {STR_VAR_1}!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored: @ 8257CE9
+BattleFrontier_BattleArenaBattleRoom_Text_MonsWillBeRestored:
 	.string "Your POKéMON will be restored to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent: @ 8257D17
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "Next up, your second opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent: @ 8257D50
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "Next up, your third opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent: @ 8257D88
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor4thOpponent:
 	.string "Next up, your fourth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent: @ 8257DC1
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor5thOpponent:
 	.string "Next up, your fifth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent: @ 8257DF9
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor6thOpponent:
 	.string "Next up, your sixth opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent: @ 8257E31
+BattleFrontier_BattleArenaBattleRoom_Text_ReadyFor7thOpponent:
 	.string "Next up, your seventh opponent!\n"
 	.string "Are you ready to move on?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown: @ 8257E6B
+BattleFrontier_BattleArenaBattleRoom_Text_SaveAndShutDown:
 	.string "Would you like to save the game and\n"
 	.string "shut down now?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge: @ 8257E9E
+BattleFrontier_BattleArenaBattleRoom_Text_RetireFromChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Set KO Tourney challenge?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait: @ 8257EDB
+BattleFrontier_BattleArenaBattleRoom_Text_SavingPleaseWait:
 	.string "I am saving your game data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle: @ 8257F04
+BattleFrontier_BattleArenaBattleRoom_Text_RecordLastBattle:
 	.string "Would you like to record your last\n"
 	.string "battle on your FRONTIER PASS?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon: @ 8257F45
+BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon:
 	.string "My dear challenger!\p"
 	.string "Your skill level is truly astounding!\p"
 	.string "We now would like you to face our\n"
 	.string "leader, the ARENA TYCOON!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon: @ 8257FBB
+BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon:
 	.string "A battle with the ARENA TYCOON!\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta: @ 8257FED
+BattleFrontier_BattleArenaBattleRoom_Text_MakeWayForGreta:
 	.string "REFEREE: The ARENA TYCOON!\n"
 	.string "Make way for GRETA!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger: @ 825801C
+BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger:
 	.string "GRETA: Hey!\n"
 	.string "Howdy!\p"
 	.string "…Wait, are you the challenger?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight: @ 825804E
+BattleFrontier_BattleArenaBattleRoom_Text_IsThatRight:
 	.string "Is that right? Hmm…\n"
 	.string "Hmhm…$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy: @ 8258068
+BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy:
 	.string "I don't know how to say it, but…\n"
 	.string "To put it bluntly, you look pretty weak.\l"
 	.string "Are you sure you're up for me?\p"
@@ -605,53 +605,53 @@ BattleFrontier_BattleArenaBattleRoom_Text_YouLookWeakTakeThingsEasy: @ 8258068
 	.string "Well, all right!\n"
 	.string "We'll take things easy to start with!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle: @ 825810D
+BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle:
 	.string "Okay! Let's see you ignite my passion\n"
 	.string "for battle!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll: @ 825813F
+BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll:
 	.string "GRETA: Ow, wait a second!\n"
 	.string "You are tough after all!\p"
 	.string "I like you!\n"
 	.string "Let's see your FRONTIER PASS.$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol: @ 825819C
+BattleFrontier_BattleArenaBattleRoom_Text_ReceivedGutsSymbol:
 	.string "The Guts Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime: @ 82581CF
+BattleFrontier_BattleArenaBattleRoom_Text_GoingToBeFunNextTime:
 	.string "Hmm…\p"
 	.string "It's going to be fun the next time!\n"
 	.string "I'm looking forward to it!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain: @ 8258213
+BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain:
 	.string "GRETA: Hey! Howdy!\n"
 	.string "You finally won your way up to me!\p"
 	.string "I was getting worried waiting for you!\n"
 	.string "I was really looking forward to seeing\l"
 	.string "you again!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady: @ 82582A2
+BattleFrontier_BattleArenaBattleRoom_Text_SoAreYouReady:
 	.string "… … …\n"
 	.string "So, are you ready?$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort: @ 82582BB
+BattleFrontier_BattleArenaBattleRoom_Text_WontAllowHalfheartedEffort:
 	.string "I won't allow a halfhearted effort!\n"
 	.string "Be ready for a thrashing!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted: @ 82582F9
+BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted:
 	.string "Come on, REFEREE!\n"
 	.string "Let's get this started!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway: @ 8258323
+BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway:
 	.string "GRETA: Gaaah! Blown away!\n"
 	.string "Let's see your FRONTIER PASS!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine: @ 825835B
+BattleFrontier_BattleArenaBattleRoom_Text_GutsSymbolTookGoldenShine:
 	.string "The Guts Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose: @ 8258383
+BattleFrontier_BattleArenaBattleRoom_Text_IfWeBattleAgainWontLose:
 	.string "Arrrgh!\n"
 	.string "This is so infuriating!\p"
 	.string "If we ever battle again, I won't lose!\n"

data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc

@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleArenaCorridor_MapScripts:: @ 82573B9
+BattleFrontier_BattleArenaCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleArenaCorridor_OnFrame: @ 82573BF
+BattleFrontier_BattleArenaCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom
 	.2byte 0
 
-BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
+BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
 	delay 16
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor
@@ -26,7 +26,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom:: @ 82573C9
 	waitstate
 	end
 
-BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417
+BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor:
 	walk_up
 	walk_left
 	walk_left
@@ -49,12 +49,12 @@ BattleFrontier_BattleArenaCorridor_Movement_PlayerWalkToDoor: @ 8257417
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor: @ 825742C
+BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor:
 	walk_right
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F
+BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor:
 	walk_left
 	walk_left
 	walk_left
@@ -77,16 +77,16 @@ BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor: @ 825742F
 	walk_right
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer: @ 8257444
+BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer:
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay: @ 8257446
+BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay:
 	walk_up
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn: @ 8257449
+BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn:
 	.string "Your battles shall be waged in\n"
 	.string "the next room. Please step in!$"
 

data/maps/BattleFrontier_BattleArenaLobby/scripts.inc

@@ -1,20 +1,20 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleArenaLobby_MapScripts:: @ 8255C36
+BattleFrontier_BattleArenaLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleArenaLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleArenaLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleArenaLobby_OnWarp: @ 8255C41
+BattleFrontier_BattleArenaLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth:: @ 8255C4B
+BattleFrontier_BattleArenaLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
+BattleFrontier_BattleArenaLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge
@@ -22,11 +22,11 @@ BattleFrontier_BattleArenaLobby_OnFrame: @ 8255C55
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleArenaLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus:: @ 8255C7F
+BattleFrontier_BattleArenaLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving:: @ 8255C88
+BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown, MSGBOX_DEFAULT
 	closemessage
@@ -37,7 +37,7 @@ BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving:: @ 8255C88
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: @ 8255CCF
+BattleFrontier_BattleArenaLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -45,9 +45,9 @@ BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: @ 8255CCF
 	msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon:: @ 8255CF0
+BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon::
 	msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints:: @ 8255CF8
+BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -60,7 +60,7 @@ BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints:: @ 8255CF8
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_LostChallenge:: @ 8255D2B
+BattleFrontier_BattleArenaLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave
 	waitmessage
@@ -72,7 +72,7 @@ BattleFrontier_BattleArenaLobby_EventScript_LostChallenge:: @ 8255D2B
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
+BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -90,12 +90,12 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge:: @ 8255D59
 	case 0, BattleFrontier_BattleArenaLobby_EventScript_RecordMatch
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_RecordMatch:: @ 8255DBA
+BattleFrontier_BattleArenaLobby_EventScript_RecordMatch::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge:: @ 8255DBF
+BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge::
 	return
 
-BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge:: @ 8255DC0
+BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame
 	waitmessage
@@ -106,14 +106,14 @@ BattleFrontier_BattleArenaLobby_EventScript_ResumeChallenge:: @ 8255DC0
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_Attendant:: @ 8255DF4
+BattleFrontier_BattleArenaLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_ARENA
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
+BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -123,7 +123,7 @@ BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge:: @ 8255E0B
 	case 2, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
+BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleArenaLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -149,7 +149,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge:: @ 8255E47
 	case YES, BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge:: @ 8255EE8
+BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	arena_init
@@ -163,7 +163,7 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge:: @ 8255EE8
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: @ 8255F54
+BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattleArenaLobby_Text_GuideYouToArena, MSGBOX_DEFAULT
@@ -178,36 +178,36 @@ BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: @ 8255F54
 	waitstate
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge:: @ 8255F9F
+BattleFrontier_BattleArenaLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons:: @ 8255FAC
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50:: @ 8255FC7
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8255FD4
+BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed:: @ 8255FE1
+BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8255FF8
+BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge:: @ 8255FFB
+BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge, MSGBOX_DEFAULT
-BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge:: @ 8256003
+BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
+BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor
 	waitmovement 0
@@ -220,7 +220,7 @@ BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50:: @ 8256005
 	waitdooranim
 	return
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor: @ 8256034
+BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -232,12 +232,12 @@ BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToLeftDoor: @ 8256034
 	walk_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor: @ 825603E
+BattleFrontier_BattleArenaLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor: @ 8256041
+BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -250,13 +250,13 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor: @ 8256041
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: @ 825604C
+BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
+BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor
 	waitmovement 0
@@ -269,7 +269,7 @@ BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen:: @ 8256050
 	waitdooranim
 	return
 
-BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor: @ 825607F
+BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -280,7 +280,7 @@ BattleFrontier_BattleArenaLobby_Movement_AttendantWalkToRightDoor: @ 825607F
 	walk_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor: @ 8256088
+BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -292,7 +292,7 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor: @ 8256088
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: @ 8256092
+BattleFrontier_BattleArenaLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_ARENA
 	waitbuttonpress
@@ -300,29 +300,29 @@ BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: @ 8256092
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Youngster:: @ 82560A6
+BattleFrontier_BattleArenaLobby_EventScript_Youngster::
 	msgbox BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Man:: @ 82560AF
+BattleFrontier_BattleArenaLobby_EventScript_Man::
 	msgbox BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Camper:: @ 82560B8
+BattleFrontier_BattleArenaLobby_EventScript_Camper::
 	msgbox BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_Woman:: @ 82560C1
+BattleFrontier_BattleArenaLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_RulesBoard:: @ 82560CA
+BattleFrontier_BattleArenaLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleArenaLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9
+BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 2, MULTI_BATTLE_ARENA_RULES, FALSE
@@ -335,45 +335,45 @@ BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard:: @ 82560D9
 	case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_BattleRules:: @ 825612C
+BattleFrontier_BattleArenaLobby_EventScript_BattleRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_MindRules:: @ 825613A
+BattleFrontier_BattleArenaLobby_EventScript_MindRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainMindRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_SkillRules:: @ 8256148
+BattleFrontier_BattleArenaLobby_EventScript_SkillRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_BodyRules:: @ 8256156
+BattleFrontier_BattleArenaLobby_EventScript_BodyRules::
 	msgbox BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleArenaLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleArenaLobby_EventScript_ExitRules:: @ 8256164
+BattleFrontier_BattleArenaLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena: @ 8256166
+BattleFrontier_BattleArenaLobby_Text_WelcomeToBattleArena:
 	.string "Where the battling spirit of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "I welcome you to the BATTLE ARENA!\p"
 	.string "I am your guide to the Set KO Tourney!$"
 
-BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge: @ 82561EA
+BattleFrontier_BattleArenaLobby_Text_WishToTakeChallenge:
 	.string "Now, do you wish to take\n"
 	.string "the BATTLE ARENA challenge?$"
 
-BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge: @ 825621F
+BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainChallenge: @ 825624C
+BattleFrontier_BattleArenaLobby_Text_ExplainChallenge:
 	.string "In the BATTLE ARENA, we undertake\n"
 	.string "the Set KO Tourney.\p"
 	.string "All participants enter with a team of\n"
@@ -394,20 +394,20 @@ BattleFrontier_BattleArenaLobby_Text_ExplainChallenge: @ 825624C
 	.string "seven TRAINERS in succession,\l"
 	.string "we will present you with Battle Points.$"
 
-BattleFrontier_BattleArenaLobby_Text_OkayToSave: @ 82564CE
+BattleFrontier_BattleArenaLobby_Text_OkayToSave:
 	.string "Before showing you to the BATTLE\n"
 	.string "ARENA, you must save. Is that okay?$"
 
-BattleFrontier_BattleArenaLobby_Text_WhichLevelMode: @ 8256513
+BattleFrontier_BattleArenaLobby_Text_WhichLevelMode:
 	.string "The BATTLE ARENA offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-BattleFrontier_BattleArenaLobby_Text_SelectThreeMons: @ 8256573
+BattleFrontier_BattleArenaLobby_Text_SelectThreeMons:
 	.string "Very well, now select your\n"
 	.string "three POKéMON, please.$"
 
-BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen: @ 82565A5
+BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -419,7 +419,7 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen: @ 82565A5
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: @ 82566A8
+BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50:
 	.string "My dear challenger!\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for entry.\p"
@@ -433,11 +433,11 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50: @ 82566A8
 	.string "When you have made your preparations,\n"
 	.string "please do return.$"
 
-BattleFrontier_BattleArenaLobby_Text_GuideYouToArena: @ 82567E6
+BattleFrontier_BattleArenaLobby_Text_GuideYouToArena:
 	.string "I shall now guide you to\n"
 	.string "the BATTLE ARENA.$"
 
-BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown: @ 8256811
+BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown:
 	.string "My dear challenger!\p"
 	.string "You did not save the game before\n"
 	.string "shutting down, did you?\p"
@@ -447,67 +447,67 @@ BattleFrontier_BattleArenaLobby_Text_DidntSaveBeforeShuttingDown: @ 8256811
 	.string "You may, of course, start with a fresh\n"
 	.string "challenge.$"
 
-BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins: @ 82568E7
+BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins:
 	.string "We congratulate you for your splendid\n"
 	.string "string of wins over seven TRAINERS!$"
 
-BattleFrontier_BattleArenaLobby_Text_RecordAchievement: @ 8256931
+BattleFrontier_BattleArenaLobby_Text_RecordAchievement:
 	.string "Your achievement will be recorded.\n"
 	.string "Please wait while I save the game.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_PresentYouWithPrize: @ 8256977
+BattleFrontier_BattleArenaLobby_Text_PresentYouWithPrize:
 	.string "In commemoration of your 7-win streak,\n"
 	.string "we present you with this prize.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_ReceivedPrize: @ 82569BE
+BattleFrontier_BattleArenaLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleArenaLobby_Text_BagFullReturnForPrize: @ 82569D8
+BattleFrontier_BattleArenaLobby_Text_BagFullReturnForPrize:
 	.string "Oh?\n"
 	.string "Your BAG seems to be full.\p"
 	.string "I urge you to clear space and\n"
 	.string "return for your prize.$"
 
-BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave: @ 8256A2C
+BattleFrontier_BattleArenaLobby_Text_ThankYouWaitWhileSave:
 	.string "Thank you so much for participating!\p"
 	.string "Please wait while I save the game.$"
 
-BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2: @ 8256A74
+BattleFrontier_BattleArenaLobby_Text_AwaitAnotherChallenge2:
 	.string "We await your challenge on\n"
 	.string "another occasion!$"
 
-BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame: @ 8256AA1
+BattleFrontier_BattleArenaLobby_Text_LookingForwardToArrivalSaveGame:
 	.string "We have been looking forward to\n"
 	.string "your arrival.\p"
 	.string "Before I show you to the BATTLE\n"
 	.string "ARENA, I must save the game.\l"
 	.string "Please wait.$"
 
-BattleFrontier_BattleArenaLobby_Text_RecordLastMatch: @ 8256B19
+BattleFrontier_BattleArenaLobby_Text_RecordLastMatch:
 	.string "Shall I record your last BATTLE ARENA\n"
 	.string "match on your FRONTIER PASS?$"
 
-BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack: @ 8256B5C
+BattleFrontier_BattleArenaLobby_Text_BadIdeaToNotAttack:
 	.string "I lost on the REFEREE's decision…\p"
 	.string "I don't think it was a good idea to only\n"
 	.string "use defensive moves and not attack…$"
 
-BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked: @ 8256BCB
+BattleFrontier_BattleArenaLobby_Text_LandingHitsWorked:
 	.string "I won in judging!\p"
 	.string "Landing hits consistently on\n"
 	.string "the opponent's POKéMON worked!$"
 
-BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw: @ 8256C19
+BattleFrontier_BattleArenaLobby_Text_MatchWasDeclaredDraw:
 	.string "Our match was declared a draw.\p"
 	.string "When we ran out of time, both my\n"
 	.string "POKéMON and the opponent's had about\l"
 	.string "the same amount of HP left.$"
 
-BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant: @ 8256C9A
+BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant:
 	.string "In the BATTLE ARENA, the order of\n"
 	.string "POKéMON is totally important.\p"
 	.string "For example, if your first POKéMON\n"
@@ -518,13 +518,13 @@ BattleFrontier_BattleArenaLobby_Text_OrderOfMonsImportant: @ 8256C9A
 	.string "I think that will be a good way of\n"
 	.string "making an effective team.$"
 
-BattleFrontier_BattleArenaLobby_Text_RulesAreListed: @ 8256DB8
+BattleFrontier_BattleArenaLobby_Text_RulesAreListed:
 	.string "The Set KO Tourney's rules are listed.$"
 
-BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading: @ 8256DDF
+BattleFrontier_BattleArenaLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules: @ 8256E02
+BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules:
 	.string "The Set KO Tourney has special rules,\n"
 	.string "unlike standard battles.\p"
 	.string "First, one battle lasts only\n"
@@ -536,7 +536,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainBattleRules: @ 8256E02
 	.string "Also, a POKéMON cannot be switched out\n"
 	.string "until its battle's outcome is decided.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainMindRules: @ 8256F43
+BattleFrontier_BattleArenaLobby_Text_ExplainMindRules:
 	.string "The first judging factor is “Mind.”\n"
 	.string "This factor evaluates how aggressive\l"
 	.string "the battlers were.\p"
@@ -544,7 +544,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainMindRules: @ 8256F43
 	.string "the TRAINERS ordered the use of\l"
 	.string "offensive moves.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules: @ 8256FF2
+BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules:
 	.string "The second judging factor is “Skill.”\n"
 	.string "This factor evaluates how effectively\l"
 	.string "POKéMON moves were used.\p"
@@ -563,7 +563,7 @@ BattleFrontier_BattleArenaLobby_Text_ExplainSkillRules: @ 8256FF2
 	.string "hit with a move, its Skill rating will not\l"
 	.string "go down.$"
 
-BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules: @ 8257202
+BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules:
 	.string "The third judging factor is “Body.”\n"
 	.string "This factor is based on how much HP\l"
 	.string "remained at the end of a battle.\p"
@@ -571,13 +571,13 @@ BattleFrontier_BattleArenaLobby_Text_ExplainBodyRules: @ 8257202
 	.string "HP a POKéMON had at the start of\l"
 	.string "battle, and what remained at the end.$"
 
-BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon: @ 82572D9
+BattleFrontier_BattleArenaLobby_Text_CongratsOnDefeatingTycoon:
 	.string "A victory snatched from the ARENA\n"
 	.string "TYCOON, and a seven-TRAINER sweep!\p"
 	.string "We congratulate you on your most\n"
 	.string "splendid challenge!$"
 
-BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints: @ 8257353
+BattleFrontier_BattleArenaLobby_Text_PleaseAcceptBattlePoints:
 	.string "My dear challenger, in recognition of\n"
 	.string "your indefatigable spirit, please\l"
 	.string "accept these Battle Point(s).$"

data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc

@@ -5,7 +5,7 @@
 .set LOCALID_PLAYER, 13
 .set LOCALID_OPPONENT, 15
 
-BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
+BattleFrontier_BattleDomeBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleDomeBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeBattleRoom_OnWarp
@@ -16,7 +16,7 @@ BattleFrontier_BattleDomeBattleRoom_MapScripts:: @ 824BC9C
 	.set DRAW_TRAINER,  1
 	.set DRAW_TUCKER,   2
 
-BattleFrontier_BattleDomeBattleRoom_OnTransition: @ 824BCB1
+BattleFrontier_BattleDomeBattleRoom_OnTransition:
 	dome_setopponentgfx
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -25,7 +25,7 @@ BattleFrontier_BattleDomeBattleRoom_OnTransition: @ 824BCB1
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale
@@ -33,19 +33,19 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: @ 824BCDC
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: @ 824BCF4
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824BCFA
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleDomeBattleRoom_OnFrame: @ 824BD00
+BattleFrontier_BattleDomeBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: @ 824BD0A
+BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom::
 	lockall
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	compare VAR_RESULT, DOME_ROUND1
@@ -60,13 +60,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: @ 824BD0A
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: @ 824BD4E
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker:: @ 824BD5A
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD61
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer::
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitmovement 0
@@ -74,7 +74,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer:: @ 824BD6
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent
 	compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent::
 	dome_getopponentname
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer, MSGBOX_DEFAULT
 	closemessage
@@ -92,7 +92,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: @ 824BD82
 	case B_OUTCOME_LOST, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
 	case B_OUTCOME_FORFEITED, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
 	setvar VAR_TEMP_2, DRAW_TRAINER
-BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
+BattleFrontier_BattleDomeBattleRoom_EventScript_Draw::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait, MSGBOX_DEFAULT
 	closemessage
 	playse SE_M_ENCORE2
@@ -110,7 +110,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_Draw:: @ 824BDF7
 	dome_compareseeds
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent::
 	applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	dome_getopponentname
@@ -123,30 +123,30 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent:: @ 824BE4F
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	delay 60
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney:: @ 824BE8D
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney::
 	dome_resolvewinners DOME_PLAYER_LOST_MATCH
-BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost:: @ 824BE9A
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon:: @ 824BEB1
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon::
 	frontier_gettrainername 1
 	message BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw:: @ 824BEC5
+BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw::
 	frontier_gettrainername 0
 	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw:: @ 824BED9
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw::
 	message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
+BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent::
 	applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
 	waitmovement 0
 	compare VAR_TEMP_2, NO_DRAW
@@ -167,7 +167,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: @ 824BEE0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3
 	waitstate
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: @ 824BF62
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience
 	waitmovement 0
 	frontier_get FRONTIER_DATA_LVL_MODE
@@ -176,9 +176,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: @ 824BF62
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney:: @ 824BF96
+BattleFrontier_BattleDomeBattleRoom_EventScript_WonLvOpenTourney::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
+BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin::
 	special DoDomeConfetti
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
@@ -186,15 +186,15 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_CelebrateWin:: @ 824BF9E
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon:: @ 824BFC3
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw:: @ 824BFCC
+BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: @ 824BFD5
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer::
 	dome_get DOME_DATA_ATTEMPTED_CHALLENGE
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt
@@ -207,7 +207,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: @ 824BFD5
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt:: @ 824C023
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1
@@ -216,27 +216,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt:: @ 8
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1:: @ 824C05A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2:: @ 824C061
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_RisingStar
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal:: @ 824C068
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal:: @ 824C06F
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttemptFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon:: @ 824C076
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1
@@ -245,27 +245,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon:: @ 824C0
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1:: @ 824C0AD
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2:: @ 824C0B4
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal:: @ 824C0BB
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal:: @ 824C0C2
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: @ 824C0C9
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion::
 	compare VAR_TEMP_F, DOME_FINAL
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker
 	switch VAR_TEMP_E
@@ -273,7 +273,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: @ 824C0
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver
 	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker:: @ 824C105
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1
@@ -282,35 +282,35 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker::
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1:: @ 824C13C
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2:: @ 824C143
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal:: @ 824C14A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal:: @ 824C151
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver:: @ 824C158
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold:: @ 824C161
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak:: @ 824C16A
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1
@@ -319,44 +319,44 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak:: @ 8
 	case DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1:: @ 824C1A1
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound1::
 	message BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2:: @ 824C1A8
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakRound2::
 	message BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal:: @ 824C1AF
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakSemifinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal:: @ 824C1B6
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreakFinal::
 	message BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory
 	waitmessage
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum:: @ 824C1BD
+BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker:: @ 824C1CB
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker::
 	switch VAR_TEMP_E
 	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver
 	case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver:: @ 824C1FC
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold:: @ 824C209
+BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter::
 	closemessage
 	applymovement LOCALID_AUDIENCE_TWIN, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump
 	applymovement LOCALID_ANNOUNCER, BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance
@@ -391,7 +391,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter:: @ 824C211
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
@@ -415,13 +415,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: @ 824C2B9
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro:: @ 824C346
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
+BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess, MSGBOX_DEFAULT
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle
 	switch VAR_RESULT
@@ -445,7 +445,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: @ 824C373
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2
@@ -454,18 +454,18 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoTuckerBattle:: @ 824C400
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker:: @ 824C420
+BattleFrontier_BattleDomeBattleRoom_EventScript_LostToTucker::
 	msgbox BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker, MSGBOX_DEFAULT
 	playse SE_M_ENCORE2
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
 	waitse
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_LostTourney
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw:: @ 824C436
+BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerDraw::
 	setvar VAR_TEMP_2, DRAW_TUCKER
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_Draw
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
+BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle::
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
 	setvar VAR_0x8004, SPECIAL_BATTLE_DOME
@@ -479,11 +479,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DoDomeBattle:: @ 824C440
 	dome_resetsketch
 	return
 
-BattleFrontier_BattleDomeBattleRoom_OnWarp: @ 824C481
+BattleFrontier_BattleDomeBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
@@ -501,20 +501,20 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects:: @ 824C48B
 	removeobject LOCALID_OPPONENT
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp
-BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects:: @ 824C4EF
+BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects::
 	end
 
-BattleFrontier_BattleDomeBattleRoom_OnResume: @ 824C4F0
+BattleFrontier_BattleDomeBattleRoom_OnResume:
 	compare VAR_TEMP_9, 1
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience
 	end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience:: @ 824C4FC
+BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience::
 	call BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience
 	return
 
 @ Add audience members to supplement the permanent object event audience
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: @ 824C502
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience::
 	compare VAR_TEMP_F, DOME_ROUND1
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience
 	compare VAR_TEMP_F, DOME_ROUND2
@@ -525,10 +525,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: @ 824C502
 	call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: @ 824C52F
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience::
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience::
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -542,7 +542,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: @ 824C530
 	createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience::
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH
@@ -563,10 +563,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: @ 824C594
 	createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH
-	createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, 1
+	createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
+BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience::
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH
@@ -601,27 +601,27 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: @ 824C652
 	createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH
 	return
 
-BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: @ 824C773
+BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter: @ 824C775
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter:
 	set_visible
 	delay_16
 	walk_up
 	walk_up
 	walk_up
 	walk_right
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward: @ 824C77B
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward:
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience: @ 824C77D
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerApproachAudience:
 	walk_up
 	step_end
 
 @ Identical to Movement_PlayerEnter
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker: @ 824C77F
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker:
 	set_visible
 	delay_16
 	walk_up
@@ -631,20 +631,20 @@ BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnterForTucker: @ 824C77F
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2: @ 824C787
+BattleFrontier_BattleDomeBattleRoom_Movement_PlayerStepForward2:
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward: @ 824C789
+BattleFrontier_BattleDomeBattleRoom_Movement_OpponentStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp: @ 824C78B
+BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisibleFacingUp:
 	face_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance: @ 824C78E
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance:
 	set_visible
 	walk_up
 	walk_up
@@ -753,7 +753,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_TuckerEnterAndDance: @ 824C78E
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance: @ 824C7F9
+BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance:
 	delay_16
 	delay_16
 	walk_left
@@ -803,16 +803,16 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance: @ 8
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward: @ 824C829
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward:
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer: @ 824C82B
+BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer:
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround:: @ 824C82E
+BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround::
 	turnvobject 0, DIR_EAST
 	turnvobject 2, DIR_EAST
 	turnvobject 4, DIR_EAST
@@ -881,7 +881,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround:: @ 824C82E
 	delay 20
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: @ 824C8F5
+BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles
@@ -889,13 +889,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: @ 824C8F5
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824C90F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11
 	waitstate
 	end
 
 @ On round 1 there's a 50% chance that a specific audience member will walk to his seat
-BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: @ 824C919
+BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos::
 	random 2
 	copyvar VAR_TEMP_D, VAR_RESULT
 	compare VAR_TEMP_D, 0
@@ -904,13 +904,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: @
 	setobjectmovementtype LOCALID_AUDIENCE_WALKING, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat:: @ 824C938
+BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat::
 	compare VAR_TEMP_D, 0
 	goto_if_eq Common_EventScript_NopReturn
 	applymovement LOCALID_AUDIENCE_WALKING, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat
 	return
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump: @ 824C94B
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump:
 	delay_16
 	delay_16
 	delay_16
@@ -931,7 +931,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AudienceTwinJump: @ 824C94B
 	enable_jump_landing_ground_effect
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat: @ 824C95E
+BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat:
 	walk_down
 	walk_down
 	walk_right
@@ -939,52 +939,52 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat: @ 824C95E
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter: @ 824C964
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter:
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft: @ 824C969
+BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft:
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit: @ 824C96B
+BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit:
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome: @ 824C970
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome:
 	.string "{PLAYER} has entered the BATTLE DOME!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer: @ 824C990
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer:
 	.string "{STR_VAR_1}\n"
 	.string "match!\p"
 	.string "{PLAYER} versus {STR_VAR_2}!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner: @ 824C9BE
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsWinner:
 	.string "{PLAYER} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner: @ 824C9E1
+BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner:
 	.string "{STR_VAR_2} is the winner!\n"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ: @ 824CA04
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ:
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp: @ 824CA44
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp:
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait: @ 824CA86
+BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait:
 	.string "What an unbelievable finish!\n"
 	.string "We have a double knockout!\p"
 	.string "In this event, the Battle Tournament\n"
@@ -992,7 +992,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereeDecisionPleaseWait: @ 824CA86
 	.string "Please wait while the judging\n"
 	.string "is under way.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer: @ 824CB34
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -1000,7 +1000,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer: @ 824CB34
 	.string "The winner is {STR_VAR_1}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer: @ 824CB9D
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"
@@ -1008,85 +1008,85 @@ BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerPlayer: @ 824CB9D
 	.string "The winner is {PLAYER}!\l"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope: @ 824CC06
+BattleFrontier_BattleDomeBattleRoom_Text_BrightNewHope:
 	.string "The bright new hope!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RisingStar: @ 824CC1C
+BattleFrontier_BattleDomeBattleRoom_Text_RisingStar:
 	.string "The rising star!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship: @ 824CC2E
+BattleFrontier_BattleDomeBattleRoom_Text_WillTheyRaceToChampionship:
 	.string "Will this TRAINER race to\n"
 	.string "the championship?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry: @ 824CC5B
+BattleFrontier_BattleDomeBattleRoom_Text_CanAchieveChampionFirstTry:
 	.string "Can the feat of a championship\n"
 	.string "on the first try be achieved?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged: @ 824CC99
+BattleFrontier_BattleDomeBattleRoom_Text_CanLossBeAvenged:
 	.string "Can the loss of the last match\n"
 	.string "be avenged?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship: @ 824CCC5
+BattleFrontier_BattleDomeBattleRoom_Text_OnFireForChampionship:
 	.string "The TRAINER is on fire for\n"
 	.string "the first championship try!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal: @ 824CCFD
+BattleFrontier_BattleDomeBattleRoom_Text_WinHereAdvancesToFinal:
 	.string "A win here means this TRAINER\n"
 	.string "advances to the final!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue: @ 824CD33
+BattleFrontier_BattleDomeBattleRoom_Text_WillLongHeldDreamComeTrue:
 	.string "Will the long-held dream of\n"
 	.string "a championship finally come true?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion: @ 824CD72
+BattleFrontier_BattleDomeBattleRoom_Text_TheInvincibleChampion:
 	.string "The invincible champion!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer: @ 824CD8C
+BattleFrontier_BattleDomeBattleRoom_Text_CanAnyoneHopeToBeatTrainer:
 	.string "Can anyone hope to beat this\n"
 	.string "TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer: @ 824CDB3
+BattleFrontier_BattleDomeBattleRoom_Text_DoBattlesExistSolelyForTrainer:
 	.string "Do battles exist solely for\n"
 	.string "this TRAINER?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle: @ 824CDDE
+BattleFrontier_BattleDomeBattleRoom_Text_CurrentChampAimingToRetainTitle:
 	.string "The current champion aiming to\n"
 	.string "retain the title!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned: @ 824CE10
+BattleFrontier_BattleDomeBattleRoom_Text_FormerChampHasReturned:
 	.string "The former champion has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned: @ 824CE33
+BattleFrontier_BattleDomeBattleRoom_Text_FormerToughnessReturned:
 	.string "The former toughness has returned!\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals: @ 824CE57
+BattleFrontier_BattleDomeBattleRoom_Text_WillDoExpectedAdvanceToFinals:
 	.string "Will this TRAINER do as expected\n"
 	.string "and advance to the finals?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory: @ 824CE94
+BattleFrontier_BattleDomeBattleRoom_Text_WillFormerChampRegainGlory:
 	.string "Will the former champ regain\n"
 	.string "lost glory?\p"
 	.string "$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster: @ 824CEBE
+BattleFrontier_BattleDomeBattleRoom_Text_FeelGlowOfTrueMaster:
 	.string "Feel the glow of a true master!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker: @ 824CEDE
+BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker:
 	.string "And now… The TRAINER standing in\n"
 	.string "{PLAYER}'s record-setting path…\p"
 	.string "Yes! The one and only!\n"
@@ -1094,11 +1094,11 @@ BattleFrontier_BattleDomeBattleRoom_Text_MakeWayForDomeAceTucker: @ 824CEDE
 	.string "Our very own DOME ACE!\l"
 	.string "Make way for TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant: @ 824CF7A
+BattleFrontier_BattleDomeBattleRoom_Text_SpectatorTuckerChant:
 	.string "Spectators: TUCKER! TUCKER!\n"
 	.string "TUCKER! TUCKER! TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro: @ 824CFAE
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro:
 	.string "TUCKER: Ahahah!\p"
 	.string "Do you hear it? This crowd!\n"
 	.string "They're all itching to see our match!\p"
@@ -1110,37 +1110,37 @@ BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro: @ 824CFAE
 	.string "I, TUCKER the DOME ACE, will bathe you\l"
 	.string "in my brilliant glow!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy: @ 824D0D9
+BattleFrontier_BattleDomeBattleRoom_Text_LetsSeeYourStrategy:
 	.string "Your strategy!\n"
 	.string "Let's see it!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer: @ 824D0F6
+BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer:
 	.string "Unbelievable! It's incredible!\n"
 	.string "The victor is {PLAYER}!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker: @ 824D127
+BattleFrontier_BattleDomeBattleRoom_Text_WinnerIsTucker:
 	.string "The winner is TUCKER!\n"
 	.string "The DOME ACE has prevailed!\p"
 	.string "Congratulations, TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass: @ 824D172
+BattleFrontier_BattleDomeBattleRoom_Text_SeeYourFrontierPass:
 	.string "TUCKER: Rules are rules!\n"
 	.string "Let me see your FRONTIER PASS.$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol: @ 824D1AA
+BattleFrontier_BattleDomeBattleRoom_Text_ReceivedTacticsSymbol:
 	.string "The Tactics Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime: @ 824D1E0
+BattleFrontier_BattleDomeBattleRoom_Text_WontUnderestimateYouNextTime:
 	.string "… … … … … …\p"
 	.string "I sorely underestimated you. I won't\n"
 	.string "make the same mistake next time…$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched: @ 824D232
+BattleFrontier_BattleDomeBattleRoom_Text_CanWinStreakBeStretched:
 	.string "Can the win streak be stretched?\n"
 	.string "The confidence is there!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker: @ 824D26C
+BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker:
 	.string "Ladies and gentlemen!\n"
 	.string "Boys, girls, and POKéMON!\p"
 	.string "Finally!\n"
@@ -1149,7 +1149,7 @@ BattleFrontier_BattleDomeBattleRoom_Text_LegendHasReturnedDomeAceTucker: @ 824D2
 	.string "Our very own DOME ACE!\l"
 	.string "It's none other than TUCKER!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro: @ 824D319
+BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro:
 	.string "TUCKER: Ah…\n"
 	.string "The pummeling roar of the crowd…\l"
 	.string "Their furnace-like heat of excitement…\l"
@@ -1161,22 +1161,22 @@ BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro: @ 824D319
 	.string "Brighter and more brilliant!\l"
 	.string "I must light all that gather here!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess: @ 824D43E
+BattleFrontier_BattleDomeBattleRoom_Text_UnleashAllPowerIPossess:
 	.string "I will unleash all the power that\n"
 	.string "I possess! Right here and now!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed: @ 824D47F
+BattleFrontier_BattleDomeBattleRoom_Text_NeverLostWhenPowerUnleashed:
 	.string "TUCKER: You're genuinely fantastic!\p"
 	.string "Never before! I haven't ever lost in the\n"
 	.string "times I've had to unleash my power.\p"
 	.string "Yes, quite fantastic!\n"
 	.string "Your FRONTIER PASS, please?$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine: @ 824D522
+BattleFrontier_BattleDomeBattleRoom_Text_TacticsSymbolTookGoldenShine:
 	.string "The Tactics Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter: @ 824D54D
+BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter:
 	.string "You're strong, but above all,\n"
 	.string "you have a unique charm!\p"
 	.string "In you, I see a definite potential for\n"
@@ -1185,23 +1185,23 @@ BattleFrontier_BattleDomeBattleRoom_Text_LookForwardToNextEncounter: @ 824D54D
 	.string "our next encounter!$"
 
 @ Unused
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ2: @ 824D5F5
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLv50Champ2:
 	.string "{PLAYER} is the Level 50\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
 @ Unused
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp2: @ 824D635
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerIsLvOpenChamp2:
 	.string "{PLAYER} is the Open Level\n"
 	.string "Battle Tournament Champion!\p"
 	.string "Congratulations!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker: @ 824D677
+BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTucker:
 	.string "The final match!\p"
 	.string "{PLAYER} versus the DOME ACE, TUCKER!\p"
 	.string "Let the battle begin!$"
 
-BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker: @ 824D6BE
+BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTucker:
 	.string "The REFEREES have reached\n"
 	.string "a decision!\p"
 	.string "The winner is…\n"

data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc

@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleDomeCorridor_MapScripts:: @ 824B0FE
+BattleFrontier_BattleDomeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleDomeCorridor_OnFrame: @ 824B104
+BattleFrontier_BattleDomeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
+BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor::
 	delay 16
 	setvar VAR_TEMP_0, 1
 	frontier_get FRONTIER_DATA_LVL_MODE
@@ -26,7 +26,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor:: @ 824B10E
 	waitdooranim
 	goto BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom
 
-BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
+BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen
 	waitmovement 0
@@ -37,14 +37,14 @@ BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen:: @ 824B161
 	waitmovement 0
 	closedoor 37, 3
 	waitdooranim
-BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: @ 824B18F
+BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom::
 	waitmovement 0
 	setvar VAR_0x8006, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7
 	waitstate
 	end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50:
 	walk_up
 	walk_left
 	walk_left
@@ -59,13 +59,13 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50: @ 824B1A1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: @ 824B1AE
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50:
 	walk_left
 	walk_left
 	walk_left
@@ -79,12 +79,12 @@ BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50: @ 824B1B2
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50: @ 824B1BE
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLv50:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
+BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen:
 	walk_up
 	walk_right
 	walk_right
@@ -103,13 +103,13 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen: @ 824B1C1
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: @ 824B1D2
+BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen:
 	walk_right
 	walk_right
 	walk_right
@@ -127,13 +127,13 @@ BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLvOpen: @ 824B1D6
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen: @ 824B1E6
+BattleFrontier_BattleDomeCorridor_Movement_AttendantEnterDoorLvOpen:
 	walk_up
 	set_invisible
 	step_end
 
 @ Unused
-BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight: @ 824B1E9
+BattleFrontier_BattleDomeCorridor_Movement_WalkToBattleRoomMidRight:
 	walk_up
 	walk_right
 	walk_right

data/maps/BattleFrontier_BattleDomeLobby/scripts.inc

@@ -1,26 +1,26 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattleDomeLobby_MapScripts:: @ 82497E2
+BattleFrontier_BattleDomeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattleDomeLobby_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomeLobby_OnResume: @ 82497F2
+BattleFrontier_BattleDomeLobby_OnResume:
 	dome_initresultstree
 	end
 
-BattleFrontier_BattleDomeLobby_OnWarp: @ 82497FB
+BattleFrontier_BattleDomeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth:: @ 8249805
+BattleFrontier_BattleDomeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
+BattleFrontier_BattleDomeLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge
@@ -28,11 +28,11 @@ BattleFrontier_BattleDomeLobby_OnFrame: @ 824980F
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleDomeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus:: @ 8249839
+BattleFrontier_BattleDomeLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
+BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -44,7 +44,7 @@ BattleFrontier_BattleDomeLobby_EventScript_QuitWithoutSaving:: @ 8249842
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
+BattleFrontier_BattleDomeLobby_EventScript_WonChallenge::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	lockall
 	frontier_isbrain
@@ -53,9 +53,9 @@ BattleFrontier_BattleDomeLobby_EventScript_WonChallenge:: @ 824989B
 	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce:: @ 82498C1
+BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce::
 	msgbox BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
+BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -71,7 +71,7 @@ BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints:: @ 82498C9
 	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle
 
-BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
+BattleFrontier_BattleDomeLobby_EventScript_LostChallenge::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved
@@ -83,7 +83,7 @@ BattleFrontier_BattleDomeLobby_EventScript_LostChallenge:: @ 8249940
 	dome_set DOME_DATA_ATTEMPTED_CHALLENGE, TRUE
 	special LoadPlayerParty
 	special HealPlayerParty
-BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
+BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle::
 	dome_save 0
 	playse SE_SAVE
 	waitse
@@ -98,16 +98,16 @@ BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle:: @ 8249991
 	case 0, BattleFrontier_BattleDomeLobby_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_RecordBattle:: @ 82499E4
+BattleFrontier_BattleDomeLobby_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleDomeLobby_EventScript_EndChallenge:: @ 82499E9
+BattleFrontier_BattleDomeLobby_EventScript_EndChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
+BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou, MSGBOX_DEFAULT
 	message BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2
@@ -119,7 +119,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ResumeChallenge:: @ 82499F9
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
@@ -127,7 +127,7 @@ BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendant:: @ 8249A35
 	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_DOME
@@ -135,13 +135,13 @@ BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant:: @ 8249A47
 	goto BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome:: @ 8249A59
+BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome::
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
-BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
+BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -154,7 +154,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: @ 8249A72
 	case 2, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
+BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -180,7 +180,7 @@ BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge:: @ 8249ABF
 	case YES, BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
+BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	dome_init
@@ -194,7 +194,7 @@ BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge:: @ 8249B60
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
 	dome_inittrainers
-BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
+BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	dome_settrainers
@@ -207,39 +207,39 @@ BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: @ 8249BC2
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge:: @ 8249BFA
+BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
 	goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons:: @ 8249C15
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50:: @ 8249C30
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8249C3D
+BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed:: @ 8249C4A
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge:: @ 8249C61
+BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge:: @ 8249C64
+BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain, MSGBOX_DEFAULT
-BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge:: @ 8249C6C
+BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
+BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -264,63 +264,63 @@ BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: @ 8249C6E
 	waitdooranim
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor:: @ 8249CDD
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor::
 	applymovement LOCALID_ATTENDANT_SINGLES, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor:: @ 8249CE5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor::
 	applymovement LOCALID_ATTENDANT_DOUBLES, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor:: @ 8249CED
+BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor::
 	applymovement LOCALID_ATTENDANT_SINGLES, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor:: @ 8249CF5
+BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor::
 	applymovement LOCALID_ATTENDANT_DOUBLES, BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles:: @ 8249CFD
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles:: @ 8249D06
+BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge:: @ 8249D0F
+BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge:: @ 8249D15
+BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge::
 	message BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge:: @ 8249D1B
+BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge:: @ 8249D24
+BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor:: @ 8249D2D
+BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor::
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor:: @ 8249D33
+BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor::
 	opendoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor:: @ 8249D39
+BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor::
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor:: @ 8249D3F
+BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor::
 	closedoor 17, 4
 	return
 
-BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
+BattleFrontier_BattleDomeLobby_Movement_WalkToDoor:
 	walk_up
 	walk_up
 	walk_up
@@ -328,18 +328,18 @@ BattleFrontier_BattleDomeLobby_Movement_WalkToDoor: @ 8249D45
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor: @ 8249D4B
+BattleFrontier_BattleDomeLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor: @ 8249D4E
+BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
+BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -347,7 +347,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowSinglesResults:: @ 8249D52
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
+BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_DOME, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -355,7 +355,7 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults:: @ 8249D6B
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
+BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree::
 	dome_get DOME_DATA_PREV_TOURNEY_TYPE
 	compare VAR_RESULT, 0
 	call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50
@@ -370,61 +370,61 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: @ 8249D84
 	waitstate
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50:: @ 8249DC9
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50:: @ 8249DD2
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen:: @ 8249DDB
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen:: @ 8249DE4
+BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen::
 	msgbox BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen, MSGBOX_SIGN
 	return
 
-BattleFrontier_BattleDomeLobby_EventScript_Maniac:: @ 8249DED
+BattleFrontier_BattleDomeLobby_EventScript_Maniac::
 	dome_getwinnersname
 	msgbox BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_Lass:: @ 8249DFE
+BattleFrontier_BattleDomeLobby_EventScript_Lass::
 	msgbox BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_FatMan:: @ 8249E07
+BattleFrontier_BattleDomeLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_Man:: @ 8249E10
+BattleFrontier_BattleDomeLobby_EventScript_Man::
 	msgbox BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully, MSGBOX_NPC
 	end
 
 @ A few OutsideWest event scripts are inserted here instead, two of which are unused
-BattleFrontier_OutsideWest_EventScript_Man3:: @ 8249E19
+BattleFrontier_OutsideWest_EventScript_Man3::
 	msgbox BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_BattleDomeSign2:: @ 8249E22
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign2::
 	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign2, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnderConstructionSign:: @ 8249E2B
+BattleFrontier_OutsideWest_EventScript_UnderConstructionSign::
 	msgbox BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesBoard:: @ 8249E34
+BattleFrontier_BattleDomeLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleDomeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
+BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 4, MULTI_BATTLE_DOME_RULES, FALSE
@@ -436,40 +436,40 @@ BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard:: @ 8249E43
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup:: @ 8249E8B
+BattleFrontier_BattleDomeLobby_EventScript_RulesMatchup::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree:: @ 8249E99
+BattleFrontier_BattleDomeLobby_EventScript_RulesTourneyTree::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO:: @ 8249EA7
+BattleFrontier_BattleDomeLobby_EventScript_RulesDoubleKO::
 	msgbox BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleDomeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleDomeLobby_EventScript_ExitRules:: @ 8249EB5
+BattleFrontier_BattleDomeLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle: @ 8249EB7
+BattleFrontier_BattleDomeLobby_Text_WelcomeSingleBattle:
 	.string "Where the strategies of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE DOME!\p"
 	.string "I am your guide to the SINGLE BATTLE\n"
 	.string "Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge: @ 8249F3A
+BattleFrontier_BattleDomeLobby_Text_TakeSinglesChallenge:
 	.string "Would you like to challenge\n"
 	.string "the SINGLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain: @ 8249F74
+BattleFrontier_BattleDomeLobby_Text_HopeToSeeYouAgain:
 	.string "We hope to see you again.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
+BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge:
 	.string "The SINGLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of SINGLE BATTLES.\p"
@@ -490,20 +490,20 @@ BattleFrontier_BattleDomeLobby_Text_ExplainSinglesChallenge: @ 8249F8E
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge: @ 824A1C6
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before I show you to the BATTLE DOME,\n"
 	.string "I must save the data. Is that okay?$"
 
-BattleFrontier_BattleDomeLobby_Text_WhichLevelMode: @ 824A210
+BattleFrontier_BattleDomeLobby_Text_WhichLevelMode:
 	.string "The tournament offers two levels\n"
 	.string "of challenge, Level 50 and Open Level.\l"
 	.string "Which is your choice?$"
 
-BattleFrontier_BattleDomeLobby_Text_SelectThreeMons: @ 824A26E
+BattleFrontier_BattleDomeLobby_Text_SelectThreeMons:
 	.string "Now select the three POKéMON that\n"
 	.string "you wish to enter, please.$"
 
-BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "Also, the POKéMON must be holding\n"
@@ -511,7 +511,7 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen: @ 824A2AB
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50:
 	.string "Excuse me!\p"
 	.string "You don't have three eligible POKéMON.\p"
 	.string "You must have three different POKéMON\n"
@@ -521,63 +521,63 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50: @ 824A353
 	.string "EGGS{STR_VAR_1} ineligible.\p"
 	.string "Please come see me when you are ready.$"
 
-BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome: @ 824A437
+BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome:
 	.string "I will now show you to\n"
 	.string "the BATTLE DOME.$"
 
-BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting: @ 824A45F
+BattleFrontier_BattleDomeLobby_Text_DidntSaveBeforeQuitting:
 	.string "Excuse me!\p"
 	.string "You didn't save before you quit your\n"
 	.string "challenge last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. Sorry!$"
 
-BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney: @ 824A4E9
+BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney:
 	.string "Congratulations for winning\n"
 	.string "your Battle Tournament!$"
 
 @ Unused
-BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize: @ 824A51D
+BattleFrontier_BattleDomeLobby_Text_HereIsYourPrize:
 	.string "Here is your prize for your Battle\n"
 	.string "Tournament victory.$"
 
 @ Used by Verdanturf Tent
-BattleFrontier_BattleDomeLobby_Text_ReceivedPrize: @ 824A554
+BattleFrontier_BattleDomeLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom: @ 824A56E
+BattleFrontier_BattleDomeLobby_Text_BagFullMakeRoom:
 	.string "Oh, your BAG appears to be full.\p"
 	.string "Please make room in your BAG, then come\n"
 	.string "see me.$"
 
-BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying: @ 824A5BF
+BattleFrontier_BattleDomeLobby_Text_ThankYouForPlaying:
 	.string "Thank you for playing!$"
 
-BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved: @ 824A5D6
+BattleFrontier_BattleDomeLobby_Text_RecordWillBeSaved:
 	.string "Your record will be saved.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou: @ 824A5FE
+BattleFrontier_BattleDomeLobby_Text_WeveBeenWaitingForYou:
 	.string "We've been waiting for you!$"
 
-BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2: @ 824A61A
+BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge2:
 	.string "Before I show you to the BATTLE DOME,\n"
 	.string "I must save the data. Is that okay?$"
 
-BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle: @ 824A664
+BattleFrontier_BattleDomeLobby_Text_WelcomeDoubleBattle:
 	.string "Where the strategies of TRAINERS\n"
 	.string "are put to the test!\p"
 	.string "Welcome to the BATTLE DOME!\p"
 	.string "I am your guide to the DOUBLE BATTLE\n"
 	.string "Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge: @ 824A6E7
+BattleFrontier_BattleDomeLobby_Text_TakeDoublesChallenge:
 	.string "Would you like to challenge\n"
 	.string "the DOUBLE BATTLE Tournament?$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
+BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge:
 	.string "The DOUBLE BATTLE Tournament\n"
 	.string "is exactly as the name suggests--\l"
 	.string "a tournament of DOUBLE BATTLES.\p"
@@ -598,23 +598,23 @@ BattleFrontier_BattleDomeLobby_Text_ExplainDoublesChallenge: @ 824A721
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50: @ 824A966
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLv50:
 	.string "They're the results of the last\n"
 	.string "Level 50 SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50: @ 824A9A9
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLv50:
 	.string "They're the results of the last\n"
 	.string "Level 50 DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen: @ 824A9EC
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsSinglesLvOpen:
 	.string "They're the results of the last\n"
 	.string "Open Level SINGLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen: @ 824AA31
+BattleFrontier_BattleDomeLobby_Text_PrevTourneyResultsDoublesLvOpen:
 	.string "They're the results of the last\n"
 	.string "Open Level DOUBLE BATTLE Tournament.$"
 
-BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
+BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough:
 	.string "Did you see it?\n"
 	.string "The last Battle Tournament?\p"
 	.string "The winner, {STR_VAR_1}, was seriously\n"
@@ -622,21 +622,21 @@ BattleFrontier_BattleDomeLobby_Text_LastWinnerWasTough: @ 824AA76
 	.string "You should check out the results\n"
 	.string "on the monitor beside the PC.$"
 
-BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier: @ 824AB06
+BattleFrontier_OutsideWest_Text_LongDreamedAboutBattleFrontier:
 	.string "The BATTLE FRONTIER…\n"
 	.string "I've long dreamed about a place like it.$"
 
 @ Functionally unused
-BattleFrontier_OutsideWest_Text_BattleDomeSign2: @ 824AB44
+BattleFrontier_OutsideWest_Text_BattleDomeSign2:
 	.string "The BATTLE DOME\n"
 	.string "Become the Unbeatable Superstar!$"
 
 @ Functionally unused
-BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction: @ 824AB75
+BattleFrontier_OutsideWest_Text_QuestionMarkUnderConstruction:
 	.string "The ??????\n"
 	.string "Under Construction!$"
 
-BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 824AB94
+BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation:
 	.string "When a TRAINER chains tournament\n"
 	.string "wins at the BATTLE DOME, he or she\l"
 	.string "gains a reputation as a star.\p"
@@ -645,48 +645,48 @@ BattleFrontier_BattleDomeLobby_Text_WinnersGainReputation: @ 824AB94
 	.string "A true superstar is a TRAINER who\n"
 	.string "can keep winning tournaments.$"
 
-BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound: @ 824AC76
+BattleFrontier_BattleDomeLobby_Text_TrashedInFirstRound:
 	.string "I ran into one of the tournament\n"
 	.string "favorites in the very first round.\p"
 	.string "Of course I got trashed…$"
 
-BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully: @ 824ACD3
+BattleFrontier_BattleDomeLobby_Text_NeedToCheckOpponentCarefully:
 	.string "I would've won if I'd kept this POKéMON\n"
 	.string "held in reserve.\p"
 	.string "You need to check your opponent's\n"
 	.string "POKéMON carefully before choosing\l"
 	.string "your battling POKéMON.$"
 
-BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker: @ 824AD67
+BattleFrontier_BattleDomeLobby_Text_CongratsDefeatedTucker:
 	.string "Congratulations!\p"
 	.string "You defeated the DOME ACE and won\n"
 	.string "the Battle Tournament!$"
 
-BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints: @ 824ADB1
+BattleFrontier_BattleDomeLobby_Text_AwardTheseBattlePoints:
 	.string "In recognition of your strategy--\n"
 	.string "a thing of beauty it was, too--\l"
 	.string "we award you these Battle Point(s)!$"
 
-BattleFrontier_BattleDomeLobby_Text_RecordLastMatch: @ 824AE17
+BattleFrontier_BattleDomeLobby_Text_RecordLastMatch:
 	.string "Would you like to record your\n"
 	.string "last BATTLE DOME match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleDomeLobby_Text_RulesAreListed: @ 824AE63
+BattleFrontier_BattleDomeLobby_Text_RulesAreListed:
 	.string "The Battle Tournament rules\n"
 	.string "are listed.$"
 
-BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading: @ 824AE8B
+BattleFrontier_BattleDomeLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules: @ 824AEAE
+BattleFrontier_BattleDomeLobby_Text_ExplainMatchupRules:
 	.string "The tournament matchups are drawn up\n"
 	.string "based on the toughness of POKéMON\l"
 	.string "held by TRAINERS.\p"
 	.string "The matchups avoid having tough\n"
 	.string "TRAINERS face each other right away.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 824AF4C
+BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree:
 	.string "The tournament chart, or as we call it,\n"
 	.string "the “Tree,” is available for viewing\l"
 	.string "in the Waiting Room from any guide.\p"
@@ -697,7 +697,7 @@ BattleFrontier_BattleDomeLobby_Text_ExplainTourneyTree: @ 824AF4C
 	.string "by TRAINERS, and the battle styles of\l"
 	.string "TRAINERS.$"
 
-BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules: @ 824B073
+BattleFrontier_BattleDomeLobby_Text_ExplainDoubleKORules:
 	.string "If battling POKéMON faint at the same\n"
 	.string "time--a double KO--in a tournament\l"
 	.string "match, the REFEREES will review\l"

data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc

@@ -1,24 +1,24 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleDomePreBattleRoom_MapScripts:: @ 824B1F9
+BattleFrontier_BattleDomePreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomePreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_OnWarp: @ 824B204
+BattleFrontier_BattleDomePreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth:: @ 824B20E
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_OnFrame: @ 824B218
+BattleFrontier_BattleDomePreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
+BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
@@ -26,7 +26,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: @ 824B222
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
 	waitmovement 0
 	lockall
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B24F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound::
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage
 	waitmessage
 	switch VAR_RESULT  @ No case?
@@ -43,7 +43,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound:: @ 824B
 	case 5, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:: @ 824B2C1
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord::
 	multichoice 16, 2, MULTI_TOURNEY_NO_RECORD, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
@@ -53,7 +53,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord:
 	case 4, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -62,18 +62,18 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRecordBattle:: @ 824B30D
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle:: @ 824B33F
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge:: @ 824B349
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 	case YES, BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B377
+BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -82,11 +82,11 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskRetireChallenge:: @ 824B37
 	case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge:: @ 824B3A9
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RetireChallenge::
 	dome_resolvewinners DOME_PLAYER_RETIRED
 	goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	dome_save CHALLENGE_STATUS_PAUSED
@@ -96,21 +96,21 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_PauseChallenge:: @ 824B3BB
 	frontier_reset
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo:: @ 824B3DD
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer, MSGBOX_DEFAULT
 	fadescreen FADE_TO_BLACK
 	dome_showopponentinfo
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree:: @ 824B3F5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowTourneyTree::
 	call BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage
 	fadescreen FADE_TO_BLACK
 	dome_showtourneytree
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1
@@ -119,23 +119,23 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowRoundMessage:: @ 824B40A
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1:: @ 824B449
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound1::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2:: @ 824B452
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInRound2::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals:: @ 824B45B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInSemifinals::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals:: @ 824B464
+BattleFrontier_BattleDomePreBattleRoom_EventScript_TourneyInFinals::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons
 	waitmessage
 	waitbuttonpress
@@ -168,7 +168,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge:: @ 824B46D
 	waitstate
 	end
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @ 824B4FB
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1
@@ -177,19 +177,19 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForNextRoundMessage:: @
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1:: @ 824B53A
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound1::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2:: @ 824B540
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForRound2::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals:: @ 824B546
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForSemifinals::
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals::
 	frontier_getbrainstatus
 	switch VAR_RESULT
 	case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver
@@ -199,27 +199,27 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForFinals:: @ 824B54C
 	message BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver:: @ 824B58B
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilver::
 	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold:: @ 824B5A0
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGold::
 	goto_if_set FLAG_TEMP_1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort:: @ 824B5B5
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerSilverShort::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort:: @ 824B5BE
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReadyForTuckerGoldShort::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
+BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle::
 	setvar VAR_TEMP_0, 1
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	special LoadPlayerParty
@@ -233,7 +233,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle:: @ 824B5C7
 	waitstate
 	goto BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B600
+BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	switch VAR_RESULT
 	case DOME_ROUND2, BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete
@@ -241,136 +241,136 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_RoundCompleteMessage:: @ 824B
 	case DOME_FINAL, BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete:: @ 824B634
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round1Complete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete:: @ 824B63D
+BattleFrontier_BattleDomePreBattleRoom_EventScript_Round2Complete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete:: @ 824B646
+BattleFrontier_BattleDomePreBattleRoom_EventScript_SemifinalsComplete::
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside: @ 824B64F
+BattleFrontier_BattleDomePreBattleRoom_Movement_AttendantMoveAside:
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter: @ 824B652
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor: @ 824B657
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerWalkToDoor:
 	walk_up
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor: @ 824B659
+BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1: @ 824B65C
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound1:
 	.string "Your 1st-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2: @ 824B689
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForRound2:
 	.string "Your 2nd-round match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals: @ 824B6B6
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForSemifinals:
 	.string "Your semifinal match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals: @ 824B6E3
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForFinals:
 	.string "Your final match is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons: @ 824B70C
+BattleFrontier_BattleDomePreBattleRoom_Text_ChooseTwoMons:
 	.string "Please choose the two POKéMON\n"
 	.string "that are to appear in battle.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay: @ 824B748
+BattleFrontier_BattleDomePreBattleRoom_Text_RightThisWay:
 	.string "Right this way, please.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth: @ 824B760
+BattleFrontier_BattleDomePreBattleRoom_Text_RestoreMonsToFullHealth:
 	.string "Thank you for competing!\p"
 	.string "I'll restore your POKéMON to\n"
 	.string "full health.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete: @ 824B7A3
+BattleFrontier_BattleDomePreBattleRoom_Text_Round1Complete:
 	.string "All 1st-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete: @ 824B7F1
+BattleFrontier_BattleDomePreBattleRoom_Text_Round2Complete:
 	.string "All 2nd-round matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete: @ 824B83F
+BattleFrontier_BattleDomePreBattleRoom_Text_SemifinalsComplete:
 	.string "All semifinal matches have been\n"
 	.string "completed.\p"
 	.string "These are the teams that advanced!$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2: @ 824B88D
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForRound2:
 	.string "Congratulations for getting through\n"
 	.string "the 1st round.\p"
 	.string "The 2nd round is next.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals: @ 824B8E6
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForSemifinals:
 	.string "Congratulations for advancing\n"
 	.string "to the semifinals.\p"
 	.string "The best four teams meet in this round.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals: @ 824B94E
+BattleFrontier_BattleDomePreBattleRoom_Text_CongratsReadyForFinals:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "You're one win from the championship.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer: @ 824B9B5
+BattleFrontier_BattleDomePreBattleRoom_Text_PlayersNextOpponentIsTrainer:
 	.string "{PLAYER}'s next opponent\n"
 	.string "is this TRAINER.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1: @ 824B9D9
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound1:
 	.string "The tournament is in the 1st round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2: @ 824B9FD
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInRound2:
 	.string "The tournament is in the 2nd round.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals: @ 824BA21
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInSemifinals:
 	.string "The tournament is in the semifinals.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals: @ 824BA46
+BattleFrontier_BattleDomePreBattleRoom_Text_TourneyInFinals:
 	.string "The tournament is up to the final.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame: @ 824BA69
+BattleFrontier_BattleDomePreBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge: @ 824BA93
+BattleFrontier_BattleDomePreBattleRoom_Text_RetireYourChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Battle Tournament challenge?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait: @ 824BAD3
+BattleFrontier_BattleDomePreBattleRoom_Text_SavingDataPleaseWait:
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch: @ 824BAF7
+BattleFrontier_BattleDomePreBattleRoom_Text_RecordLastMatch:
 	.string "Should I record your last match\n"
 	.string "on your FRONTIER PASS?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
@@ -378,19 +378,19 @@ BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilver: @ 824BB2E
 	.string "Are you ready?$"
 
 @ Identical to ReadyForTuckerSilver
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold: @ 824BBAC
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGold:
 	.string "Congratulations for advancing\n"
 	.string "to the final match.\p"
 	.string "For the final match, you will challenge\n"
 	.string "the DOME ACE TUCKER.\p"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort: @ 824BC2A
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerSilverShort:
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 
 @ Identical again
-BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort: @ 824BC63
+BattleFrontier_BattleDomePreBattleRoom_Text_ReadyForTuckerGoldShort:
 	.string "Your final battle against TUCKER is\n"
 	.string "next. Are you ready?$"
 

data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc

@@ -7,7 +7,7 @@
 .set LOCALID_SCIENTIST_6, 7
 .set LOCALID_PLAYER, 8
 
-BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
+BattleFrontier_BattleFactoryBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleFactoryBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryBattleRoom_OnFrame
@@ -16,7 +16,7 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts:: @ 825ADAB
 	@ On this map the player (OBJ_EVENT_ID_PLAYER) is hidden
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_F
 
-BattleFrontier_BattleFactoryBattleRoom_OnTransition: @ 825ADBB
+BattleFrontier_BattleFactoryBattleRoom_OnTransition:
 	frontier_settrainers
 	checkplayergender
 	compare VAR_RESULT, MALE
@@ -29,37 +29,37 @@ BattleFrontier_BattleFactoryBattleRoom_OnTransition: @ 825ADBB
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj:: @ 825ADF3
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	setobjectxyperm LOCALID_OPPONENT, 7, 9
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_OnWarp: @ 825AE00
+BattleFrontier_BattleFactoryBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: @ 825AE0A
+BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects::
 	setvar VAR_TEMP_1, 1
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
 	hideobjectat LOCALID_OPPONENT, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: @ 825AE24
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects::
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale:: @ 825AE25
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale:: @ 825AE2B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_OnFrame: @ 825AE31
+BattleFrontier_BattleFactoryBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle:: @ 825AE3B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn, MSGBOX_DEFAULT
 	closemessage
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle
@@ -70,7 +70,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
+BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom::
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
@@ -83,7 +83,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: @ 825AE67
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter
 	waitmovement 0
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent::
 	compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland
 	palace_getopponentintro
@@ -99,20 +99,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: @ 825AEA7
 	waitstate
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost:: @ 825AEF8
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent:: @ 825AF0F
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent::
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
 	addvar VAR_RESULT, 1
 	setorcopyvar VAR_0x8006, VAR_RESULT
 	factory_set FACTORY_DATA_WIN_STREAK_SWAPS  @ uses VAR_0x8006 above
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak:: @ 825AF3E
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak::
 	call BattleFrontier_EventScript_IncrementWinStreak
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum:: @ 825AF43
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
 	frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
@@ -121,11 +121,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum:: @ 825AF4
 	setvar VAR_0x8006, 1
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8
 	waitstate
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon:: @ 825AF85
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland:: @ 825AF9C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland::
 	switch VAR_TEMP_F
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold
 	case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
@@ -135,14 +135,14 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland:: @ 825AF9C
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver:: @ 825AFEF
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B00C
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
@@ -158,20 +158,20 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: @ 825B
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold:: @ 825B051
+BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold:: @ 825B07E
+BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold::
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09B
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
@@ -187,7 +187,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: @ 825B09
 	msgbox BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle::
 	closemessage
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
 	special HealPlayerParty
@@ -197,7 +197,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle:: @ 825B0E0
 	waitstate
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: @ 825B105
+BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland::
 	factory_get FACTORY_DATA_WIN_STREAK_SWAPS
 	compare VAR_RESULT, MAX_STREAK
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
@@ -214,7 +214,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: @ 825B105
 	goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom: @ 825B17B
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -223,11 +223,11 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom: @ 825B17B
 	face_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland: @ 825B182
+BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland:
 	walk_right
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter: @ 825B184
+BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -236,14 +236,14 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter: @ 825B184
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle: @ 825B18B
+BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle:
 	walk_up
 	walk_up
 	walk_up
 	face_left
 	step_end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: @ 825B190
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles
@@ -251,12 +251,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: @ 825B190
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles:: @ 825B1AA
+BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: @ 825B1B4
+BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle::
 	applymovement LOCALID_SCIENTIST_1, Common_Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_SCIENTIST_2, Common_Movement_WalkInPlaceFastestRight
 	applymovement LOCALID_SCIENTIST_3, Common_Movement_WalkInPlaceFastestRight
@@ -266,11 +266,11 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: @ 825B
 	waitmovement 0
 	return
 
-BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn: @ 825B1E2
+BattleFrontier_BattleFactoryBattleRoom_Text_GetAMoveOn:
 	.string "Hey, hey!\n"
 	.string "Get a move on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead: @ 825B1FB
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead:
 	.string "Hey, my name's NOLAND!\n"
 	.string "I'm basically in charge of this place,\l"
 	.string "which is why I'm the FACTORY HEAD!\p"
@@ -287,26 +287,26 @@ BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead: @ 825B1FB
 	.string "conditions as you.\p"
 	.string "I'll be using rental POKéMON, too!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn: @ 825B3F1
+BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn:
 	.string "Shake out every last bit of your\n"
 	.string "knowledge and bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass: @ 825B42D
+BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass:
 	.string "NOLAND: Smart going!\n"
 	.string "Let's see your FRONTIER PASS.$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol: @ 825B460
+BattleFrontier_BattleFactoryBattleRoom_Text_ReceivedKnowledgeSymbol:
 	.string "The Knowledge Symbol was embossed\n"
 	.string "on the FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred: @ 825B498
+BattleFrontier_BattleFactoryBattleRoom_Text_NextTimeNoHoldsBarred:
 	.string "Heh…\n"
 	.string "You're a pretty bright spark…\p"
 	.string "Next time, I'll come after you hard.\n"
 	.string "No holds barred, understand?\p"
 	.string "You keep up your studies!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime: @ 825B517
+BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime:
 	.string "NOLAND: Hey, hey! How's it going?\n"
 	.string "You keeping up with your studies?\p"
 	.string "…Oh?\p"
@@ -315,21 +315,21 @@ BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime: @ 825B517
 	.string "Now, this should be fun!\n"
 	.string "I'm getting excited, hey!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn: @ 825B5CF
+BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn:
 	.string "All right!\n"
 	.string "Bring it on!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass: @ 825B5E7
+BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass:
 	.string "NOLAND: What the…\n"
 	.string "You're getting out of my league!\p"
 	.string "Sheesh!\n"
 	.string "Let's see that FRONTIER PASS!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine: @ 825B640
+BattleFrontier_BattleFactoryBattleRoom_Text_KnowledgeSymbolTookGoldenShine:
 	.string "The Knowledge Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou: @ 825B66D
+BattleFrontier_BattleFactoryBattleRoom_Text_LastTimeILoseToYou:
 	.string "Pfft, man!\p"
 	.string "That's absolutely the last time\n"
 	.string "I lose to you!\p"

data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc

@@ -1,21 +1,21 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattleFactoryLobby_MapScripts:: @ 82583E8
+BattleFrontier_BattleFactoryLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryLobby_OnWarp: @ 82583F3
+BattleFrontier_BattleFactoryLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth:: @ 82583FD
+BattleFrontier_BattleFactoryLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
+BattleFrontier_BattleFactoryLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge
@@ -23,11 +23,11 @@ BattleFrontier_BattleFactoryLobby_OnFrame: @ 8258407
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus:: @ 8258431
+BattleFrontier_BattleFactoryLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving:: @ 825843A
+BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting, MSGBOX_DEFAULT
 	closemessage
@@ -40,7 +40,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving:: @ 825843A
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: @ 825849B
+BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -49,10 +49,10 @@ BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: @ 825849B
 	waitmessage
 	goto BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead:: @ 82584BD
+BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead, MSGBOX_DEFAULT
 	waitmessage
-BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints:: @ 82584C6
+BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -66,7 +66,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints:: @ 82584C6
 	goto BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
+BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults
 	waitmessage
@@ -77,7 +77,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge:: @ 8258506
 	playse SE_SAVE
 	waitse
 
-BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
+BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle::
 	call BattleFrontier_EventScript_GetCantRecordBattle
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
@@ -89,16 +89,16 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: @ 825853B
 	case 0, BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
 
-BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle:: @ 825857D
+BattleFrontier_BattleFactoryLobby_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle:: @ 8258582
+BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_0, 255
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge:: @ 8258592
+BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume
 	waitmessage
@@ -110,7 +110,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_ResumeChallenge:: @ 8258592
 	setvar VAR_0x8006, 2
 	goto BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant:: @ 82585CB
+BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
@@ -118,19 +118,19 @@ BattleFrontier_BattleFactoryLobby_EventScript_SinglesAttendant:: @ 82585CB
 	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant:: @ 82585DD
+BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant::
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_FACTORY
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto BattleFrontier_BattleFactoryLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Attendant:: @ 82585ED
+BattleFrontier_BattleFactoryLobby_EventScript_Attendant::
 	special SavePlayerParty
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle
-BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
+BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -143,7 +143,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: @ 8258606
 	case 2, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
+BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -157,7 +157,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_TryEnterChallenge:: @ 8258653
 	case YES, BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge:: @ 82586B9
+BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	factory_init
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_SAVING
@@ -170,7 +170,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge:: @ 82586B9
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed
 	setvar VAR_0x8006, 0
-BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
+BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	msgbox BattleFrontier_BattleFactoryLobby_Text_StepThisWay, MSGBOX_DEFAULT
 	closemessage
@@ -186,71 +186,71 @@ BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: @ 825871A
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant:: @ 825875C
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_SINGLES
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant:: @ 8258762
+BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_DOUBLES
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge:: @ 8258768
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge
 	goto BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed:: @ 8258783
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825879A
+BattleFrontier_BattleFactoryLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge:: @ 825879D
+BattleFrontier_BattleFactoryLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor: @ 82587A7
+BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor: @ 82587AC
+BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle:: @ 82587B1
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle:: @ 82587BA
+BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge:: @ 82587C3
+BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge:: @ 82587C9
+BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge::
 	message BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge:: @ 82587CF
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge:: @ 82587D8
+BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults:: @ 82587E1
+BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -258,7 +258,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_ShowSinglesResults:: @ 82587E1
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults:: @ 82587FA
+BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_FACTORY, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -266,31 +266,31 @@ BattleFrontier_BattleFactoryLobby_EventScript_ShowDoublesResults:: @ 82587FA
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Woman:: @ 8258813
+BattleFrontier_BattleFactoryLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Camper:: @ 825881C
+BattleFrontier_BattleFactoryLobby_EventScript_Camper::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_Picnicker:: @ 8258825
+BattleFrontier_BattleFactoryLobby_EventScript_Picnicker::
 	lock
 	msgbox BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_FatMan:: @ 8258830
+BattleFrontier_BattleFactoryLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints, MSGBOX_NPC
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard:: @ 8258839
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattleFactoryLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
+BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 17, 0, MULTI_BATTLE_FACTORY_RULES, FALSE
@@ -304,47 +304,47 @@ BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard:: @ 8258848
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics:: @ 82588A6
+BattleFrontier_BattleFactoryLobby_EventScript_RulesBasics::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner:: @ 82588B4
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapPartner::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber:: @ 82588C2
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNumber::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes:: @ 82588D0
+BattleFrontier_BattleFactoryLobby_EventScript_RulesSwapNotes::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv:: @ 82588DE
+BattleFrontier_BattleFactoryLobby_EventScript_RulesOpenLv::
 	msgbox BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattleFactoryLobby_EventScript_ExitRules:: @ 82588EC
+BattleFrontier_BattleFactoryLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle: @ 82588EE
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForSingleBattle:
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Single Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge: @ 825897A
+BattleFrontier_BattleFactoryLobby_Text_TakeSinglesChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Swap Single challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge: @ 82589B3
+BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge:
 	.string "The Battle Swap Single Tournament\n"
 	.string "is a SINGLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -362,26 +362,26 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainSinglesChallenge: @ 82589B3
 	.string "If you don't save, you will be\n"
 	.string "disqualified from your challenge.$"
 
-BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit: @ 8258BC5
+BattleFrontier_BattleFactoryLobby_Text_LookForwardToNextVisit:
 	.string "We look forward to your next visit.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode: @ 8258BE9
+BattleFrontier_BattleFactoryLobby_Text_WhichLevelMode:
 	.string "Which level do you wish to challenge?\n"
 	.string "Level 50 or Open Level?$"
 
-BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge: @ 8258C27
+BattleFrontier_BattleFactoryLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before you begin your challenge,\n"
 	.string "I need to save the game. Is that okay?$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_WillHoldMonsForSafekeeping: @ 8258C6F
+BattleFrontier_BattleFactoryLobby_Text_WillHoldMonsForSafekeeping:
 	.string "Okay, I will hold your POKéMON for\n"
 	.string "safekeeping while you compete.$"
 
-BattleFrontier_BattleFactoryLobby_Text_StepThisWay: @ 8258CB1
+BattleFrontier_BattleFactoryLobby_Text_StepThisWay:
 	.string "Please step this way.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults: @ 8258CC7
+BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults:
 	.string "Thank you for participating!\p"
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.\p"
@@ -389,58 +389,58 @@ BattleFrontier_BattleFactoryLobby_Text_ReturnMonsSaveResults: @ 8258CC7
 	.string "Please wait.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_ReturnMons: @ 8258D54
+BattleFrontier_BattleFactoryLobby_Text_ReturnMons:
 	.string "I will return your POKéMON in exchange\n"
 	.string "for our rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins: @ 8258D93
+BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins:
 	.string "Congratulations! You've won seven\n"
 	.string "straight Battle Swap matches!$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_AwardBattlePointsForStreak: @ 8258DD3
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePointsForStreak:
 	.string "In recognition of your 7-win streak,\n"
 	.string "we award you these Battle Point(s).$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_MaxBattlePoints: @ 8258E1C
+BattleFrontier_BattleFactoryLobby_Text_MaxBattlePoints:
 	.string "Oh, oh, oh!\p"
 	.string "Your Battle Points are maxed.\p"
 	.string "Please come back after using\n"
 	.string "some Battle Points.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume: @ 8258E77
+BattleFrontier_BattleFactoryLobby_Text_WaitingForYouToResume:
 	.string "We've been waiting for you!\p"
 	.string "Before we resume your challenge,\n"
 	.string "I must save the game.$"
 
-BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting: @ 8258ECA
+BattleFrontier_BattleFactoryLobby_Text_DidntSaveBeforeQuitting:
 	.string "I'm sorry to say this, but you didn't\n"
 	.string "save before you quit playing last time.\p"
 	.string "As a result, you have been disqualified\n"
 	.string "from your challenge.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_WellReturnMons: @ 8258F55
+BattleFrontier_BattleFactoryLobby_Text_WellReturnMons:
 	.string "We'll return your personal POKéMON.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_ReceivedPrizeItem: @ 8258F79
+BattleFrontier_BattleFactoryLobby_Text_ReceivedPrizeItem:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle: @ 8258F93
+BattleFrontier_BattleFactoryLobby_Text_WelcomeForDoubleBattle:
 	.string "Where the intelligence of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE FACTORY!\p"
 	.string "I am your guide to the Battle Swap\n"
 	.string "Double Tournament.$"
 
-BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge: @ 825901F
+BattleFrontier_BattleFactoryLobby_Text_TakeDoublesChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Swap Double challenge?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge: @ 8259058
+BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge:
 	.string "The Battle Swap Double Tournament\n"
 	.string "is a DOUBLE BATTLE competition using\l"
 	.string "only rental POKéMON.\p"
@@ -458,28 +458,28 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainDoublesChallenge: @ 8259058
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead: @ 825926A
+BattleFrontier_BattleFactoryLobby_Text_CongratsForDefeatingHead:
 	.string "Congratulations for defeating\n"
 	.string "the FACTORY HEAD and winning\l"
 	.string "seven matches in a row!$"
 
-BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints: @ 82592BD
+BattleFrontier_BattleFactoryLobby_Text_AwardBattlePoints:
 	.string "In recognition of your wealth of\n"
 	.string "knowledge and keen intelligence,\l"
 	.string "we award you these Battle Point(s).$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave: @ 8259323
+BattleFrontier_BattleFactoryLobby_Text_ExchangeMonsAndSave:
 	.string "Let me exchange your POKéMON\n"
 	.string "for our rental POKéMON.\p"
 	.string "I need to save the battle data,\n"
 	.string "so please wait.$"
 
-BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch: @ 8259388
+BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch:
 	.string "Would you like to record your last\n"
 	.string "BATTLE FACTORY match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves: @ 82593D7
+BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves:
 	.string "Hi!\n"
 	.string "You, there!\p"
 	.string "Are you thinking that the events here\n"
@@ -491,26 +491,26 @@ BattleFrontier_BattleFactoryLobby_Text_NeedKnowledgeOfMonsMoves: @ 82593D7
 	.string "about POKéMON and their moves,\l"
 	.string "it will be tough to keep winning.$"
 
-BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon: @ 82594E5
+BattleFrontier_BattleFactoryLobby_Text_SwappedForWeakMon:
 	.string "I swapped for a weak POKéMON…\n"
 	.string "I thought it was a good kind to have…\p"
 	.string "They wiped the floor with us…$"
 
-BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons: @ 8259547
+BattleFrontier_BattleFactoryLobby_Text_NeedToCheckOpponentsMons:
 	.string "Things haven't been going my way\n"
 	.string "at all.\p"
 	.string "You need to check your opponent's\n"
 	.string "POKéMON during battle to see if\l"
 	.string "they're any good.$"
 
-BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints: @ 82595C4
+BattleFrontier_BattleFactoryLobby_Text_CantFigureOutStaffHints:
 	.string "You know how the staff here give you\n"
 	.string "a few hints about your next opponent?\p"
 	.string "Well, I'm a full-grown man, but I have\n"
 	.string "trouble figuring out their hints.$"
 
 @ Unused
-BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried: @ 8259658
+BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried:
 	.string "Like, I'm really tough, but I get bored\n"
 	.string "really easily, so I just kept swapping\l"
 	.string "and battling over and over.\p"
@@ -518,33 +518,33 @@ BattleFrontier_BattleFactoryLobby_Text_RentalMonsAreVaried: @ 8259658
 	.string "Battle Swap events, I noticed they\l"
 	.string "varied the rental POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_RulesAreListed: @ 8259721
+BattleFrontier_BattleFactoryLobby_Text_RulesAreListed:
 	.string "The Battle Swap rules are listed.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading: @ 8259743
+BattleFrontier_BattleFactoryLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules: @ 8259766
+BattleFrontier_BattleFactoryLobby_Text_ExplainBasicRules:
 	.string "In a Battle Swap event, you may use\n"
 	.string "only three POKéMON.\p"
 	.string "Whether you are renting or swapping,\n"
 	.string "your team may not have two or more\l"
 	.string "of the same POKéMON.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules: @ 82597FB
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapPartnerRules:
 	.string "You may swap POKéMON only with\n"
 	.string "the TRAINER you have just defeated.\p"
 	.string "You may swap for only those POKéMON\n"
 	.string "used by the beaten TRAINER.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules: @ 825987E
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNumberRules:
 	.string "After every battle you win, you may\n"
 	.string "swap for one of your defeated\l"
 	.string "opponent's POKéMON.\p"
 	.string "You will not be able to swap POKéMON\n"
 	.string "with the seventh TRAINER in the event.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules: @ 8259920
+BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules:
 	.string "There are two key points to be aware\n"
 	.string "of when swapping POKéMON.\p"
 	.string "First, when swapping, you can't check\n"
@@ -556,7 +556,7 @@ BattleFrontier_BattleFactoryLobby_Text_ExplainSwapNotesRules: @ 8259920
 	.string "This sequence remains unchanged\n"
 	.string "even when swaps are made.$"
 
-BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules: @ 8259A5E
+BattleFrontier_BattleFactoryLobby_Text_ExplainOpenLvRules:
 	.string "In the Open Level, the rental POKéMON\n"
 	.string "and the opposing TRAINERS' POKéMON\l"
 	.string "are all Level 100.$"

data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc

@@ -1,29 +1,29 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleFactoryPreBattleRoom_MapScripts:: @ 8259ABA
+BattleFrontier_BattleFactoryPreBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleFactoryPreBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_OnWarp: @ 8259AC5
+BattleFrontier_BattleFactoryPreBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: @ 8259ACF
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	compare VAR_0x8006, 1
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth
 	setobjectxy LOCALID_ATTENDANT, 8, 7
 	turnobject LOCALID_ATTENDANT, DIR_SOUTH
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: @ 8259AEA
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth::
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_OnFrame: @ 8259AEF
+BattleFrontier_BattleFactoryPreBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom::
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
 	setvar VAR_TEMP_0, 1
@@ -45,7 +45,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: @ 8259AF9
 	factory_setswapped
 	factory_rentmons
 	waitstate
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom:: @ 8259B74
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
 	closemessage
 	call BattleFrontier_EventScript_GetLvlMode
@@ -58,7 +58,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom:: @ 8259B7
 	waitstate
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @ 8259BA5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle::
 	factory_setopponentmons
 	factory_resethelditems
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons, MSGBOX_DEFAULT
@@ -84,11 +84,11 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle:: @
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent:: @ 8259C13
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent:: @ 8259C26
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 1
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -113,7 +113,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8259CC6
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
@@ -121,7 +121,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecor
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CFC
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -130,18 +130,18 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRecordBattle:: @ 8259CF
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle:: @ 8259D2E
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge:: @ 8259D38
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 8259D66
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -150,7 +150,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge:: @ 825
 	case 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon::
 	factory_generateopponentmons
 	factory_getopponentmontype
 	setorcopyvar VAR_0x8005, VAR_RESULT
@@ -164,7 +164,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon:: @ 8259D98
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons::
 	fadescreen FADE_TO_BLACK
 	factory_swapmons
 	waitstate
@@ -174,37 +174,37 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons:: @ 8259DF2
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8259E1D
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8259E24
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8259E2B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8259E32
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8259E39
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8259E40
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait
 	waitmessage
 	factory_save CHALLENGE_STATUS_PAUSED
@@ -214,14 +214,14 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_PauseChallenge:: @ 8259E47
 	frontier_reset
 	end
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge:: @ 8259E69
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge::
 	special SavePlayerParty
 	factory_setparties 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	special CalculatePlayerPartyCount
 	goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: @ 8259E93
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent, MSGBOX_DEFAULT
 	compare VAR_0x8005, TYPE_NORMAL
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal
@@ -261,79 +261,79 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: @
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal:: @ 8259F62
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting:: @ 8259F6B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying:: @ 8259F74
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison:: @ 8259F7D
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround:: @ 8259F86
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock:: @ 8259F8F
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug:: @ 8259F98
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost:: @ 8259FA1
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel:: @ 8259FAA
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire:: @ 8259FB3
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater:: @ 8259FBC
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass:: @ 8259FC5
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric:: @ 8259FCE
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic:: @ 8259FD7
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce:: @ 8259FE0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon:: @ 8259FE9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark:: @ 8259FF2
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType:: @ 8259FFB
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: @ 825A004
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle::
 	compare VAR_0x8006, FACTORY_STYLE_NONE
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained
 	compare VAR_0x8006, FACTORY_STYLE_PREPARATION
@@ -354,43 +354,43 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: @
 	call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained:: @ 825A068
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation:: @ 825A071
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady:: @ 825A07A
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance:: @ 825A083
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk:: @ 825A08C
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe:: @ 825A095
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict:: @ 825A09E
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow:: @ 825A0A7
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible:: @ 825A0B0
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B9
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead::
 	message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -404,7 +404,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead:: @ 825A0B
 	case 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord:: @ 825A110
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
@@ -412,7 +412,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord::
 	case 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A146
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead::
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead, MSGBOX_DEFAULT
 	msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon, MSGBOX_YESNO
 	switch VAR_RESULT
@@ -420,17 +420,17 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead:: @ 825A
 	case YES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons
 	case MULTI_B_PRESSED, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50:: @ 825A17C
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen:: @ 825A18B
+BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen
 	return
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -438,7 +438,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom: @ 825A19A
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50: @ 825A1A0
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50:
 	walk_up
 	walk_left
 	walk_left
@@ -446,7 +446,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLv50: @
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen: @ 825A1A6
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen:
 	walk_up
 	walk_right
 	walk_right
@@ -454,7 +454,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerWalkToBattleRoomLvOpen:
 	walk_up
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom: @ 825A1AC
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -463,7 +463,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom: @ 825A1AC
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50: @ 825A1B3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50:
 	walk_left
 	walk_left
 	walk_up
@@ -471,7 +471,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLv50: @
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen: @ 825A1B9
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen:
 	walk_right
 	walk_right
 	walk_up
@@ -479,201 +479,201 @@ BattleFrontier_BattleFactoryPreBattleRoom_Movement_GuideWalkToBattleRoomLvOpen:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall: @ 825A1BF
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantMoveToReceiveCall:
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer: @ 825A1C3
+BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantReturnToPlayer:
 	walk_right
 	walk_right
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection: @ 825A1C8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_HoldMonsChooseFromSelection:
 	.string "First, we will hold your POKéMON for\n"
 	.string "safekeeping.\p"
 	.string "You may then choose from our\n"
 	.string "selection of POKéMON.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons: @ 825A22D
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LetUsRestoreMons:
 	.string "Thank you for competing!\n"
 	.string "Let us restore your POKéMON!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent: @ 825A263
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "The 2nd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent: @ 825A289
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "The 3rd match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent: @ 825A2AF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor4thOpponent:
 	.string "The 4th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent: @ 825A2D5
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor5thOpponent:
 	.string "The 5th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent: @ 825A2FB
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor6thOpponent:
 	.string "The 6th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent: @ 825A321
+BattleFrontier_BattleFactoryPreBattleRoom_Text_ReadyFor7thOpponent:
 	.string "Finally, the 7th match is next!\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame: @ 825A350
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge: @ 825A37A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RetireFromChallenge:
 	.string "Would you like to retire from your\n"
 	.string "Battle Swap challenge?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent: @ 825A3B4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent:
 	.string "I've conducted a little investigation\n"
 	.string "about your upcoming opponent.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType: @ 825A3F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInNormalType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the NORMAL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType: @ 825A43E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFireType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIRE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType: @ 825A482
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInWaterType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the WATER type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType: @ 825A4C7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInElectricType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ELECTRIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType: @ 825A50F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGrassType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GRASS type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType: @ 825A554
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInIceType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ICE type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType: @ 825A597
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFightingType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FIGHTING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType: @ 825A5DF
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPoisonType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the POISON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType: @ 825A625
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGroundType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GROUND type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType: @ 825A66B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInFlyingType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the FLYING type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType: @ 825A6B1
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInPsychicType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the PSYCHIC type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType: @ 825A6F8
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInBugType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the BUG type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType: @ 825A73B
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInRockType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the ROCK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType: @ 825A77F
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInGhostType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the GHOST type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType: @ 825A7C4
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDragonType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DRAGON type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType: @ 825A80A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInDarkType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the DARK type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType: @ 825A84E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerSkilledInSteelType:
 	.string "The TRAINER is apparently skilled\n"
 	.string "in the handling of the STEEL type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite: @ 825A893
+BattleFrontier_BattleFactoryPreBattleRoom_Text_TrainerHasNoClearFavorite:
 	.string "The TRAINER appears to have no clear\n"
 	.string "favorites when it comes to type.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady: @ 825A8D9
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleSlowAndSteady:
 	.string "The favorite battle style appears to\n"
 	.string "be slow and steady.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance: @ 825A912
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleEndurance:
 	.string "The favorite battle style appears to\n"
 	.string "be one of endurance.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk: @ 825A94C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleHighRisk:
 	.string "The favorite battle style appears to\n"
 	.string "be high risk, high return.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow: @ 825A98C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleDependsOnFlow:
 	.string "The favorite battle style appears to\n"
 	.string "depend on the battle's flow.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation: @ 825A9CE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleTotalPreparation:
 	.string "The favorite battle style appears to\n"
 	.string "be one based on total preparation.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe: @ 825AA16
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleWeakenFoe:
 	.string "The favorite battle style appears\n"
 	.string "to be weakening the foe to start.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible: @ 825AA5A
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleFlexible:
 	.string "The favorite battle style appears to\n"
 	.string "be flexibly adaptable to the situation.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict: @ 825AAA7
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleImpossibleToPredict:
 	.string "The favorite battle style appears to\n"
 	.string "be impossible to predict.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained: @ 825AAE6
+BattleFrontier_BattleFactoryPreBattleRoom_Text_StyleUnrestrained:
 	.string "The favorite battle style appears to\n"
 	.string "be free-spirited and unrestrained.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon: @ 825AB2E
+BattleFrontier_BattleFactoryPreBattleRoom_Text_LikeToSwapMon:
 	.string "Before starting the battle, would you\n"
 	.string "like to swap a POKéMON?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete: @ 825AB6C
+BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete:
 	.string "Thank you!\n"
 	.string "Your POKéMON swap is complete.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay: @ 825AB96
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay:
 	.string "Right this way, please!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait: @ 825ABAE
+BattleFrontier_BattleFactoryPreBattleRoom_Text_SavingDataPleaseWait:
 	.string "I am saving your data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle: @ 825ABD2
+BattleFrontier_BattleFactoryPreBattleRoom_Text_RecordLatestBattle:
 	.string "Would you like to record your latest\n"
 	.string "battle on your FRONTIER PASS?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments: @ 825AC15
+BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments:
 	.string "Excuse me! Excuse me, please!\n"
 	.string "May I get you to wait a few moments?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo: @ 825AC58
+BattleFrontier_BattleFactoryPreBattleRoom_Text_UnderstoodSirWillDo:
 	.string "…Uh-huh? What?! …Whoa!\n"
 	.string "Understood, sir! Will do!$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow: @ 825AC89
+BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow:
 	.string "Oh, my…\n"
 	.string "Sorry to keep you waiting!\p"
 	.string "I have a message from this facility's\n"
@@ -681,10 +681,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_Text_MessageFromHeadComeRightNow: @ 82
 	.string "He says, “We're going to do it!\n"
 	.string "Come here right now!”$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead: @ 825AD20
+BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead:
 	.string "The FACTORY HEAD is demanding you.\n"
 	.string "Are you prepared to face him?$"
 
-BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead: @ 825AD61
+BattleFrontier_BattleFactoryPreBattleRoom_Text_CantTellAnythingAboutHead:
 	.string "I'm terribly sorry, but I can't tell you\n"
 	.string "anything about the FACTORY HEAD.$"

data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc

@@ -4,7 +4,7 @@
 .set LOCALID_DUSCLOPS, 4
 .set LOCALID_AZURILL, 5
 
-BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
+BattleFrontier_BattlePalaceBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePalaceBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceBattleRoom_OnWarp
@@ -14,12 +14,12 @@ BattleFrontier_BattlePalaceBattleRoom_MapScripts:: @ 824F815
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_0
 	@ The opponent is represented by LOCALID_OPPONENT, which has the gfx id VAR_OBJ_GFX_ID_1
 
-BattleFrontier_BattlePalaceBattleRoom_OnTransition: @ 824F825
+BattleFrontier_BattlePalaceBattleRoom_OnTransition:
 	frontier_settrainers
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale
@@ -28,21 +28,21 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: @ 824F833
 	return
 
 @ The opponent's gfx are set to the players by default
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale:: @ 824F84B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale:: @ 824F856
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_1, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_OnFrame: @ 824F861
+BattleFrontier_BattlePalaceBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom::
 	showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	compare VAR_RESULT, 0
@@ -54,10 +54,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: @ 824F86B
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge:: @ 824F8B5
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom
 	waitmovement 0
-BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: @ 824F8BF
+BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter
@@ -68,11 +68,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter:: @ 824F8BF
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost:: @ 824F8FA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	addvar VAR_RESULT, 1
@@ -92,7 +92,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent:: @ 824F911
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -121,7 +121,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: @ 824F98
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 824FA42
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
@@ -129,7 +129,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -138,18 +138,18 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRecordBattle:: @ 824FA78
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle:: @ 824FAAA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge:: @ 824FAB4
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -158,17 +158,17 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge:: @ 824FAE2
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge:: @ 824FB14
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge::
 	applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight
 	closemessage
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_NextOpponentEnter
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon:: @ 824FB28
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
+BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_SavingData
 	waitmessage
 	palace_save CHALLENGE_STATUS_PAUSED
@@ -178,12 +178,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge:: @ 824FB3F
 	frontier_reset
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: @ 824FB61
+BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -197,7 +197,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: @ 824FB79
 	case 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 824FBD0
+BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
@@ -205,7 +205,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord:: @ 8
 	case 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser:: @ 824FC06
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser, MSGBOX_DEFAULT
 	closemessage
@@ -229,14 +229,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser:: @ 824FC06
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver:: @ 824FCAA
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824FCC7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver::
 	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -258,20 +258,20 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: @ 824F
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold:: @ 824FD3A
+BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold:: @ 824FD67
+BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold::
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD84
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold::
 	palace_incrementstreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -293,7 +293,7 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: @ 824FD8
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
+BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -307,11 +307,11 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle:: @ 824FDF7
 	frontier_resetsketch
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_OnWarp: @ 824FE34
+BattleFrontier_BattlePalaceBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects
 	.2byte 0
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
+BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects::
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
 	call BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx
 	setvar VAR_TEMP_1, 1
@@ -321,55 +321,55 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_SetUpRoomObjects:: @ 824FE3E
 	applymovement LOCALID_AZURILL, BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 824FE66
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 824FE6D
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent:: @ 824FE74
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent:: @ 824FE7B
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent:: @ 824FE82
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent:: @ 824FE89
+BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible: @ 824FE90
+BattleFrontier_BattlePalaceBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom: @ 824FE92
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerEnterRoom:
 	set_visible
 	walk_up
 	walk_up
 	walk_up
 	walk_up
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight: @ 824FE97
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceRight:
 	face_right
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp: @ 824FE99
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp:
 	face_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge: @ 824FE9B
+BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge:
 	set_visible
 	walk_up
 	walk_up
@@ -377,7 +377,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge: @ 824FE9
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter: @ 824FEA1
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -385,37 +385,37 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentEnter: @ 824FEA1
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit: @ 824FEA7
+BattleFrontier_BattlePalaceBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown: @ 824FEAC
+BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown:
 	face_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter1: @ 824FEAE
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter1:
 	set_visible
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter2: @ 824FEB3
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter2:
 	set_visible
 	walk_slow_down
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3: @ 824FEB6
+BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: @ 824FEBB
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles
@@ -423,12 +423,12 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: @ 824FEBB
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles:: @ 824FED5
+BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter: @ 824FEDF
+BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter:
 	delay_16
 	delay_16
 	set_visible
@@ -438,7 +438,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter: @ 824FEDF
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: @ 824FEE7
+BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter:
 	set_visible
 	walk_fast_down
 	walk_fast_right
@@ -451,7 +451,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: @ 824FEE7
 	delay_16
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter: @ 824FEF2
+BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter:
 	delay_16
 	delay_16
 	delay_16
@@ -467,64 +467,64 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_SpenserEnter: @ 824FEF2
 	face_left
 	step_end
 
-BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons: @ 824FF00
+BattleFrontier_BattlePalaceBattleRoom_Text_LetMeRestoreYourMons:
 	.string "Excellent…\n"
 	.string "Let me restore your POKéMON.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent: @ 824FF28
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor2ndOpponent:
 	.string "The 2nd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent: @ 824FF54
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor3rdOpponent:
 	.string "The 3rd opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent: @ 824FF80
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor4thOpponent:
 	.string "The 4th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent: @ 824FFAC
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor5thOpponent:
 	.string "The 5th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent: @ 824FFD8
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor6thOpponent:
 	.string "The 6th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent: @ 8250004
+BattleFrontier_BattlePalaceBattleRoom_Text_PreparedFor7thOpponent:
 	.string "The 7th opponent is next.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame: @ 8250030
+BattleFrontier_BattlePalaceBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and quit\n"
 	.string "the game?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge: @ 825005A
+BattleFrontier_BattlePalaceBattleRoom_Text_WishToQuitChallenge:
 	.string "Do you wish to quit your challenge?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SavingData: @ 825007E
+BattleFrontier_BattlePalaceBattleRoom_Text_SavingData:
 	.string "Saving the data.\n"
 	.string "Have patience…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch: @ 825009E
+BattleFrontier_BattlePalaceBattleRoom_Text_RecordLastMatch:
 	.string "Do you wish to record your latest\n"
 	.string "match on your FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven: @ 82500DD
+BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven:
 	.string "And now…\p"
 	.string "By winning consistently, you have\n"
 	.string "earned the privilege of challenging\l"
 	.string "our master, the PALACE MAVEN…$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven: @ 825014A
+BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven:
 	.string "I shall send for the PALACE MAVEN.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser: @ 825017C
+BattleFrontier_BattlePalaceBattleRoom_Text_AnnounceArrivalOfSpenser:
 	.string "Let great fanfare announce the arrival\n"
 	.string "of the PALACE MAVEN, SPENSER!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro: @ 82501C1
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro:
 	.string "SPENSER: My physical being is with\n"
 	.string "POKéMON always!\p"
 	.string "My heart beats as one with\n"
@@ -536,34 +536,34 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro: @ 82501C1
 	.string "If your bonds of trust are frail,\n"
 	.string "you will never beat my brethren!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons: @ 82502C4
+BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons:
 	.string "The bond you share with your POKéMON!\n"
 	.string "Prove it to me here!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle: @ 82502FF
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle:
 	.string "SPENSER: Gwahahah!\p"
 	.string "Hah, you never fell for my bluster!\n"
 	.string "Sorry for trying that stunt!\p"
 	.string "Here!\n"
 	.string "Bring me the thing!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass: @ 825036D
+BattleFrontier_BattlePalaceBattleRoom_Text_LetsSeeFrontierPass:
 	.string "My, my, if only you could maintain that\n"
 	.string "facade of distinguished authority…\p"
 	.string "Here!\n"
 	.string "Let's see your FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol: @ 82503DC
+BattleFrontier_BattlePalaceBattleRoom_Text_ReceivedSpiritsSymbol:
 	.string "The Spirits Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime: @ 8250412
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime:
 	.string "SPENSER: Your POKéMON's eyes are \n"
 	.string "truly clear and unclouded.\p"
 	.string "I will eagerly await the next\n"
 	.string "opportunity to see you.$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack: @ 8250485
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack:
 	.string "SPENSER: Gwahahah!\n"
 	.string "You've battled your way up again?\p"
 	.string "You must have developed a truly\n"
@@ -574,10 +574,10 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack: @ 825048
 	.string "Ready now?\n"
 	.string "Prepare to lose!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah: @ 8250572
+BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah:
 	.string "… … …Kaaah!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable: @ 825057E
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable:
 	.string "SPENSER: Well, that was some display!\n"
 	.string "Even fully unleashed, my brethren\l"
 	.string "could not overpower you.\p"
@@ -585,17 +585,17 @@ BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable: @ 825057E
 	.string "Here!\n"
 	.string "Bring me that thing, will you?$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass: @ 8250629
+BattleFrontier_BattlePalaceBattleRoom_Text_HurryWithFrontierPass:
 	.string "My, my, if only you could maintain\n"
 	.string "a certain level of decorum…\p"
 	.string "Gaaah, here!\n"
 	.string "Hurry with that FRONTIER PASS, you!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine: @ 8250699
+BattleFrontier_BattlePalaceBattleRoom_Text_SpiritsSymbolTookGoldenShine:
 	.string "The Spirits Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain: @ 82506C4
+BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain:
 	.string "SPENSER: Gwahahah!\p"
 	.string "Come see me time and again!\n"
 	.string "My brethren and I will be waiting!$"

data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc

@@ -1,14 +1,14 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePalaceCorridor_MapScripts:: @ 824F4A3
+BattleFrontier_BattlePalaceCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattlePalaceCorridor_OnFrame: @ 824F4A9
+BattleFrontier_BattlePalaceCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor
 	.2byte 0
 
-BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor::
 	delay 16
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor
@@ -41,7 +41,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor:: @ 824F4B3
 	waitdooranim
 	goto BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
+BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom
 	waitmovement 0
@@ -52,39 +52,39 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom:: @ 824F553
 	waitmovement 0
 	closedoor 10, 3
 	waitdooranim
-BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom:: @ 824F581
+BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1:: @ 824F58B
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2:: @ 824F594
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3:: @ 824F59D
+BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment:: @ 824F5A6
+BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment:: @ 824F5AF
+BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment::
 	msgbox BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor: @ 824F5B8
+BattleFrontier_BattlePalaceCorridor_Movement_EnterCorridor:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom: @ 824F5BD
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom:
 	walk_up
 	walk_up
 	walk_left
@@ -93,7 +93,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom: @ 824F
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom: @ 824F5C4
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -102,7 +102,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom: @ 824F5C4
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom: @ 824F5CB
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom:
 	walk_up
 	walk_right
 	walk_right
@@ -111,7 +111,7 @@ BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkToOpenBattleRoom: @ 82
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom: @ 824F5D2
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom:
 	walk_up
 	walk_up
 	walk_right
@@ -120,38 +120,38 @@ BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkToOpenBattleRoom: @ 824F5
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom: @ 824F5D9
+BattleFrontier_BattlePalaceCorridor_Movement_PlayerEnterBattleRoom:
 	walk_up
-BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom: @ 824F5DA
+BattleFrontier_BattlePalaceCorridor_Movement_AttendantEnterBattleRoom:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame: @ 824F5DD
+BattleFrontier_BattlePalaceCorridor_Text_PeopleAndMonAreSame:
 	.string "People and POKéMON, they are but\n"
 	.string "the same…\p"
 	.string "Their individual nature makes them\n"
 	.string "good at certain things, and not good\l"
 	.string "at others.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes: @ 824F65B
+BattleFrontier_BattlePalaceCorridor_Text_LetMonDoWhatItLikes:
 	.string "Rather than trying to make a POKéMON\n"
 	.string "do what it dislikes, try to let it do\l"
 	.string "what it likes and is good at doing.\p"
 	.string "Put yourself in the POKéMON's position\n"
 	.string "and consider what moves it would like.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered: @ 824F718
+BattleFrontier_BattlePalaceCorridor_Text_MonDifferentWhenCornered:
 	.string "A POKéMON's nature is a remarkable\n"
 	.string "thing…\p"
 	.string "Some POKéMON behave in a completely\n"
 	.string "different way when they are cornered.$"
 
-BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature: @ 824F78C
+BattleFrontier_BattlePalaceCorridor_Text_BeginningToUnderstandNature:
 	.string "Are you beginning to understand how\n"
 	.string "a POKéMON's nature makes it behave?$"
 
-BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons: @ 824F7D4
+BattleFrontier_BattlePalaceCorridor_Text_HeartfeltBondBetweenYouAndMons:
 	.string "Ah… I see a strong, heartfelt bond\n"
 	.string "between you and your POKéMON…$"
 

data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc

@@ -1,21 +1,21 @@
 .set LOCALID_ATTENDANT_SINGLES, 1
 .set LOCALID_ATTENDANT_DOUBLES, 6
 
-BattleFrontier_BattlePalaceLobby_MapScripts:: @ 824D77E
+BattleFrontier_BattlePalaceLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePalaceLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePalaceLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePalaceLobby_OnWarp: @ 824D789
+BattleFrontier_BattlePalaceLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth:: @ 824D793
+BattleFrontier_BattlePalaceLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
+BattleFrontier_BattlePalaceLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge
@@ -23,11 +23,11 @@ BattleFrontier_BattlePalaceLobby_OnFrame: @ 824D79D
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus:: @ 824D7C7
+BattleFrontier_BattlePalaceLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving:: @ 824D7D0
+BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge, MSGBOX_DEFAULT
 	closemessage
@@ -38,7 +38,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving:: @ 824D7D0
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: @ 824D817
+BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -46,9 +46,9 @@ BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: @ 824D817
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven:: @ 824D838
+BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers, MSGBOX_DEFAULT
-BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints:: @ 824D840
+BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -61,7 +61,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints:: @ 824D840
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge:: @ 824D873
+BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded
 	waitmessage
@@ -73,7 +73,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_LostChallenge:: @ 824D873
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
+BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	special HealPlayerParty
@@ -91,12 +91,12 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge:: @ 824D8A1
 	case 0, BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch:: @ 824D902
+BattleFrontier_BattlePalaceLobby_EventScript_RecordMatch::
 	call BattleFrontier_EventScript_SaveBattle
-BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge:: @ 824D907
+BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge::
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge:: @ 824D908
+BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge
@@ -108,7 +108,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_ResumeChallenge:: @ 824D908
 	setvar VAR_TEMP_0, 255
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant:: @ 824D944
+BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
@@ -116,7 +116,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SinglesAttendant:: @ 824D944
 	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant:: @ 824D956
+BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PALACE
@@ -124,7 +124,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant:: @ 824D956
 	goto BattleFrontier_BattlePalaceLobby_EventScript_Attendant
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: @ 824D968
+BattleFrontier_BattlePalaceLobby_EventScript_Attendant::
 	palace_get PALACE_DATA_PRIZE
 	compare VAR_RESULT, ITEM_NONE
 	goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
@@ -133,7 +133,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: @ 824D968
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -146,7 +146,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: @ 824D999
 	case 2, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
+BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_WhichChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -172,7 +172,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge:: @ 824D9E6
 	case YES, BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge:: @ 824DA87
+BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	palace_init
@@ -186,7 +186,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge:: @ 824DA87
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: @ 824DAF3
+BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT
@@ -197,58 +197,58 @@ BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: @ 824DAF3
 	waitstate
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge:: @ 824DB20
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge:: @ 824DB38
+BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons:: @ 824DB45
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50:: @ 824DB60
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 824DB6D
+BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed:: @ 824DB7A
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge:: @ 824DB91
+BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge:: @ 824DB94
+BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified, MSGBOX_DEFAULT
-BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge:: @ 824DB9C
+BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle:: @ 824DB9E
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle:: @ 824DBA7
+BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge:: @ 824DBB0
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge:: @ 824DBB6
+BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge::
 	message BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
+BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -271,46 +271,46 @@ BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: @ 824DBBC
 	waitdooranim
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant:: @ 824DC23
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_SINGLES
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant:: @ 824DC29
+BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant::
 	setvar VAR_LAST_TALKED, LOCALID_ATTENDANT_DOUBLES
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor:: @ 824DC2F
+BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor::
 	opendoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor:: @ 824DC35
+BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor::
 	opendoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor:: @ 824DC3B
+BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor::
 	closedoor 5, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor:: @ 824DC41
+BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor::
 	closedoor 19, 4
 	return
 
-BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor: @ 824DC47
+BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor:
 	walk_up
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor: @ 824DC49
+BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor: @ 824DC4C
+BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults:: @ 824DC50
+BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_SINGLES
 	waitbuttonpress
@@ -318,7 +318,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_ShowSinglesResults:: @ 824DC50
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults:: @ 824DC69
+BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PALACE, FRONTIER_MODE_DOUBLES
 	waitbuttonpress
@@ -326,29 +326,29 @@ BattleFrontier_BattlePalaceLobby_EventScript_ShowDoublesResults:: @ 824DC69
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt:: @ 824DC82
+BattleFrontier_BattlePalaceLobby_EventScript_BlackBelt::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Man:: @ 824DC8B
+BattleFrontier_BattlePalaceLobby_EventScript_Man::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Beauty:: @ 824DC94
+BattleFrontier_BattlePalaceLobby_EventScript_Beauty::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_Maniac:: @ 824DC9D
+BattleFrontier_BattlePalaceLobby_EventScript_Maniac::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard:: @ 824DCA6
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePalaceLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
+BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 0, MULTI_BATTLE_PALACE_RULES, FALSE
@@ -362,47 +362,47 @@ BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard:: @ 824DCB5
 	case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics:: @ 824DD13
+BattleFrontier_BattlePalaceLobby_EventScript_RulesBasics::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesNature:: @ 824DD21
+BattleFrontier_BattlePalaceLobby_EventScript_RulesNature::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves:: @ 824DD2F
+BattleFrontier_BattlePalaceLobby_EventScript_RulesMoves::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered:: @ 824DD3D
+BattleFrontier_BattlePalaceLobby_EventScript_RulesUnderpowered::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger:: @ 824DD4B
+BattleFrontier_BattlePalaceLobby_EventScript_RulesWhenInDanger::
 	msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePalaceLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePalaceLobby_EventScript_ExitRules:: @ 824DD59
+BattleFrontier_BattlePalaceLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle: @ 824DD5B
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForSingleBattle:
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the SINGLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge: @ 824DDE1
+BattleFrontier_BattlePalaceLobby_Text_TakeSingleBattleChallenge:
 	.string "Do you wish to take\n"
 	.string "the SINGLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge: @ 824DE17
+BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge:
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for SINGLE BATTLES\l"
 	.string "that are named SINGLE BATTLE HALLS.\p"
@@ -425,16 +425,16 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge: @ 824DE17
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified: @ 824E0D8
+BattleFrontier_BattlePalaceLobby_Text_ReturnWhenFortified:
 	.string "When you have fortified your heart\n"
 	.string "and POKéMON, you must return.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WhichChallenge: @ 824E119
+BattleFrontier_BattlePalaceLobby_Text_WhichChallenge:
 	.string "There are two BATTLE HALLS,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which is your choice of a challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50: @ 824E173
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -448,7 +448,7 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50: @ 824E173
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen: @ 824E29E
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "Sigh…\p"
 	.string "You do not have the three POKéMON\n"
 	.string "required for the challenge.\p"
@@ -460,52 +460,52 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen: @ 824E29E
 	.string "Come back when you have made\n"
 	.string "your preparations.$"
 
-BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons: @ 824E399
+BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons:
 	.string "Good. Now, you must select your\n"
 	.string "three POKéMON.$"
 
-BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2: @ 824E3C8
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2:
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_FollowMe: @ 824E408
+BattleFrontier_BattlePalaceLobby_Text_FollowMe:
 	.string "Good.\n"
 	.string "Now, follow me.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded: @ 824E41E
+BattleFrontier_BattlePalaceLobby_Text_ResultsWillBeRecorded:
 	.string "I feel privileged for having seen\n"
 	.string "your POKéMON's exploits.\p"
 	.string "The results will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
-BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak: @ 824E497
+BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak:
 	.string "To achieve a 7-win streak…\p"
 	.string "The bonds that bind your heart with\n"
 	.string "your POKéMON seem firm and true.$"
 
-BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded: @ 824E4F7
+BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
 	.string "Your feat will be recorded.\n"
 	.string "I must ask you to briefly wait.$"
 
 @ Unused
-BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak: @ 824E5333
+BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
     .string "For the feat of your 7-win streak,\n"
     .string "we present you with Battle Point(s).$"
 
-BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize: @ 824E57B
+BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
 	.string "You seem to have no space for\n"
 	.string "our prize.\p"
 	.string "You should return when you have\n"
 	.string "organized your BAG.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting: @ 824E5D8
+BattleFrontier_BattlePalaceLobby_Text_WeHaveBeenWaiting:
 	.string "We have been waiting for you…$"
 
-BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge: @ 824E5F6
+BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge:
 	.string "I must save before I show you to\n"
 	.string "the BATTLE HALL. Is that okay?$"
 
-BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge: @ 824E636
+BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge:
 	.string "Sigh…\p"
 	.string "You failed to save before you ended\n"
 	.string "your challenge the last time.\p"
@@ -513,11 +513,11 @@ BattleFrontier_BattlePalaceLobby_Text_FailedToSaveBeforeEndingChallenge: @ 824E6
 	.string "disqualified. It is most unfortunate.$"
 
 @ Unused
-BattleFrontier_BattlePalaceLobby_Text_ReceivedPrize: @ 824E6C9
+BattleFrontier_BattlePalaceLobby_Text_ReceivedPrize:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
-BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink: @ 824E6E3
+BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink:
 	.string "For a hardy fellow like me,\n"
 	.string "hardy POKéMON are the best.\p"
 	.string "Offense is the best defense!\n"
@@ -533,7 +533,7 @@ BattleFrontier_BattlePalaceLobby_Text_LadyCanTellWhatMonsThink: @ 824E6E3
 	.string "Huh?\n"
 	.string "Why are you looking at me like that?$"
 
-BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere: @ 824E851
+BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere:
 	.string "Hmm…\p"
 	.string "It appears that the nature of POKéMON\n"
 	.string "and the moves that they have been\l"
@@ -546,7 +546,7 @@ BattleFrontier_BattlePalaceLobby_Text_NatureAndMovesKeyHere: @ 824E851
 	.string "you may need to examine how well\l"
 	.string "its moves match its nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms: @ 824E992
+BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms:
 	.string "My POKéMON is usually very docile.\p"
 	.string "But when it's in a BATTLE HALL,\n"
 	.string "it sometimes seems to become\l"
@@ -554,25 +554,25 @@ BattleFrontier_BattlePalaceLobby_Text_MonDocileButTransforms: @ 824E992
 	.string "It becomes totally intimidating.\n"
 	.string "It's shocking, even.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway: @ 824EA4B
+BattleFrontier_BattlePalaceLobby_Text_WhatNatureFavorsChippingAway:
 	.string "I wonder what sort of nature a POKéMON\n"
 	.string "would have if it favored enfeebling its\l"
 	.string "opponents and chipping away slowly.\p"
 	.string "I'd be surprised if it was a LAX nature.\p"
 	.string "But, nah, that can't be right.$"
 
-BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle: @ 824EB06
+BattleFrontier_BattlePalaceLobby_Text_WelcomeForDoubleBattle:
 	.string "Where the hearts of TRAINERS\n"
 	.string "are put to the test.\p"
 	.string "I welcome you to the BATTLE PALACE.\p"
 	.string "I accept challenges to the DOUBLE\n"
 	.string "BATTLE HALLS.$"
 
-BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge: @ 824EB8C
+BattleFrontier_BattlePalaceLobby_Text_TakeDoubleBattleChallenge:
 	.string "Do you wish to take\n"
 	.string "the DOUBLE BATTLE HALL challenge?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge: @ 824EBC2
+BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge:
 	.string "In the BATTLE PALACE, there are\n"
 	.string "several auditoriums for DOUBLE BATTLES\l"
 	.string "that are named DOUBLE BATTLE HALLS.\p"
@@ -595,34 +595,34 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainDoubleBattleChallenge: @ 824EBC2
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers: @ 824EE81
+BattleFrontier_BattlePalaceLobby_Text_ToDefeatMavenAnd7Trainers:
 	.string "To defeat the PALACE MAVEN\n"
 	.string "and seven TRAINERS in a row…$"
 
-BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints: @ 824EEB9
+BattleFrontier_BattlePalaceLobby_Text_PresentYouWithBattlePoints:
 	.string "In honor of the bond you share with\n"
 	.string "your POKéMON, we present you with\l"
 	.string "these Battle Point(s).$"
 
-BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch: @ 824EF16
+BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch:
 	.string "Would you like to record your latest\n"
 	.string "BATTLE PALACE match on your\l"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattlePalaceLobby_Text_RulesAreListed: @ 824EF66
+BattleFrontier_BattlePalaceLobby_Text_RulesAreListed:
 	.string "The BATTLE HALL rules are listed.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading: @ 824EF88
+BattleFrontier_BattlePalaceLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics: @ 824EFAB
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesBasics:
 	.string "Here, POKéMON are required to think\n"
 	.string "and battle by themselves.\p"
 	.string "Unlike in the wild, POKéMON that live\n"
 	.string "with people behave differently\l"
 	.string "depending on their nature.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature: @ 824F049
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature:
 	.string "Depending on its nature, a POKéMON\n"
 	.string "may prefer to attack no matter what.\p"
 	.string "Another POKéMON may prefer to protect\n"
@@ -635,7 +635,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesNature: @ 824F049
 	.string "It may also dislike certain moves that\n"
 	.string "it has trouble using.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves: @ 824F190
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves:
 	.string "There are offensive moves that inflict\n"
 	.string "direct damage on the foe.\p"
 	.string "There are defensive moves that are\n"
@@ -648,7 +648,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesMoves: @ 824F190
 	.string "POKéMON will consider using moves in\n"
 	.string "these three categories.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered: @ 824F2E8
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered:
 	.string "When not under command by its TRAINER,\n"
 	.string "a POKéMON may be unable to effectively\l"
 	.string "use certain moves.\p"
@@ -658,7 +658,7 @@ BattleFrontier_BattlePalaceLobby_Text_ExplainRulesUnderpowered: @ 824F2E8
 	.string "do not match its nature, it will often\l"
 	.string "be unable to live up to its potential.$"
 
-BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger: @ 824F3F4
+BattleFrontier_BattlePalaceLobby_Text_ExplainRulesWhenInDanger:
 	.string "Depending on its nature, a POKéMON may\n"
 	.string "start using moves that don't match its\l"
 	.string "nature when it is in trouble.\p"

data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc

@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeCorridor_MapScripts:: @ 825C771
+BattleFrontier_BattlePikeCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeCorridor_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeCorridor_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeCorridor_OnFrame: @ 825C77C
+BattleFrontier_BattlePikeCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
+BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
 	delay 16
 	frontier_set FRONTIER_DATA_BATTLE_NUM, 1
 	pike_cleartrainerids
@@ -29,34 +29,34 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor:: @ 825C786
 	waitstate
 	end
 
-BattleFrontier_BattlePikeCorridor_OnWarp: @ 825C7F7
+BattleFrontier_BattlePikeCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth:: @ 825C801
+BattleFrontier_BattlePikeCorridor_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor: @ 825C80B
+BattleFrontier_BattlePikeCorridor_Movement_PlayerEnterCorridor:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor: @ 825C80E
+BattleFrontier_BattlePikeCorridor_Movement_PlayerExitCorridor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor: @ 825C812
+BattleFrontier_BattlePikeCorridor_Movement_AttendantEnterCorridor:
 	walk_up
 	walk_up
 	walk_left
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun: @ 825C817
+BattleFrontier_BattlePikeCorridor_Text_YourChallengeHasBegun:
 	.string "Your Battle Choice challenge\n"
 	.string "has now begun…$"
 

data/maps/BattleFrontier_BattlePikeLobby/scripts.inc

@@ -1,31 +1,31 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeLobby_MapScripts:: @ 825B6C6
+BattleFrontier_BattlePikeLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeLobby_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeLobby_OnFrame: @ 825B6D1
+BattleFrontier_BattlePikeLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_WON, BattleFrontier_BattlePikeLobby_EventScript_WonChallenge
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePikeLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_OnWarp: @ 825B6F3
+BattleFrontier_BattlePikeLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth:: @ 825B6FD
+BattleFrontier_BattlePikeLobby_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus:: @ 825B707
+BattleFrontier_BattlePikeLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
+BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving::
 	special HealPlayerParty
 	pike_resethelditems
 	lockall
@@ -38,7 +38,7 @@ BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving:: @ 825B710
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
+BattleFrontier_BattlePikeLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -47,10 +47,10 @@ BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: @ 825B762
 	waitmessage
 	goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen:: @ 825B784
+BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen::
 	msgbox BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen, MSGBOX_DEFAULT
 	waitmessage
-BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
+BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints::
 	msgbox BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints, MSGBOX_DEFAULT
 	frontier_givepoints
 	msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
@@ -72,7 +72,7 @@ BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints:: @ 825B78D
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
+BattleFrontier_BattlePikeLobby_EventScript_LostChallenge::
 	lockall
 	message BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults
 	waitmessage
@@ -91,14 +91,14 @@ BattleFrontier_BattlePikeLobby_EventScript_LostChallenge:: @ 825B806
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Attendant:: @ 825B868
+BattleFrontier_BattlePikeLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PIKE
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
+BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattlePikeLobby_Text_TakeChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -108,7 +108,7 @@ BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge:: @ 825B87F
 	case 2, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
+BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -134,7 +134,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge:: @ 825B8BB
 	case YES, BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
+BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	setvar VAR_TEMP_1, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
@@ -164,36 +164,36 @@ BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge:: @ 825B95C
 	waitstate
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge:: @ 825BA1A
+BattleFrontier_BattlePikeLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons:: @ 825BA27
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50:: @ 825BA42
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 825BA4F
+BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed:: @ 825BA5C
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge:: @ 825BA73
+BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge:: @ 825BA76
+BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou, MSGBOX_DEFAULT
-BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge:: @ 825BA7E
+BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
+BattleFrontier_BattlePikeLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PIKE
 	waitbuttonpress
@@ -201,39 +201,39 @@ BattleFrontier_BattlePikeLobby_EventScript_ShowResults:: @ 825BA80
 	releaseall
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor:: @ 825BA94
+BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor: @ 825BAA6
+BattleFrontier_BattlePikeLobby_Movement_PlayerWalkToCorridor:
 	walk_up
-BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor: @ 825BAA7
+BattleFrontier_BattlePikeLobby_Movement_AttendantWalkToCorridor:
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeLobby_EventScript_Hiker:: @ 825BAAB
+BattleFrontier_BattlePikeLobby_EventScript_Hiker::
 	msgbox BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Twin:: @ 825BAB4
+BattleFrontier_BattlePikeLobby_EventScript_Twin::
 	msgbox BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_Beauty:: @ 825BABD
+BattleFrontier_BattlePikeLobby_EventScript_Beauty::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesBoard:: @ 825BAC6
+BattleFrontier_BattlePikeLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePikeLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
+BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 16, 4, MULTI_BATTLE_PIKE_RULES, FALSE
@@ -245,43 +245,43 @@ BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard:: @ 825BAD5
 	case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag:: @ 825BB1D
+BattleFrontier_BattlePikeLobby_EventScript_RulesPokenavBag::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems:: @ 825BB2B
+BattleFrontier_BattlePikeLobby_EventScript_RulesHeldItems::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder:: @ 825BB39
+BattleFrontier_BattlePikeLobby_EventScript_RulesMonOrder::
 	msgbox BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePikeLobby_EventScript_ExitRules:: @ 825BB47
+BattleFrontier_BattlePikeLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePike_EventScript_CloseCurtain:: @ 825BB49
+BattleFrontier_BattlePike_EventScript_CloseCurtain::
 	playse SE_PIKE_CURTAIN_CLOSE
 	special CloseBattlePikeCurtain
 	waitstate
 	waitse
 	return
 
-BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike: @ 825BB52
+BattleFrontier_BattlePikeLobby_Text_WelcomeToBattlePike:
 	.string "Where the luck of TRAINERS\n"
 	.string "is put to the test…\p"
 	.string "Welcome to the BATTLE PIKE…\p"
 	.string "I am your guide to the BATTLE PIKE…$"
 
-BattleFrontier_BattlePikeLobby_Text_TakeChallenge: @ 825BBC1
+BattleFrontier_BattlePikeLobby_Text_TakeChallenge:
 	.string "Would you like to take the Battle\n"
 	.string "Choice challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
+BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike:
 	.string "Here we conduct an event we call\n"
 	.string "the Battle Choice.\p"
 	.string "The Battle Choice rules are very\n"
@@ -300,16 +300,16 @@ BattleFrontier_BattlePikeLobby_Text_ExplainBattlePike: @ 825BBF5
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou: @ 825BE02
+BattleFrontier_BattlePikeLobby_Text_LookForwardToSeeingYou:
 	.string "We look forward to seeing you\n"
 	.string "on another occasion…$"
 
-BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode: @ 825BE35
+BattleFrontier_BattlePikeLobby_Text_WhichChallengeMode:
 	.string "You have the choice of two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you challenge?$"
 
-BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50:
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -321,7 +321,7 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50: @ 825BE8C
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "I beg your pardon, but…\p"
 	.string "You do not have three eligible\n"
 	.string "POKéMON for the Battle Choice event.\p"
@@ -333,101 +333,101 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen: @ 825BF9A
 	.string "Please come see me when\n"
 	.string "you are ready…$"
 
-BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons: @ 825C094
+BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons:
 	.string "Please choose the three POKéMON\n"
 	.string "you wish to enter in the challenge…$"
 
-BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge: @ 825C0D8
+BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge:
 	.string "Before starting your Battle Choice\n"
 	.string "challenge, I must save the game.\l"
 	.string "Is that acceptable?$"
 
-BattleFrontier_BattlePikeLobby_Text_StepThisWay: @ 825C130
+BattleFrontier_BattlePikeLobby_Text_StepThisWay:
 	.string "Please step this way…$"
 
-BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults: @ 825C146
+BattleFrontier_BattlePikeLobby_Text_ChallengeEndedRecordResults:
 	.string "Your challenge has ended…\p"
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
-BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance: @ 825C18A
+BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance:
 	.string "You have completed the challenge…\p"
 	.string "I must say… You seem to possess luck\n"
 	.string "in abundance…$"
 
-BattleFrontier_BattlePikeLobby_Text_ShallRecordResults: @ 825C1DF
+BattleFrontier_BattlePikeLobby_Text_ShallRecordResults:
 	.string "I shall record your results.\n"
 	.string "Please wait…$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2: @ 825C209
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints2:
 	.string "To commemorate your completion of\n"
 	.string "the Battle Choice challenge, we award\l"
 	.string "you these Battle Point(s)…$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit: @ 825C26C
+BattleFrontier_BattlePikeLobby_Text_ReachedBattlePointLimit:
 	.string "You appear to have reached the limit\n"
 	.string "for Battle Points…\pPlease exchange some Battle Points\n"
 	.string "for prizes, then return…$"
 
-BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting: @ 825C2E0
+BattleFrontier_BattlePikeLobby_Text_FailedToSaveBeforeQuitting:
 	.string "I beg your pardon, but…\p"
 	.string "You failed to save before you quit\n"
 	.string "your challenge the last time.\p"
 	.string "Because of that, your challenge so far\n"
 	.string "has been disqualified. I am sorry…$"
 
-BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen: @ 825C383
+BattleFrontier_BattlePikeLobby_Text_SnatchedVictoryFromQueen:
 	.string "Congratulations…\p"
 	.string "You have snatched victory from the\n"
 	.string "PIKE QUEEN and cleared the event…$"
 
-BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints: @ 825C3D9
+BattleFrontier_BattlePikeLobby_Text_AwardYouTheseBattlePoints:
 	.string "In recognition of your amazing luck,\n"
 	.string "we award you these Battle Point(s)…$"
 
-BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal: @ 825C422
+BattleFrontier_BattlePikeLobby_Text_OneRoomAwayFromGoal:
 	.string "Arrgh! I blew my chance!\n"
 	.string "I was one room away from the goal!\p"
 	.string "In this place, you'd better watch out\n"
 	.string "for poison, freezing, and so on.$"
 
-BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer: @ 825C4A5
+BattleFrontier_BattlePikeLobby_Text_NeverHadToBattleTrainer:
 	.string "I've completed the challenge 10 times\n"
 	.string "now, but I've never had to battle\l"
 	.string "a TRAINER once.$"
 
-BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere: @ 825C4FD
+BattleFrontier_BattlePikeLobby_Text_ThinkAbilitiesUsefulHere:
 	.string "Listen! Listen!\p"
 	.string "Don't you think that the special\n"
 	.string "abilities of POKéMON will be useful\l"
 	.string "here?$"
 
 @ Unused
-BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose: @ 825C558
+BattleFrontier_BattlePikeLobby_Text_TrainersWhicheverPathIChoose:
 	.string "What is this weird place?\n"
 	.string "I can't figure it out at all!\p"
 	.string "I've taken the challenge a bunch\n"
 	.string "of times, but all I ever do is run into\l"
 	.string "TRAINERS whichever path I choose.$"
 
-BattleFrontier_BattlePikeLobby_Text_RulesAreListed: @ 825C5FB
+BattleFrontier_BattlePikeLobby_Text_RulesAreListed:
 	.string "The Battle Choice's rules are listed.$"
 
-BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading: @ 825C621
+BattleFrontier_BattlePikeLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules: @ 825C644
+BattleFrontier_BattlePikeLobby_Text_ExplainPokenavBagRules:
 	.string "The BAG and POKéNAV may not be used\n"
 	.string "during a Battle Choice challenge.$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules: @ 825C68A
+BattleFrontier_BattlePikeLobby_Text_ExplainHeldItemRules:
 	.string "During a Battle Choice challenge,\n"
 	.string "any BERRY or HERB held by POKéMON\l"
 	.string "will be effective only once.$"
 
-BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules: @ 825C6EB
+BattleFrontier_BattlePikeLobby_Text_ExplainMonOrderRules:
 	.string "During a Battle Choice challenge,\n"
 	.string "the sequence of POKéMON cannot be\l"
 	.string "changed.\p"

data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc

@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattlePikeRoomFinal_MapScripts:: @ 825E392
+BattleFrontier_BattlePikeRoomFinal_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomFinal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomFinal_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomFinal_OnFrame: @ 825E39D
+BattleFrontier_BattlePikeRoomFinal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
+BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom::
 	delay 16
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer
 	waitmovement 0
@@ -22,21 +22,21 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom:: @ 825E3A7
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer: @ 825E3DB
+BattleFrontier_BattlePikeRoomFinal_Movement_AttendantApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomFinal_OnWarp: @ 825E3DE
+BattleFrontier_BattlePikeRoomFinal_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth:: @ 825E3E8
+BattleFrontier_BattlePikeRoomFinal_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease: @ 825E3F2
+BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease:
 	.string "Congratulations…\n"
 	.string "Now, this way, please…$"
 

data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc

@@ -3,18 +3,18 @@
 .equ LOCALID_OBJ_0, 1
 .equ LOCALID_OBJ_1, 2
 
-BattleFrontier_BattlePikeRoomNormal_MapScripts:: @ 825D152
+BattleFrontier_BattlePikeRoomNormal_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePikeRoom_OnTransition
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomNormal_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomNormal_OnFrame: @ 825D167
+BattleFrontier_BattlePikeRoomNormal_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 825D171
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	pike_getroomtype
 	switch VAR_RESULT
@@ -26,7 +26,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterRoom:: @ 825D171
 	case PIKE_ROOM_BRAIN, BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: @ 825D1C6
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
@@ -42,18 +42,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom:: @ 825D1C
 	waitstate
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle
-BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost:: @ 825D20A
+BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle:: @ 825D226
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @ 825D231
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom::
 	lockall
 	delay 16
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer, MSGBOX_DEFAULT
@@ -75,7 +75,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterHardBattleRoom:: @ 825D231
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit
 	waitmovement 0
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer
@@ -93,7 +93,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonHardBattle:: @ 825D285
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: @ 825D2BF
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom::
 	delay 22
 	lockall
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer
@@ -104,7 +104,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterBrainRoom:: @ 825D2BF
 	case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon
 	case 2, BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
+BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster, MSGBOX_DEFAULT
 	closemessage
 	special SpawnCameraObject
@@ -141,14 +141,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter:: @ 825D2FB
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver:: @ 825D3BD
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
@@ -163,20 +163,20 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: @ 825D3DA
 	closemessage
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold:: @ 825D416
+BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold:: @ 825D443
+BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
@@ -192,7 +192,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: @ 825D460
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
+BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy::
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside
 	waitmovement 0
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
@@ -204,26 +204,26 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy:: @ 825D49D
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal:: @ 825D4DC
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenNoHeal::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon:: @ 825D4EA
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealOneMon::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne, MSGBOX_DEFAULT
 	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons:: @ 825D4FC
+BattleFrontier_BattlePikeRoomNormal_EventScript_PreQueenHealTwoMons::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo, MSGBOX_DEFAULT
 	playfanfare MUS_HEAL
 	waitfanfare
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer
@@ -240,7 +240,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterFullHealRoom:: @ 825D50E
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53E
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom::
 	lockall
 	delay 16
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight
@@ -272,7 +272,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterDoubleBattleRoom:: @ 825D53
 	goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
+BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle::
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2
 	waitmovement 0
 	applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit
@@ -283,7 +283,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WonDoubleBattle:: @ 825D5DC
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: @ 825D605
+BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom::
 	lockall
 	message BattleFrontier_BattlePikeRoomNormal_Text_WatchOut
 	applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer
@@ -299,7 +299,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom:: @ 825D605
 	releaseall
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: @ 825D643
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
@@ -334,7 +334,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack:: @ 825D643
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: @ 825D6D5
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT
 	closemessage
 	waitse
@@ -365,37 +365,37 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack:: @ 825D6D5
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic:: @ 825D751
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp:: @ 825D758
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave:: @ 825D75F
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis:: @ 825D766
+BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis::
 	message BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam:: @ 825D76D
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam::
 	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp:: @ 825D774
+BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp::
 	message BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp
 	waitmessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
+BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2
 	waitmovement 0
@@ -405,12 +405,12 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle:: @ 825D77B
 	waitstate
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer: @ 825D795
+BattleFrontier_BattlePikeRoomNormal_Movement_ApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit: @ 825D798
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit:
 	walk_up
 	walk_up
 	walk_up
@@ -418,17 +418,17 @@ BattleFrontier_BattlePikeRoomNormal_Movement_NPCExit: @ 825D798
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit: @ 825D79E
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExit:
 	walk_up
 	set_invisible
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon: @ 825D7A2
+BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon:
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer: @ 825D7A4
+BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer:
 	walk_down
 	face_left
 	delay_16
@@ -436,7 +436,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_StatusNPCApproachPlayer: @ 825D7A4
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer: @ 825D7AA
+BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer:
 	walk_fast_down
 	walk_fast_right
 	walk_fast_right
@@ -445,57 +445,57 @@ BattleFrontier_BattlePikeRoomNormal_Movement_MonApproachPlayer: @ 825D7AA
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC: @ 825D7B1
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC:
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside: @ 825D7B3
+BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside:
 	walk_left
-BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight: @ 825D7B4
+BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceRight:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer: @ 825D7B6
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCApproachPlayer:
 	walk_down
 	walk_down
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1: @ 825D7BB
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer1:
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2: @ 825D7BD
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceTrainer2:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp: @ 825D7BF
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerFaceUp:
 	face_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight: @ 825D7C1
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1WalkRight:
 	walk_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft: @ 825D7C3
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2WalkLeft:
 	walk_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown: @ 825D7C5
+BattleFrontier_BattlePikeRoomNormal_Movement_DoubleTrainersWalkDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer: @ 825D7C8
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1FacePlayer:
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer: @ 825D7CA
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2FacePlayer:
 	face_left
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit: @ 825D7CC
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -505,7 +505,7 @@ BattleFrontier_BattlePikeRoomNormal_Movement_Trainer1Exit: @ 825D7CC
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit: @ 825D7D4
+BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit:
 	walk_up
 	walk_up
 	walk_up
@@ -516,40 +516,40 @@ BattleFrontier_BattlePikeRoomNormal_Movement_Trainer2Exit: @ 825D7D4
 	step_end
 
 @ For approaching Lucy and exiting room after defeating Lucy
-BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2: @ 825D7DC
+BattleFrontier_BattlePikeRoomNormal_Movement_PlayerWalkUp2:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer: @ 825D7DF
+BattleFrontier_BattlePikeRoomNormal_Movement_PreQueenHealNPCApproachPlayer:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy: @ 825D7E2
+BattleFrontier_BattlePikeRoomNormal_Movement_HealNPCExitForLucy:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter: @ 825D7E7
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyEnter:
 	set_visible
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside: @ 825D7EA
+BattleFrontier_BattlePikeRoomNormal_Movement_LucyMoveAside:
 	walk_left
 	face_right
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_NPC:: @ 825D7ED
+BattleFrontier_BattlePikeRoomNormal_EventScript_NPC::
 	pike_getroomtype
 	switch VAR_RESULT
 	case PIKE_ROOM_NPC, BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC
 	case PIKE_ROOM_STATUS, BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC
 	case PIKE_ROOM_HEAL_PART, BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC
-BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: @ 825D81B
+BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC::
 	lock
 	faceplayer
 	pike_getnpcmsg
@@ -559,7 +559,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_NormalNPC:: @ 825D81B
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC:: @ 825D831
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine, MSGBOX_DEFAULT
@@ -567,7 +567,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC:: @ 825D831
 	release
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
+BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC::
 	pike_healonetwomons
 	compare VAR_RESULT, 2
 	call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
@@ -582,14 +582,14 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: @ 825D83E
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon:: @ 825D875
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon, MSGBOX_DEFAULT
 	closemessage
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons:: @ 825D881
+BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons, MSGBOX_DEFAULT
@@ -597,7 +597,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons:: @ 825D881
 	return
 
 @ Dusclops or Kirlia
-BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: @ 825D88D
+BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeRoomNormal_Text_Silence, MSGBOX_DEFAULT
@@ -607,7 +607,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon:: @ 825D88D
 	waitmovement 0
 	end
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: @ 825D8A4
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1
@@ -618,7 +618,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: @
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: @ 825D8E7
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1
@@ -629,7 +629,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: @
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: @ 825D92A
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1
@@ -640,7 +640,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: @ 825D92A
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: @ 825D96D
+BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed::
 	setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1
 	setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1
 	setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1
@@ -651,136 +651,136 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: @ 825D96
 	special DrawWholeMapView
 	return
 
-BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp: @ 825D9B0
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanUp:
 	walk_up
 	walk_up
 	step_end
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown: @ 825D9B3
+BattleFrontier_BattlePikeRoomNormal_Movement_CameraPanDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth: @ 825D9B6
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreToFullHealth:
 	.string "Welcome…\n"
 	.string "You must be commended for your luck…\p"
 	.string "Your POKéMON shall be restored\n"
 	.string "to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge: @ 825DA13
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge:
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon: @ 825DA51
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreOneMon:
 	.string "Ah, you're a lucky one.\n"
 	.string "I'm in somewhat-good spirits now.\p"
 	.string "I will restore one of your POKéMON\n"
 	.string "to full health.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell: @ 825DABE
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell:
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
 @ Seems there was a planned room type where the player could choose to battle and would be healed if they won
 @ Possibly replaced/superseded by the hard battle room, which is the same but the battle isnt optional
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_CareForBattleWillRestoreMons: @ 825DAE1
+BattleFrontier_BattlePikeRoomNormal_Text_CareForBattleWillRestoreMons:
 	.string "Excuse me…\p"
 	.string "Would you care for a battle?\n"
 	.string "I'll restore your POKéMON if you win.$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_NowShallWe: @ 825DB2F
+BattleFrontier_BattlePikeRoomNormal_Text_NowShallWe:
 	.string "Very well…\n"
 	.string "Now, shall we?$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_HowUnsportingOfYou: @ 825DB49
+BattleFrontier_BattlePikeRoomNormal_Text_HowUnsportingOfYou:
 	.string "I see…\n"
 	.string "How unsporting of you…$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreMonsAsPromised: @ 825DB67
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreMonsAsPromised:
 	.string "Magnificent…\p"
 	.string "As promised, I shall restore your\n"
 	.string "POKéMON to full health.$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell2: @ 825DBAE
+BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell2:
 	.string "The best of luck to you.\n"
 	.string "Farewell.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WatchOut: @ 825DBD1
+BattleFrontier_BattlePikeRoomNormal_Text_WatchOut:
 	.string "Oh, my!\p"
 	.string "Watch out!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop: @ 825DBE4
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop:
 	.string "Now, now!\n"
 	.string "KIRLIA, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop: @ 825DC01
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop:
 	.string "Now, now!\n"
 	.string "DUSCLOPS, stop that!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic: @ 825DC20
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedToxic:
 	.string "KIRLIA used TOXIC!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis: @ 825DC33
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedHypnosis:
 	.string "KIRLIA used HYPNOSIS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave: @ 825DC49
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedThunderWave:
 	.string "KIRLIA used THUNDER WAVE!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp: @ 825DC63
+BattleFrontier_BattlePikeRoomNormal_Text_KirliaUsedWillOWisp:
 	.string "KIRLIA used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp: @ 825DC7C
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedWillOWisp:
 	.string "DUSCLOPS used WILL-O-WISP!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam: @ 825DC97
+BattleFrontier_BattlePikeRoomNormal_Text_DusclopsUsedIceBeam:
 	.string "DUSCLOPS used ICE BEAM!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough: @ 825DCAF
+BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough:
 	.string "Look here!\n"
 	.string "That's quite enough!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia: @ 825DCCF
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForKirlia:
 	.string "I must apologize to you…\p"
 	.string "My KIRLIA has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops: @ 825DD06
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeForDusclops:
 	.string "I must apologize to you…\p"
 	.string "My DUSCLOPS has a TIMID nature…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled: @ 825DD3F
+BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled:
 	.string "It attacks without warning if it is\n"
 	.string "startled by another person…\p"
 	.string "Are you and your POKéMON all right?$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine: @ 825DDA3
+BattleFrontier_BattlePikeRoomNormal_Text_ApologizeHopeMonsAreFine:
 	.string "I do apologize for what happened…\n"
 	.string "I do hope your POKéMON are fine.$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_Silence: @ 825DDE6
+BattleFrontier_BattlePikeRoomNormal_Text_Silence:
 	.string "… … … … … …\n"
 	.string "… … … … … …$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer: @ 825DDFE
+BattleFrontier_BattlePikeRoomNormal_Text_BattleSomewhatToughTrainer:
 	.string "Welcome…\p"
 	.string "Here, we will have you battle\n"
 	.string "a somewhat-tough TRAINER…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth: @ 825DE3F
+BattleFrontier_BattlePikeRoomNormal_Text_RestoreToFullHealth:
 	.string "How wonderful…\p"
 	.string "To honor your victory, your POKéMON\n"
 	.string "shall be restored to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2: @ 825DE94
+BattleFrontier_BattlePikeRoomNormal_Text_EnjoyRestOfChallenge2:
 	.string "I urge you to enjoy the rest of your\n"
 	.string "Battle Choice challenge…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen: @ 825DED2
+BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen:
 	.string "I am LUCY…\n"
 	.string "I am the law here…\l"
 	.string "For I am the PIKE QUEEN…\p"
@@ -789,23 +789,23 @@ BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen: @ 825DED2
 	.string "…I'm not one for idle chatter.\n"
 	.string "Hurry. Come on…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck: @ 825DF71
+BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck:
 	.string "Your luck…\n"
 	.string "I hope you didn't use it all up here…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass: @ 825DFA2
+BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass:
 	.string "LUCY: … … … … … …\n"
 	.string "Show me your FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol: @ 825DFD0
+BattleFrontier_BattlePikeRoomNormal_Text_ReceivedLuckSymbol:
 	.string "The Luck Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear: @ 825E003
+BattleFrontier_BattlePikeRoomNormal_Text_AllThereIsDisappear:
 	.string "…That's all there is…\n"
 	.string "Disappear already…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain: @ 825E02C
+BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain:
 	.string "LUCY: …You again…\p"
 	.string "… … … … … …\p"
 	.string "…I've trampled flowers and braved\n"
@@ -815,51 +815,51 @@ BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain: @ 825E02C
 	.string "… … … … … …\n"
 	.string "Fine… I'll do it…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn: @ 825E0E8
+BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn:
 	.string "Now!\n"
 	.string "Come on!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass: @ 825E0F6
+BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass:
 	.string "LUCY: … … … … … …\p"
 	.string "…FRONTIER PASS…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine: @ 825E118
+BattleFrontier_BattlePikeRoomNormal_Text_LuckSymbolTookGoldenShine:
 	.string "The Luck Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_IWontForget: @ 825E140
+BattleFrontier_BattlePikeRoomNormal_Text_IWontForget:
 	.string "…You, I won't forget…\n"
 	.string "…Ever…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal: @ 825E15D
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomNoHeal:
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You seem to be bereft of luck…\p"
 	.string "If only you hadn't chosen this room,\n"
 	.string "your POKéMON could have been healed…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne: @ 825E1DD
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealOne:
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore one POKéMON to full health…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo: @ 825E238
+BattleFrontier_BattlePikeRoomNormal_Text_ChoseRoomHealTwo:
 	.string "I welcome you…\p"
 	.string "Since you have chosen this room, I will\n"
 	.string "restore two POKéMON to full health…$"
 
 @ Unused
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreAllMons: @ 825E293
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreAllMons:
 	.string "I welcome you…\p"
 	.string "Giggle…\n"
 	.string "You should thank your lucky stars…\p"
 	.string "Since you have chosen this room,\n"
 	.string "all your POKéMON will be restored…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster: @ 825E311
+BattleFrontier_BattlePikeRoomNormal_Text_ShallFetchOurMaster:
 	.string "I shall go fetch our master…$"
 
-BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons: @ 825E32E
+BattleFrontier_BattlePikeRoomNormal_Text_WillRestoreTwoMons:
 	.string "Ah, you're a lucky one!\n"
 	.string "I'm in good spirits now.\p"
 	.string "I will restore two of your POKéMON\n"

data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc

@@ -1,35 +1,35 @@
-BattleFrontier_BattlePikeRoomWildMons_MapScripts:: @ 825E41A
+BattleFrontier_BattlePikeRoomWildMons_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoomWildMons_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeRoomWildMons_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_OnFrame: @ 825E42A
+BattleFrontier_BattlePikeRoomWildMons_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom
 	map_script_2 VAR_TEMP_1, 1, BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom:: @ 825E43C
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom::
 	setvar VAR_TEMP_0, 1
 	pike_inwildmonroom
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost:: @ 825E44A
+BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_OnWarp: @ 825E466
+BattleFrontier_BattlePikeRoomWildMons_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth:: @ 825E470
+BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
+BattleFrontier_BattlePikeRoomWildMons_OnResume:
 	call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	compare VAR_RESULT, B_OUTCOME_LOST
@@ -38,7 +38,7 @@ BattleFrontier_BattlePikeRoomWildMons_OnResume: @ 825E47A
 	goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
 	end
 
-BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost:: @ 825E4A3
+BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost::
 	setvar VAR_TEMP_1, 1
 	end
 

data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc

@@ -1,12 +1,12 @@
 .set LOCALID_HINT_GIVER, 2
 
-BattleFrontier_BattlePikeThreePathRoom_MapScripts:: @ 825C843
+BattleFrontier_BattlePikeThreePathRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePikeRoom_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePikeThreePathRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
+BattleFrontier_BattlePikeThreePathRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge
@@ -14,25 +14,25 @@ BattleFrontier_BattlePikeThreePathRoom_OnFrame: @ 825C853
 	map_script_2 VAR_TEMP_5, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_OnWarp: @ 825C87D
+BattleFrontier_BattlePikeThreePathRoom_OnWarp:
 	map_script_2 VAR_TEMP_4, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth:: @ 825C887
+BattleFrontier_BattlePikeThreePathRoom_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_4, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus:: @ 825C891
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: @ 825C89A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6
 	waitstate
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge::
 	lockall
 	message BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume
 	waitmessage
@@ -50,7 +50,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_ResumeChallenge:: @ 825C8A4
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
+BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant::
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Room number
 	switch VAR_RESULT
 	case 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1
@@ -62,56 +62,56 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_Attendant:: @ 825C908
 	case 13, BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1:: @ 825C968
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom1::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3:: @ 825C978
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom3::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5:: @ 825C988
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom5::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7:: @ 825C998
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom7::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9:: @ 825C9A8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom9::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11:: @ 825C9B8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom11::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13:: @ 825C9C8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AttendantRoom13::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C9D8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge
@@ -119,7 +119,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskContinueChallenge:: @ 825C
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
+BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge::
 	frontier_saveparty
 	message BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData
 	waitmessage
@@ -131,7 +131,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge:: @ 825C9FD
 	frontier_reset
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit, MSGBOX_YESNO
 	switch VAR_RESULT
 	case YES, BattleFrontier_BattlePikeThreePathRoom_EventScript_PauseChallenge
@@ -140,7 +140,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskSaveChallenge:: @ 825CA2A
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -149,18 +149,18 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge:: @ 825CA5
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom:: @ 825CA78
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom::
 	pike_sethintroom
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint:: @ 825CA91
+BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint::
 	setvar VAR_TEMP_5, 1
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint::
 	applymovement LOCALID_HINT_GIVER, BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer
 	waitmovement 0
 	lockall
@@ -171,7 +171,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint:: @ 825CA97
 	setvar VAR_TEMP_5, 255
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver::
 	pike_gethint
 	compare VAR_RESULT, PIKE_HINT_BRAIN
 	goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
@@ -185,12 +185,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: @ 825CABB
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint:: @ 825CB00
+BattleFrontier_BattlePikeThreePathRoom_EventScript_DeclineHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint::
 	pike_gethintroomid
 	switch VAR_RESULT
 	case PIKE_ROOM_LEFT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint
@@ -198,19 +198,19 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AcceptHint:: @ 825CB0A
 	case PIKE_ROOM_RIGHT, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint:: @ 825CB39
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveLeftRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint:: @ 825CB46
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveCenterRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint:: @ 825CB53
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveRightRoomHint::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint::
 	pike_gethint
 	switch VAR_RESULT
 	case PIKE_HINT_NOSTALGIA, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia
@@ -219,34 +219,34 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveHint:: @ 825CB60
 	case PIKE_HINT_PEOPLE, BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia:: @ 825CB9A
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintNostalgia::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering:: @ 825CBA4
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintWhispering::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon:: @ 825CBAE
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPokemon::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople:: @ 825CBB8
+BattleFrontier_BattlePikeThreePathRoom_EventScript_HintPeople::
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint:: @ 825CBC2
+BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint::
 	lock
 	faceplayer
 	msgbox BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CBCE
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer:
 	walk_left
 	walk_left
 	walk_down
@@ -255,7 +255,7 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverApproachPlayer: @ 825CB
 	walk_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
+BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos:
 	walk_up
 	walk_up
 	walk_up
@@ -265,107 +265,107 @@ BattleFrontier_BattlePikeThreePathRoom_Movement_HintGiverReturnToPos: @ 825CBD5
 	face_down
 	step_end
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1: @ 825CBDD
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom1:
 	.string "You are currently in\n"
 	.string "the 1st room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3: @ 825CC00
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom3:
 	.string "You are currently in\n"
 	.string "the 3rd room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5: @ 825CC23
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom5:
 	.string "You are currently in\n"
 	.string "the 5th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7: @ 825CC46
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom7:
 	.string "You are currently in\n"
 	.string "the 7th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9: @ 825CC69
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom9:
 	.string "You are currently in\n"
 	.string "the 9th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11: @ 825CC8C
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom11:
 	.string "You are currently in\n"
 	.string "the 11th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13: @ 825CCB0
+BattleFrontier_BattlePikeThreePathRoom_Text_CurrentlyInRoom13:
 	.string "You are currently in\n"
 	.string "the 13th room…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge: @ 825CCD4
+BattleFrontier_BattlePikeThreePathRoom_Text_ContinueWithChallenge:
 	.string "Will you continue with\n"
 	.string "your challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit: @ 825CCFB
+BattleFrontier_BattlePikeThreePathRoom_Text_SaveChallengeAndQuit:
 	.string "Would you like to save your challenge\n"
 	.string "and quit the game for now?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge: @ 825CD3C
+BattleFrontier_BattlePikeThreePathRoom_Text_RetireFromChallenge:
 	.string "Do you wish to retire from your\n"
 	.string "Battle Choice challenge?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume: @ 825CD75
+BattleFrontier_BattlePikeThreePathRoom_Text_AwaitingReturnSaveBeforeResume:
 	.string "We've been awaiting your return…\p"
 	.string "Before resuming your Battle Choice\n"
 	.string "challenge, let me save the game…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge: @ 825CDDA
+BattleFrontier_BattlePikeThreePathRoom_Text_PleaseEnjoyChallenge:
 	.string "Please do enjoy your Battle Choice\n"
 	.string "challenge…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData: @ 825CE08
+BattleFrontier_BattlePikeThreePathRoom_Text_SavingYourData:
 	.string "I am saving your data…\n"
 	.string "A little time, please…$"
 
-BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack: @ 825CE36
+BattleFrontier_BattlePike_Text_PathBlockedNoTurningBack:
 	.string "The path is blocked!\n"
 	.string "And there is no turning back…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose: @ 825CE69
+BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose:
 	.string "I beg your pardon, but…\p"
 	.string "Are you perhaps finding it difficult\n"
 	.string "to choose your path?$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence: @ 825CEBB
+BattleFrontier_BattlePikeThreePathRoom_Text_ApologizeForImpertinence:
 	.string "I see…\n"
 	.string "I apologize for my impertinence…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath: @ 825CEE3
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutRightPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the right…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath: @ 825CF23
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutCenterPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path in the center…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath: @ 825CF64
+BattleFrontier_BattlePikeThreePathRoom_Text_SomethingAboutLeftPath:
 	.string "Ah, let me see… There is something\n"
 	.string "about the path on the left…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon: @ 825CFA3
+BattleFrontier_BattlePikeThreePathRoom_Text_AromaOfPokemon:
 	.string "It seems to have the distinct aroma\n"
 	.string "of POKéMON wafting around it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople: @ 825CFE5
+BattleFrontier_BattlePikeThreePathRoom_Text_PresenceOfPeople:
 	.string "Is it… A TRAINER?\n"
 	.string "I sense the presence of people…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering: @ 825D017
+BattleFrontier_BattlePikeThreePathRoom_Text_HeardWhispering:
 	.string "I seem to have heard something…\n"
 	.string "It may have been whispering…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga: @ 825D054
+BattleFrontier_BattlePikeThreePathRoom_Text_WaveOfNostaliga:
 	.string "For some odd reason, I felt a wave\n"
 	.string "of nostalgia coming from it…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent: @ 825D094
+BattleFrontier_BattlePikeThreePathRoom_Text_TerrifyingEvent:
 	.string "I am sorry to say…\p"
 	.string "A terrifying event, yes, a horrible one,\n"
 	.string "is about to befall you…\p"
 	.string "I urge you to pay the utmost care\n"
 	.string "and prepare for the worst…$"
 
-BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence: @ 825D125
+BattleFrontier_BattlePikeThreePathRoom_Text_DreadfulPresence:
 	.string "From every path I sense a dreadful\n"
 	.string "presence…$"

data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc

@@ -1,16 +1,16 @@
-BattleFrontier_BattlePyramidFloor_MapScripts:: @ 8252A33
+BattleFrontier_BattlePyramidFloor_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidFloor_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidFloor_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidFloor_OnTransition
 	.byte 0
 
-BattleFrontier_BattlePyramidFloor_OnFrame: @ 8252A43
+BattleFrontier_BattlePyramidFloor_OnFrame:
 	map_script_2 VAR_TEMP_D, 1, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight
 	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight::
 	lockall
 	@ pyramid_updatelight, cant use macro because it straddles the loop
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
@@ -18,7 +18,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight:: @ 8252A5D
 	setvar VAR_0x8006, PYRAMID_LIGHT_INCR_RADIUS
 	setvar VAR_0x8007, SE_SAVE
 	setvar VAR_RESULT, 0
-BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
+BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop::
 	special CallBattlePyramidFunction
 	delay 2
 	compare VAR_RESULT, 2
@@ -27,17 +27,17 @@ BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: @ 8252A77
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName:: @ 8252A8F
+BattleFrontier_BattlePyramidFloor_EventScript_ShowMapName::
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic:: @ 8252A98
+BattleFrontier_BattlePyramidFloor_EventScript_PlayPyramidMusic::
-	playbgm MUS_B_PYRAMID, 0
+	playbgm MUS_B_PYRAMID, FALSE
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
+BattleFrontier_BattlePyramidFloor_OnResume:
 	pyramid_setfloorpal
 	frontier_getstatus
 	switch VAR_TEMP_0
@@ -59,14 +59,14 @@ BattleFrontier_BattlePyramidFloor_OnResume: @ 8252AA2
 	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	frontier_isbattletype BATTLE_TYPE_TRAINER  @ VAR_RESULT seems to be ignored here
 	setvar VAR_TEMP_D, 1
-BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: @ 8252B39
+BattleFrontier_BattlePyramidFloor_EventScript_ResetParty::
 	pyramid_resetparty
 	end
 
-BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost:: @ 8252B42
+BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	pyramid_set PYRAMID_DATA_TRAINER_FLAGS, 255
-BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
+BattleFrontier_BattlePyramid_EventScript_WarpToLobby::
 	pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
 	pyramid_clearhelditems
 	special HealPlayerParty
@@ -74,7 +74,7 @@ BattleFrontier_BattlePyramid_EventScript_WarpToLobby:: @ 8252B66
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
+BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge::
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -83,16 +83,16 @@ BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge:: @ 8252B8D
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_OnTransition: @ 8252BCA
+BattleFrontier_BattlePyramidFloor_OnTransition:
 	call BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius:: @ 8252BD5
+BattleFrontier_BattlePyramidFloor_EventScript_SetLightRadius::
 	pyramid_updatelight 32, PYRAMID_LIGHT_SET_RADIUS
 	return
 
-BattlePyramid_WarpToNextFloor:: @ 8252BE8
+BattlePyramid_WarpToNextFloor::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_get FRONTIER_DATA_BATTLE_NUM  @ Floor number
 	addvar VAR_RESULT, 1
@@ -106,13 +106,13 @@ BattlePyramid_WarpToNextFloor:: @ 8252BE8
 	waitstate
 	end
 
-BattlePyramid_WarpToTop:: @ 8252C45
+BattlePyramid_WarpToTop::
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17
 	waitstate
 	end
 
 @ TRAINER_PHILLIP is used as a placeholder
-BattlePyramid_TrainerBattle:: @ 8252C4F
+BattlePyramid_TrainerBattle::
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	pyramid_showhint
 	waitmessage
@@ -121,620 +121,620 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
 	releaseall
 	end
 
-BattlePyramid_FindItemBall:: @ 8252C6A
+BattlePyramid_FindItemBall::
 	pyramid_setitem
 	callstd STD_FIND_ITEM
 	compare VAR_0x8007, 0
 	goto_if_eq BattlePyramid_FindItemBallEnd
 	pyramid_hideitem
-BattlePyramid_FindItemBallEnd:: @ 8252C87
+BattlePyramid_FindItemBallEnd::
 	end
 
-BattlePyramid_Retire:: @ 8252C88
+BattlePyramid_Retire::
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
 @ Also used by Trainer Hill
-BattleFacility_TrainerBattle_PlaceholderText: @ 8252C8D
+BattleFacility_TrainerBattle_PlaceholderText:
 	.string "This is a sample message.$"
 
-gText_BattlePyramidConfirmRest:: @ 8252CA7
+gText_BattlePyramidConfirmRest::
 	.string "Your BATTLE PYRAMID quest will be\n"
 	.string "saved so that you may quit for now.\l"
 	.string "Is that okay?$"
 
-gText_BattlePyramidConfirmRetire:: @ 8252CFB
+gText_BattlePyramidConfirmRetire::
 	.string "Are you sure you want to quit your\n"
 	.string "PYRAMID quest?$"
 
-BattlePyramid_Text_ExitHintUp1:: @ 8252D2D
+BattlePyramid_Text_ExitHintUp1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {UP_ARROW}$"
 
-BattlePyramid_Text_ExitHintLeft1:: @ 8252D57
+BattlePyramid_Text_ExitHintLeft1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {LEFT_ARROW}$"
 
-BattlePyramid_Text_ExitHintRight1:: @ 8252D81
+BattlePyramid_Text_ExitHintRight1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {RIGHT_ARROW}$"
 
-BattlePyramid_Text_ExitHintDown1:: @ 8252DAB
+BattlePyramid_Text_ExitHintDown1::
 	.string "This floor's exit is in\n"
 	.string "that direction: {DOWN_ARROW}$"
 
-BattlePyramid_Text_ExitHintUp2:: @ 8252DD5
+BattlePyramid_Text_ExitHintUp2::
 	.string "The exit on this floor is in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft2:: @ 8252E03
+BattlePyramid_Text_ExitHintLeft2::
 	.string "The exit on this floor is in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight2:: @ 8252E31
+BattlePyramid_Text_ExitHintRight2::
 	.string "The exit on this floor is in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown2:: @ 8252E5F
+BattlePyramid_Text_ExitHintDown2::
 	.string "The exit on this floor is in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintUp3:: @ 8252E8D
+BattlePyramid_Text_ExitHintUp3::
 	.string "The exit is over\n"
 	.string "that {UP_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintLeft3:: @ 8252EAA
+BattlePyramid_Text_ExitHintLeft3::
 	.string "The exit is over\n"
 	.string "that {LEFT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintRight3:: @ 8252EC7
+BattlePyramid_Text_ExitHintRight3::
 	.string "The exit is over\n"
 	.string "that {RIGHT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintDown3:: @ 8252EE4
+BattlePyramid_Text_ExitHintDown3::
 	.string "The exit is over\n"
 	.string "that {DOWN_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintUp4:: @ 8252F01
+BattlePyramid_Text_ExitHintUp4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft4:: @ 8252F3A
+BattlePyramid_Text_ExitHintLeft4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight4:: @ 8252F73
+BattlePyramid_Text_ExitHintRight4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown4:: @ 8252FAC
+BattlePyramid_Text_ExitHintDown4::
 	.string "On this floor, the exit is somewhere\n"
 	.string "in the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintUp5:: @ 8252FE5
+BattlePyramid_Text_ExitHintUp5::
 	.string "The exit?\n"
 	.string "It's that {UP_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintLeft5:: @ 8253000
+BattlePyramid_Text_ExitHintLeft5::
 	.string "The exit?\n"
 	.string "It's that {LEFT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintRight5:: @ 825301B
+BattlePyramid_Text_ExitHintRight5::
 	.string "The exit?\n"
 	.string "It's that {RIGHT_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintDown5:: @ 8253036
+BattlePyramid_Text_ExitHintDown5::
 	.string "The exit?\n"
 	.string "It's that {DOWN_ARROW} way.$"
 
-BattlePyramid_Text_ExitHintUp6:: @ 8253051
+BattlePyramid_Text_ExitHintUp6::
 	.string "The exit happens to be in\n"
 	.string "the {UP_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintLeft6:: @ 825307C
+BattlePyramid_Text_ExitHintLeft6::
 	.string "The exit happens to be in\n"
 	.string "the {LEFT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintRight6:: @ 82530A7
+BattlePyramid_Text_ExitHintRight6::
 	.string "The exit happens to be in\n"
 	.string "the {RIGHT_ARROW} direction.$"
 
-BattlePyramid_Text_ExitHintDown6:: @ 82530D2
+BattlePyramid_Text_ExitHintDown6::
 	.string "The exit happens to be in\n"
 	.string "the {DOWN_ARROW} direction.$"
 
-BattlePyramid_Text_EightItemsRemaining1:: @ 82530FD
+BattlePyramid_Text_EightItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are eight items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_SevenItemsRemaining1:: @ 8253140
+BattlePyramid_Text_SevenItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are seven items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_SixItemsRemaining1:: @ 8253183
+BattlePyramid_Text_SixItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are six items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_FiveItemsRemaining1:: @ 82531C4
+BattlePyramid_Text_FiveItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are five items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_FourItemsRemaining1:: @ 8253206
+BattlePyramid_Text_FourItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are four items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_ThreeItemsRemaining1:: @ 8253248
+BattlePyramid_Text_ThreeItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are three items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_TwoItemsRemaining1:: @ 825328B
+BattlePyramid_Text_TwoItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There are two items left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_OneItemRemaining1:: @ 82532CC
+BattlePyramid_Text_OneItemRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There is one item left to\n"
 	.string "be found.$"
 
-BattlePyramid_Text_ZeroItemsRemaining1:: @ 825330B
+BattlePyramid_Text_ZeroItemsRemaining1::
 	.string "Are you looking for items?\p"
 	.string "There isn't anything left to\n"
 	.string "be found!$"
 
-BattlePyramid_Text_EightItemsRemaining2:: @ 825334D
+BattlePyramid_Text_EightItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are eight items\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_SevenItemsRemaining2:: @ 82533A6
+BattlePyramid_Text_SevenItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are seven items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_SixItemsRemaining2:: @ 8253404
+BattlePyramid_Text_SixItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are six items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_FiveItemsRemaining2:: @ 8253460
+BattlePyramid_Text_FiveItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are five items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_FourItemsRemaining2:: @ 82534BD
+BattlePyramid_Text_FourItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are four items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_ThreeItemsRemaining2:: @ 825351A
+BattlePyramid_Text_ThreeItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are three items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_TwoItemsRemaining2:: @ 8253578
+BattlePyramid_Text_TwoItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There are two items left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_OneItemRemaining2:: @ 82535D4
+BattlePyramid_Text_OneItemRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There is just one item\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_ZeroItemsRemaining2:: @ 825362E
+BattlePyramid_Text_ZeroItemsRemaining2::
 	.string "Because you won, I'll tell you\n"
 	.string "a little secret!\p"
 	.string "There isn't anything left\n"
 	.string "lying around here.$"
 
-BattlePyramid_Text_EightItemsRemaining3:: @ 825368B
+BattlePyramid_Text_EightItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are eight items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_SevenItemsRemaining3:: @ 82536F8
+BattlePyramid_Text_SevenItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are seven items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_SixItemsRemaining3:: @ 8253765
+BattlePyramid_Text_SixItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are six items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_FiveItemsRemaining3:: @ 82537D0
+BattlePyramid_Text_FiveItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are five items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_FourItemsRemaining3:: @ 825383C
+BattlePyramid_Text_FourItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are four items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_ThreeItemsRemaining3:: @ 82538A8
+BattlePyramid_Text_ThreeItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are three items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_TwoItemsRemaining3:: @ 8253915
+BattlePyramid_Text_TwoItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are two items left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_OneItemRemaining3:: @ 8253980
+BattlePyramid_Text_OneItemRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there's but one item left\n"
 	.string "waiting to be found on this floor.$"
 
-BattlePyramid_Text_ZeroItemsRemaining3:: @ 82539EC
+BattlePyramid_Text_ZeroItemsRemaining3::
 	.string "How's your stock of items holding up?\p"
 	.string "I reckon there are no more items\n"
 	.string "waiting to be found on this floor.\l"
 	.string "You take care now!$"
 
-BattlePyramid_Text_EightItemsRemaining4:: @ 8253A69
+BattlePyramid_Text_EightItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be eight more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_SevenItemsRemaining4:: @ 8253AC4
+BattlePyramid_Text_SevenItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be seven more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_SixItemsRemaining4:: @ 8253B1F
+BattlePyramid_Text_SixItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be six more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_FiveItemsRemaining4:: @ 8253B78
+BattlePyramid_Text_FiveItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be five more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_FourItemsRemaining4:: @ 8253BD2
+BattlePyramid_Text_FourItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be four more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_ThreeItemsRemaining4:: @ 8253C2C
+BattlePyramid_Text_ThreeItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be three more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_TwoItemsRemaining4:: @ 8253C87
+BattlePyramid_Text_TwoItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be two more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_OneItemRemaining4:: @ 8253CE0
+BattlePyramid_Text_OneItemRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appears to be only one more\n"
 	.string "item on the ground.$"
 
-BattlePyramid_Text_ZeroItemsRemaining4:: @ 8253D3E
+BattlePyramid_Text_ZeroItemsRemaining4::
 	.string "You're strong, so you've earned\n"
 	.string "a hint!\p"
 	.string "There appear to be no more\n"
 	.string "items on the ground.$"
 
-BattlePyramid_Text_EightItemsRemaining5:: @ 8253D96
+BattlePyramid_Text_EightItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are eight items…$"
 
-BattlePyramid_Text_SevenItemsRemaining5:: @ 8253DD2
+BattlePyramid_Text_SevenItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are seven items…$"
 
-BattlePyramid_Text_SixItemsRemaining5:: @ 8253E0E
+BattlePyramid_Text_SixItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are six items…$"
 
-BattlePyramid_Text_FiveItemsRemaining5:: @ 8253E48
+BattlePyramid_Text_FiveItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are five items…$"
 
-BattlePyramid_Text_FourItemsRemaining5:: @ 8253E83
+BattlePyramid_Text_FourItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are four items…$"
 
-BattlePyramid_Text_ThreeItemsRemaining5:: @ 8253EBE
+BattlePyramid_Text_ThreeItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are three items…$"
 
-BattlePyramid_Text_TwoItemsRemaining5:: @ 8253EFA
+BattlePyramid_Text_TwoItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are two items…$"
 
-BattlePyramid_Text_OneItemRemaining5:: @ 8253F34
+BattlePyramid_Text_OneItemRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there is one item…$"
 
-BattlePyramid_Text_ZeroItemsRemaining5:: @ 8253F6C
+BattlePyramid_Text_ZeroItemsRemaining5::
 	.string "On this floor of the PYRAMID,\n"
 	.string "I hear there are no items…$"
 
-BattlePyramid_Text_EightItemsRemaining6:: @ 8253FA5
+BattlePyramid_Text_EightItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are eight more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SevenItemsRemaining6:: @ 8253FF7
+BattlePyramid_Text_SevenItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are seven more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SixItemsRemaining6:: @ 8254049
+BattlePyramid_Text_SixItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are six more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_FiveItemsRemaining6:: @ 8254099
+BattlePyramid_Text_FiveItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are five more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_FourItemsRemaining6:: @ 82540EA
+BattlePyramid_Text_FourItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are four more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_ThreeItemsRemaining6:: @ 825413B
+BattlePyramid_Text_ThreeItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are three more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_TwoItemsRemaining6:: @ 825418D
+BattlePyramid_Text_TwoItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are two more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_OneItemRemaining6:: @ 82541DD
+BattlePyramid_Text_OneItemRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there is one more\n"
 	.string "item on this floor.$"
 
-BattlePyramid_Text_ZeroItemsRemaining6:: @ 825422B
+BattlePyramid_Text_ZeroItemsRemaining6::
 	.string "Have you collected any items?\p"
 	.string "I believe there are no more\n"
 	.string "items on this floor.$"
 
-BattlePyramid_Text_SevenTrainersRemaining1:: @ 825427A
+BattlePyramid_Text_SevenTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still seven tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_SixTrainersRemaining1:: @ 82542CB
+BattlePyramid_Text_SixTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still six tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_FiveTrainersRemaining1:: @ 825431A
+BattlePyramid_Text_FiveTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still five tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_FourTrainersRemaining1:: @ 825436A
+BattlePyramid_Text_FourTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still four tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_ThreeTrainersRemaining1:: @ 82543BA
+BattlePyramid_Text_ThreeTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still three tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_TwoTrainersRemaining1:: @ 825440B
+BattlePyramid_Text_TwoTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there are still two tough\n"
 	.string "TRAINERS other than me!$"
 
-BattlePyramid_Text_OneTrainersRemaining1:: @ 825445A
+BattlePyramid_Text_OneTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "But there's still one tough\n"
 	.string "TRAINER other than me!$"
 
-BattlePyramid_Text_ZeroTrainersRemaining1:: @ 82544A6
+BattlePyramid_Text_ZeroTrainersRemaining1::
 	.string "You were really awesome!\p"
 	.string "There's no one left that\n"
 	.string "can beat you!$"
 
-BattlePyramid_Text_SevenTrainersRemaining2:: @ 82544E6
+BattlePyramid_Text_SevenTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are seven TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_SixTrainersRemaining2:: @ 8254538
+BattlePyramid_Text_SixTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are six TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_FiveTrainersRemaining2:: @ 8254588
+BattlePyramid_Text_FiveTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are five TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_FourTrainersRemaining2:: @ 82545D9
+BattlePyramid_Text_FourTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are four TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_ThreeTrainersRemaining2:: @ 825462A
+BattlePyramid_Text_ThreeTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are three TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_TwoTrainersRemaining2:: @ 825467C
+BattlePyramid_Text_TwoTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are two TRAINERS left!\n"
 	.string "Someone will humble you!$"
 
-BattlePyramid_Text_OneTrainersRemaining2:: @ 82546CC
+BattlePyramid_Text_OneTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there's one TRAINER left!\n"
 	.string "I'm sure you will be humbled!$"
 
-BattlePyramid_Text_ZeroTrainersRemaining2:: @ 825471E
+BattlePyramid_Text_ZeroTrainersRemaining2::
 	.string "This is so upsetting!\p"
 	.string "But there are no more TRAINERS\n"
 	.string "who can engage you!$"
 
-BattlePyramid_Text_SevenTrainersRemaining3:: @ 8254767
+BattlePyramid_Text_SevenTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are seven more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_SixTrainersRemaining3:: @ 82547C9
+BattlePyramid_Text_SixTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are six more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_FiveTrainersRemaining3:: @ 8254829
+BattlePyramid_Text_FiveTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are five more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_FourTrainersRemaining3:: @ 825488A
+BattlePyramid_Text_FourTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are four more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_ThreeTrainersRemaining3:: @ 82548EB
+BattlePyramid_Text_ThreeTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are three more TRAINERS\n"
 	.string "on this floor. Can you beat them all?$"
 
-BattlePyramid_Text_TwoTrainersRemaining3:: @ 825494D
+BattlePyramid_Text_TwoTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there are two more TRAINERS\n"
 	.string "on this floor. Can you beat them both?$"
 
-BattlePyramid_Text_OneTrainersRemaining3:: @ 82549AE
+BattlePyramid_Text_OneTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "But there's still one more TRAINER\n"
 	.string "on this floor. Can you prevail?$"
 
-BattlePyramid_Text_ZeroTrainersRemaining3:: @ 8254A0B
+BattlePyramid_Text_ZeroTrainersRemaining3::
 	.string "That's pretty impressive!\p"
 	.string "You've gone through all the TRAINERS\n"
 	.string "on this floor.$"
 
-BattlePyramid_Text_SevenTrainersRemaining4:: @ 8254A59
+BattlePyramid_Text_SevenTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the seven TRAINERS left on this floor.$"
 
-BattlePyramid_Text_SixTrainersRemaining4:: @ 8254A9E
+BattlePyramid_Text_SixTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the six TRAINERS left on this floor.$"
 
-BattlePyramid_Text_FiveTrainersRemaining4:: @ 8254AE1
+BattlePyramid_Text_FiveTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the five TRAINERS left on this floor.$"
 
-BattlePyramid_Text_FourTrainersRemaining4:: @ 8254B25
+BattlePyramid_Text_FourTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the four TRAINERS left on this floor.$"
 
-BattlePyramid_Text_ThreeTrainersRemaining4:: @ 8254B69
+BattlePyramid_Text_ThreeTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the three TRAINERS left on this floor.$"
 
-BattlePyramid_Text_TwoTrainersRemaining4:: @ 8254BAE
+BattlePyramid_Text_TwoTrainersRemaining4::
 	.string "Maybe you could sweep through\n"
 	.string "the two TRAINERS left on this floor.$"
 
-BattlePyramid_Text_OneTrainersRemaining4:: @ 8254BF1
+BattlePyramid_Text_OneTrainersRemaining4::
 	.string "Maybe you could complete your sweep\n"
 	.string "with the one TRAINER left on this floor.$"
 
-BattlePyramid_Text_ZeroTrainersRemaining4:: @ 8254C3E
+BattlePyramid_Text_ZeroTrainersRemaining4::
 	.string "There isn't a single person left who\n"
 	.string "can defeat you now…$"
 
-BattlePyramid_Text_SevenTrainersRemaining5:: @ 8254C77
+BattlePyramid_Text_SevenTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the seven expert TRAINERS who remain.$"
 
-BattlePyramid_Text_SixTrainersRemaining5:: @ 8254CC0
+BattlePyramid_Text_SixTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the six expert TRAINERS who remain.$"
 
-BattlePyramid_Text_FiveTrainersRemaining5:: @ 8254D07
+BattlePyramid_Text_FiveTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the five expert TRAINERS who remain.$"
 
-BattlePyramid_Text_FourTrainersRemaining5:: @ 8254D4F
+BattlePyramid_Text_FourTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the four expert TRAINERS who remain.$"
 
-BattlePyramid_Text_ThreeTrainersRemaining5:: @ 8254D97
+BattlePyramid_Text_ThreeTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the three expert TRAINERS who remain.$"
 
-BattlePyramid_Text_TwoTrainersRemaining5:: @ 8254DE0
+BattlePyramid_Text_TwoTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the two expert TRAINERS who remain.$"
 
-BattlePyramid_Text_OneTrainersRemaining5:: @ 8254E27
+BattlePyramid_Text_OneTrainersRemaining5::
 	.string "You may have what it takes to beat\n"
 	.string "the one expert TRAINER who remains.$"
 
-BattlePyramid_Text_ZeroTrainersRemaining5:: @ 8254E6E
+BattlePyramid_Text_ZeroTrainersRemaining5::
 	.string "Your skills are beyond reproach.\p"
 	.string "There are no more TRAINERS here\n"
 	.string "who have any chance of beating you.$"
 
-BattlePyramid_Text_SevenTrainersRemaining6:: @ 8254ED3
+BattlePyramid_Text_SevenTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the seven remaining TRAINERS?$"
 
-BattlePyramid_Text_SixTrainersRemaining6:: @ 8254F0E
+BattlePyramid_Text_SixTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the six remaining TRAINERS?$"
 
-BattlePyramid_Text_FiveTrainersRemaining6:: @ 8254F47
+BattlePyramid_Text_FiveTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the five remaining TRAINERS?$"
 
-BattlePyramid_Text_FourTrainersRemaining6:: @ 8254F81
+BattlePyramid_Text_FourTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the four remaining TRAINERS?$"
 
-BattlePyramid_Text_ThreeTrainersRemaining6:: @ 8254FBB
+BattlePyramid_Text_ThreeTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the three remaining TRAINERS?$"
 
-BattlePyramid_Text_TwoTrainersRemaining6:: @ 8254FF6
+BattlePyramid_Text_TwoTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the two remaining TRAINERS?$"
 
-BattlePyramid_Text_OneTrainersRemaining6:: @ 825502F
+BattlePyramid_Text_OneTrainersRemaining6::
 	.string "Can you keep winning against\n"
 	.string "the last remaining TRAINER?$"
 
-BattlePyramid_Text_ZeroTrainersRemaining6:: @ 8255068
+BattlePyramid_Text_ZeroTrainersRemaining6::
 	.string "There aren't any TRAINERS left that\n"
 	.string "can take you on now…$"

data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc

@@ -1,22 +1,22 @@
 .set LOCALID_ATTENDANT, 1
 .set LOCALID_HINT_GIVER, 2
 
-BattleFrontier_BattlePyramidLobby_MapScripts:: @ 8250716
+BattleFrontier_BattlePyramidLobby_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidLobby_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleDomeLobby_OnWarp
 	.byte 0
 
 @ Unused. Pyramid uses Dome's OnWarp (presumably by mistake). Their effects are identical
-BattleFrontier_BattlePyramidLobby_OnWarp: @ 8250721
+BattleFrontier_BattlePyramidLobby_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth: @ 825072B
+BattleFrontier_BattlePyramidLobby_EventScript_TurnPlayerNorth:
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end
 
-BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
+BattleFrontier_BattlePyramidLobby_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge
@@ -24,11 +24,11 @@ BattleFrontier_BattlePyramidLobby_OnFrame: @ 8250735
 	map_script_2 VAR_TEMP_0, CHALLENGE_STATUS_LOST, BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge
 	.2byte 0
 
-BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus:: @ 825075F
+BattleFrontier_BattlePyramidLobby_EventScript_GetChallengeStatus::
 	frontier_getstatus
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
+BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving::
 	lockall
 	message BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag
 	waitmessage
@@ -42,7 +42,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving:: @ 8250768
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1
+BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge::
 	lockall
 	frontier_isbrain
 	compare VAR_RESULT, TRUE
@@ -50,9 +50,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: @ 82507B1
 	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints
 
-BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing:: @ 82507D2
+BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
+BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints::
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
 	call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag
@@ -80,7 +80,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: @ 82507DA
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
+BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge::
 	frontier_checkairshow
 	special LoadPlayerParty
 	pyramid_clearhelditems
@@ -102,17 +102,17 @@ BattleFrontier_BattlePyramidLobby_EventScript_LostChallenge:: @ 8250852
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge:: @ 82508AC
+BattleFrontier_BattlePyramidLobby_EventScript_ResumeChallenge::
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_Attendant:: @ 82508B1
+BattleFrontier_BattlePyramidLobby_EventScript_Attendant::
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, FRONTIER_FACILITY_PYRAMID
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	special SavePlayerParty
 	msgbox BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
+BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge::
 	message BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge
 	waitmessage
 	multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
@@ -122,7 +122,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge:: @ 82508C8
 	case 2, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
+BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge::
 	message BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode
 	waitmessage
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
@@ -148,7 +148,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge:: @ 8250904
 	case YES, BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5
+BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge::
 	setvar VAR_TEMP_0, 0
 	frontier_set FRONTIER_DATA_SELECTED_MON_ORDER
 	pyramid_init
@@ -164,7 +164,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge:: @ 82509A5
 	setvar VAR_TEMP_0, 255
 	compare VAR_RESULT, 0
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed
-BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21
+BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge::
 	special SavePlayerParty
 	frontier_setpartyorder FRONTIER_PARTY_SIZE
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid, MSGBOX_DEFAULT
@@ -178,36 +178,36 @@ BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: @ 8250A21
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge:: @ 8250A68
+BattleFrontier_BattlePyramidLobby_EventScript_ExplainChallenge::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_AskTakeChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons:: @ 8250A75
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons::
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50
 	case FRONTIER_LVL_OPEN, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50:: @ 8250A90
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen:: @ 8250A9D
+BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed:: @ 8250AAA
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
 	goto BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
 
-BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge:: @ 8250AC1
+BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge::
 	special LoadPlayerParty
-BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge:: @ 8250AC4
+BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge:: @ 8250ACC
+BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge::
 	release
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
+BattleFrontier_BattlePyramidLobby_EventScript_HintGiver::
 	lockall
 	applymovement LOCALID_HINT_GIVER, Common_Movement_FacePlayer
 	waitmovement 0
@@ -217,7 +217,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_HintGiver:: @ 8250ACE
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHint::
 	multichoice 17, 6, MULTI_LEVEL_MODE, FALSE
 	switch VAR_RESULT
 	case FRONTIER_LVL_50, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50
@@ -227,10 +227,10 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHint:: @ 8250AF0
 	return
 
 @ Shouldnt occur
-BattleFrontier_BattlePyramidLobby_EventScript_NoHint:: @ 8250B27
+BattleFrontier_BattlePyramidLobby_EventScript_NoHint::
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
 	compare VAR_RESULT, FALSE
@@ -239,12 +239,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: @ 8250B28
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak:: @ 8250B53
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak::
 	pyramid_get PYRAMID_DATA_WIN_STREAK_50
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
 	pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
 	compare VAR_RESULT, FALSE
@@ -253,12 +253,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: @ 8250B66
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak:: @ 8250B91
+BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak::
 	pyramid_get PYRAMID_DATA_WIN_STREAK_OPEN
 	goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4
+BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment::
 	copyvar VAR_0x8004, VAR_RESULT
 	special GetBattlePyramidHint
 	switch VAR_RESULT
@@ -284,87 +284,87 @@ BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment:: @ 8250BA4
 	case 19, BattleFrontier_BattlePyramidLobby_EventScript_HintNormal
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis:: @ 8250C8E
+BattleFrontier_BattlePyramidLobby_EventScript_HintParalysis::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintParalysis, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPoison:: @ 8250C97
+BattleFrontier_BattlePyramidLobby_EventScript_HintPoison::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPoison, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintBurn:: @ 8250CA0
+BattleFrontier_BattlePyramidLobby_EventScript_HintBurn::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBurn, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste:: @ 8250CA9
+BattleFrontier_BattlePyramidLobby_EventScript_HintPPWaste::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPPWaste, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate:: @ 8250CB2
+BattleFrontier_BattlePyramidLobby_EventScript_HintLevitate::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintLevitate, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility:: @ 8250CBB
+BattleFrontier_BattlePyramidLobby_EventScript_HintTrapAbility::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintIce:: @ 8250CC4
+BattleFrontier_BattlePyramidLobby_EventScript_HintIce::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintIce, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion:: @ 8250CCD
+BattleFrontier_BattlePyramidLobby_EventScript_HintExplosion::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintExplosion, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic:: @ 8250CD6
+BattleFrontier_BattlePyramidLobby_EventScript_HintPsychic::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintPsychic, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintRock:: @ 8250CDF
+BattleFrontier_BattlePyramidLobby_EventScript_HintRock::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintRock, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintFighting:: @ 8250CE8
+BattleFrontier_BattlePyramidLobby_EventScript_HintFighting::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFighting, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintWeather:: @ 8250CF1
+BattleFrontier_BattlePyramidLobby_EventScript_HintWeather::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWeather, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintBug:: @ 8250CFA
+BattleFrontier_BattlePyramidLobby_EventScript_HintBug::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintBug, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintDark:: @ 8250D03
+BattleFrontier_BattlePyramidLobby_EventScript_HintDark::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintDark, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintWater:: @ 8250D0C
+BattleFrontier_BattlePyramidLobby_EventScript_HintWater::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintWater, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintGhost:: @ 8250D15
+BattleFrontier_BattlePyramidLobby_EventScript_HintGhost::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintGhost, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintSteel:: @ 8250D1E
+BattleFrontier_BattlePyramidLobby_EventScript_HintSteel::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintSteel, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon:: @ 8250D27
+BattleFrontier_BattlePyramidLobby_EventScript_HintFlyingDragon::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve:: @ 8250D30
+BattleFrontier_BattlePyramidLobby_EventScript_HintStoneEvolve::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_HintNormal:: @ 8250D39
+BattleFrontier_BattlePyramidLobby_EventScript_HintNormal::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HintNormal, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
+BattleFrontier_BattlePyramidLobby_EventScript_ShowResults::
 	lockall
 	frontier_results FRONTIER_FACILITY_PYRAMID
 	waitbuttonpress
@@ -372,7 +372,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ShowResults:: @ 8250D42
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D56
+BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel
 	waitmovement 0
@@ -383,9 +383,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag:: @ 8250D
 	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag
 
-BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag:: @ 8250D94
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag, MSGBOX_DEFAULT
-BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
+BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag::
 	message BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag
 	waitmessage
 	playse SE_EXP_MAX
@@ -398,7 +398,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag:: @ 8250D9C
 	waitmovement 0
 	return
 
-BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4
+BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel:
 	walk_up
 	walk_up
 	walk_up
@@ -409,7 +409,7 @@ BattleFrontier_BattlePyramidLobby_Movement_AttendantWalkToPanel: @ 8250DC4
 	face_down
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD
+BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel:
 	walk_up
 	walk_up
 	walk_up
@@ -419,17 +419,17 @@ BattleFrontier_BattlePyramidLobby_Movement_PlayerWalkToPanel: @ 8250DCD
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside: @ 8250DD5
+BattleFrontier_BattlePyramidLobby_Movement_AttendantMoveAside:
 	walk_right
 	face_left
 	step_end
 
-BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel: @ 8250DD8
+BattleFrontier_BattlePyramidLobby_Movement_PlayerStepOnPanel:
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 8250DDB
+BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT
 	setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
 	special TryStoreHeldItemsInPyramidBag
@@ -440,12 +440,12 @@ BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag:: @ 825
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag:: @ 8250E00
+BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag, MSGBOX_DEFAULT
 	return
 
 @ When exiting Battle Pyramid with a full pyramid bag and held items the player must select to keep/toss party held items and make room for any kept items by tossing from the pyramid bag
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep::
 	multichoice 17, 6, MULTI_FRONTIER_ITEM_CHOOSE, FALSE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag
@@ -454,7 +454,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep:: @ 8250E09
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag::
 	special ChooseItemsToTossFromPyramidBag
 	waitstate
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
@@ -462,7 +462,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromBag:: @ 8250E40
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50
+BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty::
 	special BattlePyramidChooseMonHeldItems
 	waitstate
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
@@ -470,34 +470,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty:: @ 8250E50
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems:: @ 8250E60
+BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems::
 	special DoBattlePyramidMonsHaveHeldItem
 	compare VAR_RESULT, TRUE
 	goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems
 	return
 
-BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems:: @ 8250E6F
+BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem, MSGBOX_DEFAULT
 	message BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep
 	waitmessage
 	goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_Woman:: @ 8250E83
+BattleFrontier_BattlePyramidLobby_EventScript_Woman::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_FatMan:: @ 8250E8C
+BattleFrontier_BattlePyramidLobby_EventScript_FatMan::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems, MSGBOX_NPC
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard:: @ 8250E95
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBoard::
 	lockall
 	msgbox BattleFrontier_BattlePyramidLobby_Text_RulesAreListed, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
+BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard::
 	message BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading
 	waitmessage
 	multichoice 15, 2, MULTI_BATTLE_PYRAMID_RULES, FALSE
@@ -510,45 +510,45 @@ BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard:: @ 8250EA4
 	case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_ExitRules
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon:: @ 8250EF7
+BattleFrontier_BattlePyramidLobby_EventScript_RulesPokemon::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers:: @ 8250F05
+BattleFrontier_BattlePyramidLobby_EventScript_RulesTrainers::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze:: @ 8250F13
+BattleFrontier_BattlePyramidLobby_EventScript_RulesMaze::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_RulesBag:: @ 8250F21
+BattleFrontier_BattlePyramidLobby_EventScript_RulesBag::
 	msgbox BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidLobby_EventScript_ReadRulesBoard
 	end
 
-BattleFrontier_BattlePyramidLobby_EventScript_ExitRules:: @ 8250F2F
+BattleFrontier_BattlePyramidLobby_EventScript_ExitRules::
 	releaseall
 	end
 
-BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid: @ 8250F31
+BattleFrontier_BattlePyramidLobby_Text_WelcomeToBattlePyramid:
 	.string "Where the courage of TRAINERS\n"
 	.string "is put to the test!\p"
 	.string "Welcome to the BATTLE PYRAMID!\p"
 	.string "I am your guide to\n"
 	.string "the Battle Quest.$"
 
-BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge: @ 8250FA7
+BattleFrontier_BattlePyramidLobby_Text_EmbarkOnChallenge:
 	.string "Have you the courage to embark on\n"
 	.string "the Battle Quest challenge?$"
 
-BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge: @ 8250FE5
+BattleFrontier_BattlePyramidLobby_Text_AwaitFutureChallenge:
 	.string "We await your challenge in the future!$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C
+BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid:
 	.string "The Battle Quest is a battling\n"
 	.string "event in which you must explore\l"
 	.string "the PYRAMID and try to reach the top.\p"
@@ -567,16 +567,16 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainBattlePyramid: @ 825100C
 	.string "If you don't save before interrupting,\n"
 	.string "you will be disqualified.$"
 
-BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode: @ 8251248
+BattleFrontier_BattlePyramidLobby_Text_WhichLevelMode:
 	.string "The PYRAMID offers two courses,\n"
 	.string "Level 50 and Open Level.\l"
 	.string "Which will you enter?$"
 
-BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons: @ 8251297
+BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons:
 	.string "Very good. Now, please select the three\n"
 	.string "POKéMON you wish to accompany you.$"
 
-BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen:
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -586,7 +586,7 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen: @ 82512E2
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50:
 	.string "A slight problem, adventurer!\p"
 	.string "You seem to not have the three\n"
 	.string "POKéMON qualified for the challenge.\p"
@@ -598,38 +598,38 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50: @ 82513C1
 	.string "When you are ready, please have\n"
 	.string "a word with me.$"
 
-BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge: @ 82514E6
+BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge:
 	.string "Before you enter the BATTLE PYRAMID,\n"
 	.string "the game must be saved. Is that okay?$"
 
-BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid: @ 8251531
+BattleFrontier_BattlePyramidLobby_Text_ShowYouIntoPyramid:
 	.string "Very good. I will now show you into\n"
 	.string "the BATTLE PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping: @ 8251569
+BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping:
 	.string "We will hold your BAG for safekeeping,\n"
 	.string "{PLAYER}, while you are exploring.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag: @ 82515AD
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag:
 	.string "In exchange, please take this BATTLE\n"
 	.string "BAG, the one you used previously.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag: @ 82515F4
+BattleFrontier_BattlePyramidLobby_Text_PleaseTakeThisBattleBag:
 	.string "In exchange, please take this\n"
 	.string "BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag: @ 825161E
+BattleFrontier_BattlePyramidLobby_Text_ExchangedBagForBattleBag:
 	.string "{PLAYER} exchanged the BAG for\n"
 	.string "the BATTLE BAG.$"
 
-BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel: @ 8251647
+BattleFrontier_BattlePyramidLobby_Text_StepOnFloorPanel:
 	.string "When you step on this floor panel,\n"
 	.string "you will be transported to a higher\l"
 	.string "floor in the PYRAMID.\p"
 	.string "I hope for your sake that your\n"
 	.string "quest goes safely!$"
 
-BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6
+BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag:
 	.string "A major problem, explorer!\p"
 	.string "You did not save before ending\n"
 	.string "your challenge the last time.\p"
@@ -639,112 +639,112 @@ BattleFrontier_BattlePyramidLobby_Text_DidntSaveBeforeQuittingTakeBag: @ 82516D6
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid: @ 82517B5
+BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid:
 	.string "Excellent to see you back!\p"
 	.string "You've conquered the PYRAMID!\n"
 	.string "How splendid!$"
 
-BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake: @ 82517FC
+BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake:
 	.string "Ah, a slight problem.\p"
 	.string "At least one POKéMON is holding\n"
 	.string "an item.\p"
 	.string "I'm sorry to say, items obtained in\n"
 	.string "the PYRAMID cannot be taken away.$"
 
-BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag: @ 8251881
+BattleFrontier_BattlePyramidLobby_Text_HeldItemsMovedToBag:
 	.string "All items held by your POKéMON will be\n"
 	.string "moved to your BATTLE BAG, {PLAYER}.$"
 
-BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep: @ 82518C6
+BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep:
 	.string "The BATTLE BAG cannot hold all your\n"
 	.string "items, I'm sorry to say.\p"
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem: @ 825194F
+BattleFrontier_BattlePyramidLobby_Text_LeastOneMonHoldingItem:
 	.string "At least one POKéMON is still\n"
 	.string "holding an item.$"
 
-BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep: @ 825197E
+BattleFrontier_BattlePyramidLobby_Text_PickItemsToKeep:
 	.string "Please pick the items you'll keep in the\n"
 	.string "BATTLE BAG, and with your POKéMON.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld: @ 82519CA
+BattleFrontier_BattlePyramidLobby_Text_ReturnedEverythingMonsHeld:
 	.string "{PLAYER} returned everything that\n"
 	.string "the POKéMON held.$"
 
-BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept: @ 82519F8
+BattleFrontier_BattlePyramidLobby_Text_UsedBattleBagWillBeKept:
 	.string "The BATTLE BAG you used will be kept\n"
 	.string "in readiness for your next challenge.\p"
 	.string "{PLAYER} turned the BATTLE BAG over\n"
 	.string "for the BAG's return.$"
 
-BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait: @ 8251A77
+BattleFrontier_BattlePyramidLobby_Text_RecordResultsWait:
 	.string "I must record your results.\n"
 	.string "Please wait.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis: @ 8251AA0
+BattleFrontier_BattlePyramidLobby_Text_ForConqueringPyramidTakeThis:
 	.string "As a memento for conquering\n"
 	.string "the BATTLE PYRAMID, please take this.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem: @ 8251AE2
+BattleFrontier_BattlePyramidLobby_Text_ReceivedPrizeItem:
 	.string "{PLAYER} received the prize\n"
 	.string "{STR_VAR_1}.$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_BagIsFull: @ 8251AFC
+BattleFrontier_BattlePyramidLobby_Text_BagIsFull:
 	.string "…Ah…\n"
 	.string "Your BAG appears to be filled.\p"
 	.string "Please return after you've organized\n"
 	.string "your BAG's contents.$"
 
-BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag: @ 8251B5A
+BattleFrontier_BattlePyramidLobby_Text_DisappointingHereIsBag:
 	.string "How disappointing for you…\p"
 	.string "Here is the BAG we've been holding\n"
 	.string "for you.\p"
 	.string "{PLAYER} got the BAG back.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge: @ 8251BB6
+BattleFrontier_BattlePyramidLobby_Text_LookForwardToNextChallenge:
 	.string "We look forward to your\n"
 	.string "next challenge!$"
 
 @ Unused
-BattleFrontier_BattlePyramidLobby_Text_HereIsPrize: @ 8251BDE
+BattleFrontier_BattlePyramidLobby_Text_HereIsPrize:
 	.string "We have been looking forward to\n"
 	.string "your arrival!\p"
 	.string "Here is your prize for conquering\n"
 	.string "the PYRAMID.$"
 
-BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait: @ 8251C3B
+BattleFrontier_BattlePyramidLobby_Text_TellYouWhatMisfortunesAwait:
 	.string "Welcome…\p"
 	.string "I shall be pleased to tell you what\n"
 	.string "misfortunes await in the PYRAMID…$"
 
-BattleFrontier_BattlePyramidLobby_Text_Aah: @ 8251C8A
+BattleFrontier_BattlePyramidLobby_Text_Aah:
 	.string "… … … … … …\n"
 	.string "… … … … … …\p"
 	.string "… … … … … …\n"
 	.string "Aah!$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintParalysis: @ 8251CB3
+BattleFrontier_BattlePyramidLobby_Text_HintParalysis:
 	.string "I see a shower of sparks…\p"
 	.string "…And in it, I see your POKéMON\n"
 	.string "struggling with paralysis…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPoison: @ 8251D07
+BattleFrontier_BattlePyramidLobby_Text_HintPoison:
 	.string "I see poison…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from the effects of poison…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintBurn: @ 8251D54
+BattleFrontier_BattlePyramidLobby_Text_HintBurn:
 	.string "I see bright red flames…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from burns…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C
+BattleFrontier_BattlePyramidLobby_Text_HintPPWaste:
 	.string "I sense the tremendous pressure of\n"
 	.string "unrequited anger…\p"
 	.string "It is a curse…\p"
@@ -752,44 +752,44 @@ BattleFrontier_BattlePyramidLobby_Text_HintPPWaste: @ 8251D9C
 	.string "Power Points and having no recourse\l"
 	.string "but to use STRUGGLE…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintLevitate: @ 8251E3D
+BattleFrontier_BattlePyramidLobby_Text_HintLevitate:
 	.string "I see POKéMON loftily airborne…\p"
 	.string "…And, I see your POKéMON frustrated\n"
 	.string "by powerless GROUND-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility: @ 8251EA1
+BattleFrontier_BattlePyramidLobby_Text_HintTrapAbility:
 	.string "I sense terrific energy rising from\n"
 	.string "the ground below…\p"
 	.string "…And, I see your POKéMON unable to\n"
 	.string "escape the power's clutches…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintIce: @ 8251F17
+BattleFrontier_BattlePyramidLobby_Text_HintIce:
 	.string "I see ICE-type POKéMON…\p"
 	.string "…And, I see your POKéMON fighting\n"
 	.string "the freezing effects of ice…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintExplosion: @ 8251F6E
+BattleFrontier_BattlePyramidLobby_Text_HintExplosion:
 	.string "I see a flurry of moves that imperil\n"
 	.string "the user…\p"
 	.string "…And, I see your POKéMON falling\n"
 	.string "to them…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintPsychic: @ 8251FC7
+BattleFrontier_BattlePyramidLobby_Text_HintPsychic:
 	.string "I see PSYCHIC-type POKéMON…\p"
 	.string "…And, I see your POKéMON in torment\n"
 	.string "from PSYCHIC moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintRock: @ 825201B
+BattleFrontier_BattlePyramidLobby_Text_HintRock:
 	.string "I see ROCK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from ROCK moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintFighting: @ 8252068
+BattleFrontier_BattlePyramidLobby_Text_HintFighting:
 	.string "I see FIGHTING-type POKéMON…\p"
 	.string "…And, I see your POKéMON pummeled\n"
 	.string "by FIGHTING moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA
+BattleFrontier_BattlePyramidLobby_Text_HintWeather:
 	.string "RAIN DANCE… SUNNY DAY…\n"
 	.string "SANDSTORM… HAIL…\p"
 	.string "I see POKéMON that become stronger\n"
@@ -797,37 +797,37 @@ BattleFrontier_BattlePyramidLobby_Text_HintWeather: @ 82520BA
 	.string "…And, I see your POKéMON confounded\n"
 	.string "by different types of moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintBug: @ 8252158
+BattleFrontier_BattlePyramidLobby_Text_HintBug:
 	.string "I see BUG-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from different kinds of attacks…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintDark: @ 82521B4
+BattleFrontier_BattlePyramidLobby_Text_HintDark:
 	.string "I see DARK-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from DARK-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintWater: @ 8252206
+BattleFrontier_BattlePyramidLobby_Text_HintWater:
 	.string "I see WATER-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from WATER-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintGhost: @ 825225A
+BattleFrontier_BattlePyramidLobby_Text_HintGhost:
 	.string "I see GHOST-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from GHOST-type moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintSteel: @ 82522AE
+BattleFrontier_BattlePyramidLobby_Text_HintSteel:
 	.string "I see STEEL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon: @ 825230B
+BattleFrontier_BattlePyramidLobby_Text_HintFlyingDragon:
 	.string "I see flying POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364
+BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve:
 	.string "I see those that have evolved from\n"
 	.string "the power of stones…\p"
 	.string "I also sense fire, water,\n"
@@ -835,18 +835,18 @@ BattleFrontier_BattlePyramidLobby_Text_HintStoneEvolve: @ 8252364
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from those three powers…$"
 
-BattleFrontier_BattlePyramidLobby_Text_HintNormal: @ 8252403
+BattleFrontier_BattlePyramidLobby_Text_HintNormal:
 	.string "I see NORMAL-type POKéMON…\p"
 	.string "…And, I see your POKéMON suffering\n"
 	.string "from enormously powerful moves…$"
 
-BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot: @ 8252461
+BattleFrontier_BattlePyramidLobby_Text_BelieveMyFortunesOrNot:
 	.string "Whether you believe my fortunes\n"
 	.string "or not, the choice is yours…\p"
 	.string "The future can be changed anytime…\n"
 	.string "I wish you safe passage…$"
 
-BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA
+BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning:
 	.string "Did you know?\p"
 	.string "If you run fast, TRAINERS may notice\n"
 	.string "and come after you for a battle.\p"
@@ -854,37 +854,37 @@ BattleFrontier_BattlePyramidLobby_Text_TrainersNoticeRunning: @ 82524DA
 	.string "don't catch their eyes, but sneak\l"
 	.string "cautiously and quietly past them.$"
 
-BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems: @ 8252595
+BattleFrontier_BattlePyramidLobby_Text_LostLotOfItems:
 	.string "Awaaaaaaarrrrgh!\p"
 	.string "I had a whole lot of items, but I lost\n"
 	.string "them all when I lost!\p"
 	.string "Awaaaaaaarrrrgh!$"
 
-BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing: @ 82525F4
+BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing:
 	.string "Welcome back!\n"
 	.string "You've done the unthinkable!\p"
 	.string "You've defeated the PYRAMID KING\n"
 	.string "and conquered the BATTLE PYRAMID!$"
 
-BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints: @ 8252662
+BattleFrontier_BattlePyramidLobby_Text_GiveYouTheseBattlePoints:
 	.string "Young explorer!\n"
 	.string "In commendation of your courage,\l"
 	.string "we give you these Battle Point(s)!$"
 
-BattleFrontier_BattlePyramidLobby_Text_RulesAreListed: @ 82526B6
+BattleFrontier_BattlePyramidLobby_Text_RulesAreListed:
 	.string "The Battle Quest rules are listed.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading: @ 82526D9
+BattleFrontier_BattlePyramidLobby_Text_ReadWhichHeading:
 	.string "Which heading do you want to read?$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules: @ 82526FC
+BattleFrontier_BattlePyramidLobby_Text_ExplainMonRules:
 	.string "When the PYRAMID is conquered,\n"
 	.string "the wild POKéMON that appear in it\l"
 	.string "are replaced by different kinds.\p"
 	.string "Explore, observe, and learn what kinds\n"
 	.string "of wild POKéMON you may encounter.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9
+BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules:
 	.string "TRAINERS are lying in wait for you\n"
 	.string "inside the PYRAMID.\p"
 	.string "On each floor, there are up to\n"
@@ -892,7 +892,7 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainTrainerRules: @ 82527A9
 	.string "When you defeat a TRAINER, you will\n"
 	.string "get a helpful hint for your adventure.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A
+BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules:
 	.string "The mazes in the PYRAMID rearrange\n"
 	.string "themselves every time you enter it.\p"
 	.string "The mazes are poorly lit.\n"
@@ -900,7 +900,7 @@ BattleFrontier_BattlePyramidLobby_Text_ExplainMazeRules: @ 825285A
 	.string "The light grows brighter whenever you\n"
 	.string "defeat a wild POKéMON or a TRAINER.$"
 
-BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules: @ 8252924
+BattleFrontier_BattlePyramidLobby_Text_ExplainBagRules:
 	.string "The BATTLE BAG serves as your BAG\n"
 	.string "while in the PYRAMID.\p"
 	.string "There are two separate BATTLE BAGS--\n"

data/maps/BattleFrontier_BattlePyramidTop/scripts.inc

@@ -1,37 +1,37 @@
 .set LOCALID_ATTENDANT, 1
 .set LOCALID_BRANDON, 2
 
-BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
+BattleFrontier_BattlePyramidTop_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_BattlePyramidTop_OnResume
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattlePyramidTop_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattlePyramidTop_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattlePyramidTop_OnWarp
 	.byte 0
 
-BattleFrontier_BattlePyramidTop_OnTransition: @ 82550B6
+BattleFrontier_BattlePyramidTop_OnTransition:
 	pyramid_updatelight 200, PYRAMID_LIGHT_SET_RADIUS
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_OnWarp: @ 82550CE
+BattleFrontier_BattlePyramidTop_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: @ 82550D8
+BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	compare VAR_TEMP_C, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
 	setobjectxyperm LOCALID_BRANDON, 0, 0
-BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: @ 82550F3
+BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects::
 	end
 
-BattleFrontier_BattlePyramidTop_OnResume: @ 82550F4
+BattleFrontier_BattlePyramidTop_OnResume:
 	frontier_getbrainstatus
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus
 	call BattleFrontier_EventScript_SetBrainObjectGfx
-BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
+BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus::
 	copyvar VAR_TEMP_C, VAR_RESULT
 	frontier_getstatus
 	switch VAR_TEMP_0
@@ -47,22 +47,22 @@ BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: @ 825510C
 	goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattlePyramidTop_OnFrame: @ 825516E
+BattleFrontier_BattlePyramidTop_OnFrame:
 	map_script_2 VAR_TEMP_E, 0, BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic
 	map_script_2 VAR_TEMP_F, 1, BattleFrontier_BattlePyramidTop_EventScript_ShowMapName
 	.2byte 0
 
-BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic:: @ 8255180
+BattleFrontier_BattlePyramidTop_EventScript_PlayPyramidMusic::
-	playbgm MUS_B_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, FALSE
 	setvar VAR_TEMP_E, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_ShowMapName:: @ 825518A
+BattleFrontier_BattlePyramidTop_EventScript_ShowMapName::
 	special ShowMapNamePopup
 	setvar VAR_TEMP_F, 0
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
+BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge::
 	pyramid_save CHALLENGE_STATUS_SAVING
 	special SavePlayerParty
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
@@ -71,7 +71,7 @@ BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge:: @ 8255193
 	setvar VAR_TEMP_F, 1
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
+BattleFrontier_BattlePyramidTop_EventScript_Attendant::
 	lock
 	faceplayer
 	compare VAR_TEMP_D, 0
@@ -91,25 +91,25 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant:: @ 82551D0
 	playfanfare MUS_OBTAIN_B_POINTS
 	waitfanfare
 	closemessage
-BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: @ 825521A
+BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
 	waitstate
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady:: @ 8255236
+BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady::
 	msgbox BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady, MSGBOX_DEFAULT
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside:: @ 8255240
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside::
 	msgbox BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere, MSGBOX_DEFAULT
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
 	setvar VAR_TEMP_D, 1
 	closemessage
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon::
 	lockall
 	switch VAR_TEMP_C
 	case FRONTIER_BRAIN_GOLD, BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold
@@ -130,18 +130,18 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon:: @ 8255256
 	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech:: @ 82552D0
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech::
 	applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver:: @ 82552DA
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver::
 	msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
-	playbgm MUS_B_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, FALSE
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver::
 	frontier_getsymbols
 	compare VAR_RESULT, 0
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: @ 82552FB
 	msgbox BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
+BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
@@ -170,18 +170,18 @@ BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: @ 8255335
 	goto BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold
 	end
 
-BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech:: @ 8255388
+BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech::
 	applymovement LOCALID_BRANDON, BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer
 	waitmovement 0
-BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold:: @ 8255392
+BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold::
 	msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
 	call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
-	playbgm MUS_B_PYRAMID_TOP, 0
+	playbgm MUS_B_PYRAMID_TOP, FALSE
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
 	goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
+BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold::
 	frontier_getsymbols
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
@@ -194,7 +194,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: @ 82553B3
 	msgbox BattleFrontier_BattlePyramidTop_Text_FarewellForNow, MSGBOX_DEFAULT
 	goto BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
+BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle::
 	closemessage
 	setvar VAR_0x8004, SPECIAL_BATTLE_PYRAMID
 	setvar VAR_0x8005, 0
@@ -202,17 +202,17 @@ BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle:: @ 82553ED
 	waitstate
 	return
 
-BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: @ 82553FD
+BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside:
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: @ 8255400
+BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath:
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
+BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop:
 	walk_up
 	walk_up
 	walk_up
@@ -221,17 +221,17 @@ BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: @ 8255403
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: @ 825540A
+BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer:
 	walk_fast_down
 	step_end
 
-BattleFrontier_BattlePyramidTop_Movement_CameraPanUp: @ 825540C
+BattleFrontier_BattlePyramidTop_Movement_CameraPanUp:
 	walk_slow_up
 	walk_slow_up
 	delay_16
 	step_end
 
-BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
+BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo:
 	.string "It is a delight to see you here!\n"
 	.string "You have reached the summit of\l"
 	.string "the BATTLE PYRAMID!\p"
@@ -242,11 +242,11 @@ BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo: @ 8255410
 	.string "Now, please!\n"
 	.string "Up you go!$"
 
-BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid: @ 82554E8
+BattleFrontier_BattlePyramidTop_Text_PlayerConqueredPyramid:
 	.string "The PYRAMID's new conqueror!\n"
 	.string "Let the name {PLAYER} be known!$"
 
-BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F
+BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere:
 	.string "It is a delight to see you here!\p"
 	.string "Unfortunately, you were second by\n"
 	.string "a mere fraction of time!\p"
@@ -259,7 +259,7 @@ BattleFrontier_BattlePyramidTop_Text_ChiefBeatYouHere: @ 825551F
 	.string "Now, please! When you are ready,\n"
 	.string "take one more step of courage!$"
 
-BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
+BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure:
 	.string "Young adventurer…\p"
 	.string "Wouldn't you agree that explorations\n"
 	.string "are the grandest of adventures?\p"
@@ -269,7 +269,7 @@ BattleFrontier_BattlePyramidTop_Text_ExplorationsAreGrandestAdventure: @ 8255669
 	.string "And, above all, only your own courage\n"
 	.string "to lead you through unknown worlds…$"
 
-BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E
+BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon:
 	.string "Aah, yes, indeed this life is grand!\n"
 	.string "Grand, it is! Eh?\p"
 	.string "I'm BRANDON!\p"
@@ -282,25 +282,25 @@ BattleFrontier_BattlePyramidTop_Text_ImPyramidKingBrandon: @ 825573E
 	.string "Hahahah!\n"
 	.string "This should be exciting!$"
 
-BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle: @ 8255846
+BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle:
 	.string "Now, then!\n"
 	.string "Bring your courage to our battle!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease: @ 8255873
+BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease:
 	.string "BRANDON: Hahahah! Grand it was!\n"
 	.string "Grand, yes, indeed!\p"
 	.string "Well done! You've earned recognition!\n"
 	.string "Your FRONTIER PASS, please!$"
 
-BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol: @ 82558E9
+BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol:
 	.string "The Brave Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting: @ 825591D
+BattleFrontier_BattlePyramidTop_Text_LookForwardToNextMeeting:
 	.string "Young explorer!\n"
 	.string "I look forward to our next meeting!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951
+BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned:
 	.string "BRANDON: …You've finally returned,\n"
 	.string "young explorer…\p"
 	.string "Your love of adventure seems to come\n"
@@ -314,16 +314,16 @@ BattleFrontier_BattlePyramidTop_Text_BrandonYouveReturned: @ 8255951
 	.string "Those days of death-defying,\n"
 	.string "life-affirming adventures are back…$"
 
-BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter: @ 8255A6D
+BattleFrontier_BattlePyramidTop_Text_MyCourageIsOffMeter:
 	.string "Now, then!\p"
 	.string "I sense my own courage is off\n"
 	.string "the meter!$"
 
-BattleFrontier_BattlePyramidTop_Text_EverythingYouHave: @ 8255AA1
+BattleFrontier_BattlePyramidTop_Text_EverythingYouHave:
 	.string "Everything you have!\n"
 	.string "I'm braced for it all!$"
 
-BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
+BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis:
 	.string "BRANDON: Hahahah!\n"
 	.string "Remarkable!\l"
 	.string "Yes, it's grand, indeed!\p"
@@ -331,17 +331,17 @@ BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis: @ 8255ACD
 	.string "You've bested me through and through!\n"
 	.string "Here! I want you to have this!$"
 
-BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine: @ 8255B59
+BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine:
 	.string "The Brave Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattlePyramidTop_Text_FarewellForNow: @ 8255B82
+BattleFrontier_BattlePyramidTop_Text_FarewellForNow:
 	.string "Ah, yes! It just goes to show that\n"
 	.string "I have much to learn still!\p"
 	.string "May our paths cross again!\n"
 	.string "Farewell for now, young explorer!$"
 
-BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady: @ 8255BFE
+BattleFrontier_BattlePyramidTop_Text_StepForwardWhenReady:
 	.string "Now, when you are ready, take courage\n"
 	.string "and step forward.$"
 

data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc

@@ -2,25 +2,25 @@
 .set LOCALID_ATTENDANT_1, 2
 .set LOCALID_ATTENDANT_2, 3
 
-BattleFrontier_BattleTowerBattleRoom_MapScripts:: @ 8241B40
+BattleFrontier_BattleTowerBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerBattleRoom_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerBattleRoom_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerBattleRoom_OnWarp: @ 8241B4B
+BattleFrontier_BattleTowerBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects:: @ 8241B55
+BattleFrontier_BattleTowerBattleRoom_EventScript_SetUpObjects::
 	setvar VAR_TEMP_1, 1
 	applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible
 	end
 
-BattleFrontier_BattleTowerBattleRoom_OnFrame: @ 8241B62
+BattleFrontier_BattleTowerBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
+BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
 	waitmovement 0
@@ -35,7 +35,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom:: @ 8241B6C
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT
 	applymovement LOCALID_OPPONENT, BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter
@@ -46,14 +46,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter:: @ 8241BC3
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	switch VAR_RESULT
 	case B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent
-BattleFrontier_BattleTower_EventScript_WarpToLobbyLost:: @ 8241C03
+BattleFrontier_BattleTower_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	tower_setbattlewon
 	switch VAR_RESULT
@@ -72,7 +72,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent:: @ 8241C2F
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent::
 	frontier_getbrainstatus
 	copyvar VAR_TEMP_F, VAR_RESULT
 	compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY
@@ -90,7 +90,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: @ 8241C8F
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @ 8241D0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
@@ -98,7 +98,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord:: @
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -107,18 +107,18 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRecordBattle:: @ 8241D40
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle:: @ 8241D72
+BattleFrontier_BattleTowerBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge:: @ 8241D7C
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 	case YES, BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -127,7 +127,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge:: @ 8241DAA
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
 	waitmovement 0
@@ -135,14 +135,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge:: @ 8241DDC
 	waitmovement 0
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon:: @ 8241DF6
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
+BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	tower_save CHALLENGE_STATUS_PAUSED
@@ -152,7 +152,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_PauseChallenge:: @ 8241E22
 	frontier_reset
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent::
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
 	case 1, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent
@@ -162,41 +162,41 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent:: @ 8241E44
 	case 5, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent
 	case 6, BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent:: @ 8241E90
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor2ndOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent:: @ 8241E97
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor3rdOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent:: @ 8241E9E
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor4thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent:: @ 8241EA5
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor5thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent:: @ 8241EAC
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor6thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent:: @ 8241EB3
+BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyFor7thOpponent::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent
 	waitmessage
 	return
 
-BattleFrontier_EventScript_IncrementWinStreak:: @ 8241EBA
+BattleFrontier_EventScript_IncrementWinStreak::
 	frontier_incrementstreak
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC3
+BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter::
 	applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter
 	waitmovement 0
 	applymovement LOCALID_ATTENDANT_2, Common_Movement_WalkInPlaceLeft
@@ -213,12 +213,12 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter:: @ 8241EC
 	waitmovement 0
 	return
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: @ 8241F0A
+BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext::
 	compare VAR_TEMP_2, 1
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden::
 	message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden
 	waitmessage
 	call BattleFrontier_EventScript_GetCantRecordBattle
@@ -232,7 +232,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: @ 8241F22
 	case 3, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8241F79
+BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
@@ -240,7 +240,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord:: @ 8
 	case 2, BattleFrontier_BattleTowerBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel::
 	call BattleFrontier_EventScript_SetBrainObjectGfx
 	closemessage
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle
@@ -259,14 +259,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel:: @ 8241FAF
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: @ 8242029
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 8242046
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 0
@@ -280,20 +280,20 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: @ 824204
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: @ 8242085
+BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro::
 	frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
 	compare VAR_RESULT, FALSE
 	goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT
 	frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
-BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: @ 82420B2
+BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	compare VAR_RESULT, B_OUTCOME_WON
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
+BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	frontier_getsymbols
 	compare VAR_RESULT, 2
@@ -307,7 +307,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: @ 82420CF
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
+BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle::
 	closemessage
 	setvar VAR_TEMP_2, 0
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, FALSE
@@ -322,31 +322,31 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle:: @ 824210E
 	frontier_restorehelditems
 	special HealPlayerParty
 	frontier_resetsketch
-BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle:: @ 824215A
+BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle::
 	tower_setinterviewdata
 	frontier_get FRONTIER_DATA_BATTLE_OUTCOME
 	return
 
-BattleFrontier_EventScript_SetBrainObjectGfx:: @ 8242170
+BattleFrontier_EventScript_SetBrainObjectGfx::
 	frontier_setbrainobj
 	return
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter: @ 8242179
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	walk_up
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant: @ 824217E
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant:
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle: @ 8242180
+BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceBattle:
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -354,21 +354,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_OpponentEnter: @ 8242182
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit: @ 8242188
+BattleFrontier_BattleTowerBattleRoom_Movement_OpponentExit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer: @ 824218D
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer:
 	walk_right
 	walk_right
 	walk_right
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos:
 	walk_down
 	walk_left
 	walk_left
@@ -376,11 +376,11 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AttendantReturnToPos: @ 8242192
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible: @ 8242198
+BattleFrontier_BattleTowerBattleRoom_Movement_SetInvisible:
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter:
 	set_visible
 	delay_16
 	walk_up
@@ -389,21 +389,21 @@ BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantEnter: @ 824219A
 	delay_8
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit: @ 82421A1
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantExit:
 	walk_right
 	walk_right
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay: @ 82421A6
+BattleFrontier_BattleTowerBattleRoom_Movement_SecondAttendantDelay:
 	delay_16
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82421AB
+BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant:
 	face_right
 	delay_16
 	delay_16
@@ -412,7 +412,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AttendantFaceSecondAttendant: @ 82
 	walk_in_place_right
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
+BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down
@@ -420,7 +420,7 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter: @ 82421B2
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby::
 	copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
 	compare VAR_RESULT, FRONTIER_MODE_DOUBLES
 	goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles
@@ -432,95 +432,95 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: @ 82421B8
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: @ 82421E8
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
+BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis::
 	tower_closelink
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
 
-BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge:: @ 824220E
+BattleFrontier_BattleTowerBattleRoom_EventScript_RetireChallenge::
 	setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
 	goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth: @ 8242217
+BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth:
 	.string "We will restore your POKéMON to\n"
 	.string "full health.$"
 
 @ Unused
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent: @ 8242244
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForOpponent:
 	.string "You will be facing opponent no. {STR_VAR_1}.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent: @ 8242277
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor2ndOpponent:
 	.string "You will be facing opponent no. 2.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent: @ 82422A9
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor3rdOpponent:
 	.string "You will be facing opponent no. 3.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent: @ 82422DB
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor4thOpponent:
 	.string "You will be facing opponent no. 4.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent: @ 824230D
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor5thOpponent:
 	.string "You will be facing opponent no. 5.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent: @ 824233F
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor6thOpponent:
 	.string "You will be facing opponent no. 6.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent: @ 8242371
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyFor7thOpponent:
 	.string "You will be facing opponent no. 7.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle: @ 82423A3
+BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle:
 	.string "Record your battle on your\n"
 	.string "FRONTIER PASS?$"
 
-BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass: @ 82423CD
+BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass:
 	.string "{PLAYER}'s battle was recorded\n"
 	.string "on the FRONTIER PASS.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame: @ 82423FC
+BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame:
 	.string "Would you like to save and\n"
 	.string "quit the game?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait: @ 8242426
+BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait:
 	.string "Saving your battle data.\n"
 	.string "Please wait.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge: @ 824244C
+BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge:
 	.string "Would you like to cancel your BATTLE\n"
 	.string "ROOM challenge?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved:: @ 8242481
+BattleFrontier_BattleTowerBattleRoom_Text_RecordCouldntBeSaved::
 	.string "There was an error of some sort.\n"
 	.string "Your record could not be saved.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay: @ 82424C2
+BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay:
 	.string "Excuse me, but…\p"
 	.string "Our leader, the SALON MAIDEN, is on\n"
 	.string "her way here in hopes of battling you.\p"
 	.string "She should be arriving very shortly.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden: @ 8242542
+BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden:
 	.string "You will be facing the SALON MAIDEN.\n"
 	.string "Are you prepared?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
+BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel:
 	.string "Greetings…\n"
 	.string "My name is ANABEL.\p"
 	.string "I am the SALON MAIDEN, and I am in\n"
@@ -532,20 +532,20 @@ BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel: @ 8242579
 	.string "The reason I've come to see you…\n"
 	.string "Well, there is but one reason…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent: @ 824268C
+BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent:
 	.string "Let me see your talent in\n"
 	.string "its entirety…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized: @ 82426B4
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized:
 	.string "ANABEL: Fufufu, nicely done…\p"
 	.string "Your FRONTIER PASS, please…\n"
 	.string "Your talent shall be recognized.$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol: @ 824270E
+BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol:
 	.string "The Ability Symbol was embossed on\n"
 	.string "the FRONTIER PASS!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
+BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime:
 	.string "… … … … … …\p"
 	.string "You have confidence in your POKéMON\n"
 	.string "battling talent, don't you?\p"
@@ -554,7 +554,7 @@ BattleFrontier_BattleTowerBattleRoom_Text_UntilNextTime: @ 8242744
 	.string "I will be waiting for you.\n"
 	.string "Until the next time we meet…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack:
 	.string "ANABEL: You really did come back to\n"
 	.string "see me…\p"
 	.string "… … … … … …\p"
@@ -564,18 +564,18 @@ BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack: @ 82427F9
 	.string "Too long since I've been able to battle\n"
 	.string "without thinking about anything…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe: @ 82428E0
+BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe:
 	.string "Let's begin, shall we?$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease: @ 82428F7
+BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease:
 	.string "ANABEL: Fufu, congratulations…\n"
 	.string "Your FRONTIER PASS, please…$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine: @ 8242932
+BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine:
 	.string "The Ability Symbol took on\n"
 	.string "a golden shine!$"
 
-BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain: @ 824295D
+BattleFrontier_BattleTowerBattleRoom_Text_WishICouldBattleYouAgain:
 	.string "That was fun…\p"
 	.string "I have never had a POKéMON battle\n"
 	.string "so enjoyable before…\p"

data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc

@@ -1,27 +1,27 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleTowerCorridor_MapScripts:: @ 8241AAA
+BattleFrontier_BattleTowerCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_LOAD, BattleFrontier_BattleTowerCorridor_OnLoad
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerCorridor_OnFrame
 	.byte 0
 
-BattleFrontier_BattleTowerCorridor_OnLoad: @ 8241AB5
+BattleFrontier_BattleTowerCorridor_OnLoad:
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
 	setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: @ 8241AD3
+BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor::
 	setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0
 	setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
 	end
 
-BattleFrontier_BattleTowerCorridor_OnFrame: @ 8241AE6
+BattleFrontier_BattleTowerCorridor_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
+BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor::
 	setvar VAR_TEMP_0, 1
 	compare VAR_0x8006, 1
 	goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
@@ -30,25 +30,25 @@ BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: @ 8241AF0
 	waitmovement 0
 	goto BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom
 
-BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor:: @ 8241B16
+BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor::
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor
 	waitmovement 0
 
-BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: @ 8241B27
+BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom::
 	setvar VAR_TEMP_0, 0
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
 	waitstate
 	end
 
-BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor: @ 8241B36
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToFarDoor:
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor: @ 8241B37
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToFarDoor:
 	walk_right
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor: @ 8241B39
+BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor:
 	walk_right
-BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor: @ 8241B3A
+BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor:
 	walk_right
 	walk_right
 	walk_right

data/maps/BattleFrontier_BattleTowerElevator/scripts.inc

@@ -1,15 +1,15 @@
 .set LOCALID_ATTENDANT, 1
 
-BattleFrontier_BattleTowerElevator_MapScripts:: @ 82419DB
+BattleFrontier_BattleTowerElevator_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerElevator_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerElevator_OnWarp
 	.byte 0
 
-BattleFrontier_BattleTowerElevator_OnFrame: @ 82419E6
+BattleFrontier_BattleTowerElevator_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerElevator_EventScript_EnterElevator
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
+BattleFrontier_BattleTowerElevator_EventScript_EnterElevator::
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerElevator_Movement_AttendantEnter
 	applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerElevator_Movement_PlayerEnter
@@ -25,7 +25,7 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator:: @ 82419F0
 	call BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom
 	end
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -36,56 +36,56 @@ BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: @ 8241A28
 	call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: @ 8241A55
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: @ 8241A5F
+BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti::
 	goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: @ 8241A72
+BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: @ 8241A7C
+BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1
 	waitstate
 	return
 
-BattleFrontier_BattleTowerElevator_Movement_AttendantEnter: @ 8241A86
+BattleFrontier_BattleTowerElevator_Movement_AttendantEnter:
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_PlayerEnter: @ 8241A8A
+BattleFrontier_BattleTowerElevator_Movement_PlayerEnter:
 	walk_up
 	walk_up
 	face_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_AttendantExit: @ 8241A8E
+BattleFrontier_BattleTowerElevator_Movement_AttendantExit:
 	walk_down
 	walk_down
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerElevator_Movement_PlayerExit: @ 8241A92
+BattleFrontier_BattleTowerElevator_Movement_PlayerExit:
 	walk_right
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_BattleTowerElevator_OnWarp: @ 8241A96
+BattleFrontier_BattleTowerElevator_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth
 	.2byte 0
 
-BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth:: @ 8241AA0
+BattleFrontier_BattleTowerElevator_EventScript_TurnPlayerNorth::
 	setvar VAR_TEMP_1, 1
 	turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
 	end

data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc

@@ -5,7 +5,7 @@
 .set LOCALID_PLAYER, 5
 .set LOCALID_PARTNER, 6
 
-BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8248EE8
+BattleFrontier_BattleTowerMultiBattleRoom_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiBattleRoom_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiBattleRoom_OnFrame
@@ -15,14 +15,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8248EE8
 	@ The player is represented instead by LOCALID_PLAYER, which has the gfx id VAR_OBJ_GFX_ID_F
 	@ The multi partner is represented by LOCALID_PARTNER, which has the gfx id VAR_OBJ_GFX_ID_E
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnTransition: @ 8248EF8
+BattleFrontier_BattleTowerMultiBattleRoom_OnTransition:
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx::
 	tower_setpartnergfx
 	checkplayergender
 	compare VAR_RESULT, FEMALE
@@ -30,27 +30,27 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: @ 8248F0F
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale:: @ 8248F29
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx:: @ 8248F2F
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx::
 	special SetBattleTowerLinkPlayerGfx
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnWarp: @ 8248F33
+BattleFrontier_BattleTowerMultiBattleRoom_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj:: @ 8248F3D
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_HidePlayerObj::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_OnFrame: @ 8248F43
+BattleFrontier_BattleTowerMultiBattleRoom_OnFrame:
 	map_script_2 VAR_TEMP_0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom:: @ 8248F4D
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom::
 	setvar VAR_TEMP_0, 1
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom
 	applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom
@@ -67,7 +67,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom:: @ 8248F4D
 	frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: @ 8248FB4
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter::
 	tower_setopponent
 	addobject LOCALID_OPPONENT_1
 	addobject LOCALID_OPPONENT_2
@@ -89,7 +89,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter:: @ 8248FB4
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: @ 8249026
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink::
 	tower_getopponentintro 0
 	delay 15
 	applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft
@@ -103,18 +103,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink:: @ 8
 	messageautoscroll gStringVar4
 	waitmessage
 	delay 48
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle:: @ 8249069
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoTowerBattle::
 	call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
 	switch VAR_RESULT
 	case B_OUTCOME_WON, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost:: @ 824907E
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents:: @ 82490AA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents::
 	call BattleFrontier_EventScript_IncrementWinStreak
 	tower_setbattlewon
 	switch VAR_RESULT
@@ -135,11 +135,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents:: @ 8249
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink:: @ 8249118
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink::
 	messageautoscroll BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth
 	waitmessage
 	delay 48
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty::
 	special LoadPlayerParty
 	frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
@@ -147,7 +147,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: @ 8249121
 	playfanfare MUS_HEAL
 	waitfanfare
 	special HealPlayerParty
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8249143
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents::
 	frontier_get FRONTIER_DATA_BATTLE_NUM
 	call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
@@ -163,7 +163,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: @ 8
 	case 3, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord:: @ 82491B1
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord::
 	multichoice 20, 6, MULTI_GO_ON_REST_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
@@ -171,7 +171,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoReco
 	case 2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E7
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -180,18 +180,18 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattle:: @ 82491E
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle:: @ 8249219
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RecordBattle::
 	call BattleFrontier_EventScript_SaveBattle
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge:: @ 8249223
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskPauseChallenge::
 	msgbox BattleFrontier_BattleTowerBattleRoom_Text_SaveAndQuitGame, MSGBOX_YESNO
 	switch VAR_RESULT
 	case NO, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	case YES, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 8249251
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -200,7 +200,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallenge:: @ 824
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge:: @ 8249283
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge::
 	closemessage
 	clearflag FLAG_TEMP_2
 	applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle
@@ -212,14 +212,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge:: @ 8249
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon:: @ 82492AF
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyWon::
 	frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
 	tower_set TOWER_DATA_LVL_MODE
 	setvar VAR_0x8004, FANCOUNTER_USED_BATTLE_TOWER
 	special Script_TryGainNewFanFromCounter
 	goto BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge:: @ 82492DB
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge::
 	message BattleFrontier_BattleTowerBattleRoom_Text_SavingPleaseWait
 	waitmessage
 	tower_save CHALLENGE_STATUS_PAUSED
@@ -229,7 +229,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge:: @ 82492DB
 	frontier_reset
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet:: @ 82492FD
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink
 	copyvar VAR_TEMP_F, VAR_RESULT
@@ -241,37 +241,37 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet::
 	case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet
 	case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet:: @ 8249354
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet:: @ 824935B
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet:: @ 8249362
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet:: @ 8249369
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet:: @ 8249370
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet:: @ 8249377
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSet::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet
 	waitmessage
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink:: @ 824937E
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink::
 	copyvar VAR_TEMP_F, VAR_RESULT
 	switch VAR_TEMP_F
 	case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink
@@ -281,48 +281,48 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLin
 	case 5, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink
 	case 6, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink:: @ 82493CA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink:: @ 82493D6
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor3rdOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink:: @ 82493E2
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor4thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink:: @ 82493EE
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor5thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink:: @ 82493FA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor6thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink:: @ 8249406
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor7thOpponentSetLink::
 	message BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet
 	waitmessage
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg:: @ 8249412
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg::
 	waitmessage
 	delay 48
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink:: @ 8249417
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink::
 	goto_if_set FLAG_TEMP_2, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord
 	multichoice 19, 6, MULTI_GO_ON_RECORD_RETIRE, TRUE
 	switch VAR_RESULT
@@ -332,7 +332,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLink::
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord:: @ 8249457
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNoRecord::
 	multichoice 20, 8, MULTI_GO_ON_RETIRE, TRUE
 	switch VAR_RESULT
 	case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink
@@ -340,7 +340,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsLinkNo
 	case MULTI_B_PRESSED, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @ 8249483
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink::
 	setvar VAR_0x8004, BATTLE_TOWER_LINK_CONTINUE
 	setvar VAR_0x8005, 0
 	message gText_LinkStandby3
@@ -352,7 +352,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink:: @
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82494A8
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink::
 	message BattleFrontier_BattleTowerBattleRoom_Text_RecordYourBattle
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -364,7 +364,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRecordBattleLink:: @ 82
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @ 82494DD
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink::
 	message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
 	waitmessage
 	multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -373,7 +373,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink:: @
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82494FA
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink::
 	setvar VAR_0x8004, BATTLE_TOWER_LINK_RETIRE
 	setvar VAR_0x8005, 0
 	message gText_LinkStandby3
@@ -383,11 +383,11 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink:: @ 82
 	goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
 	end
 
-BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink:: @ 8249514
+BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink::
 	special BattleTowerReconnectLink
 	return
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom:
 	walk_up
 	walk_up
 	walk_up
@@ -395,7 +395,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_PlayerEnterRoom: @ 8249518
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom: @ 824951E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom:
 	walk_left
 	walk_up
 	walk_up
@@ -403,15 +403,15 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom: @ 824951E
 	face_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant: @ 8249524
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant:
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle: @ 8249526
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle:
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: @ 8249528
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter:
 	walk_down
 	walk_down
 	walk_down
@@ -419,7 +419,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: @ 8249528
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter: @ 824952E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter:
 	walk_right
 	walk_down
 	walk_down
@@ -427,93 +427,93 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter: @ 824952E
 	face_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit: @ 8249534
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Exit:
 	walk_up
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit: @ 8249539
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Exit:
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer: @ 824953E
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer:
 	walk_right
 	walk_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos: @ 8249541
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos:
 	walk_left
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft: @ 8249545
+BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft:
 	walk_in_place_left
 	step_end
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet: @ 8249547
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor2ndOpponentSet:
 	.string "The 2nd set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet: @ 8249578
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor3rdOpponentSet:
 	.string "The 3rd set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet: @ 82495A9
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor4thOpponentSet:
 	.string "The 4th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet: @ 82495DA
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor5thOpponentSet:
 	.string "The 5th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet: @ 824960B
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor6thOpponentSet:
 	.string "The 6th set of opponents is next.\n"
 	.string "Are you ready?$"
 
-BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet: @ 824963C
+BattleFrontier_BattleTowerMultiBattleRoom_Text_ReadyFor7thOpponentSet:
 	.string "The 7th set of opponents is next.\n"
 	.string "Are you ready?$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_2ndOpponentSetNext: @ 824966D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_2ndOpponentSetNext:
 	.string "The 2nd set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_3rdOpponentSetNext: @ 824969D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_3rdOpponentSetNext:
 	.string "The 3rd set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_4thOpponentSetNext: @ 82496CD
+BattleFrontier_BattleTowerMultiBattleRoom_Text_4thOpponentSetNext:
 	.string "The 4th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_5thOpponentSetNext: @ 82496FD
+BattleFrontier_BattleTowerMultiBattleRoom_Text_5thOpponentSetNext:
 	.string "The 5th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_6thOpponentSetNext: @ 824972D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_6thOpponentSetNext:
 	.string "The 6th set of opponents is next.\n"
 	.string "Do your best!$"
 
 @ Unused
-BattleFrontier_BattleTowerMultiBattleRoom_Text_7thOpponentSetNext: @ 824975D
+BattleFrontier_BattleTowerMultiBattleRoom_Text_7thOpponentSetNext:
 	.string "The 7th set of opponents is next.\n"
 	.string "Do your best!$"
 
-gText_LinkStandby3:: @ 824978D
+gText_LinkStandby3::
 	.string "Link standby…$"
 
-gText_YourPartnerHasRetired:: @ 824979B
+gText_YourPartnerHasRetired::
 	.string "Your partner has retired.\p"
 	.string "Your BATTLE ROOM challenge\n"
 	.string "will be canceled.$"

data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc

@@ -3,7 +3,7 @@
 .set LOCALID_ATTENDANT_2, 3
 .set LOCALID_PARTNER, 4
 
-BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
+BattleFrontier_BattleTowerMultiCorridor_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_BattleTowerMultiCorridor_OnTransition
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_BattleTowerMultiCorridor_OnFrame
@@ -13,14 +13,14 @@ BattleFrontier_BattleTowerMultiCorridor_MapScripts:: @ 8248D4A
 	@ The player is represented instead by LOCALID_PLAYER, and has the gfx id VAR_OBJ_GFX_ID_F
 	@ The multi partner is represented by LOCALID_PARTNER, and has the gfx id VAR_OBJ_GFX_ID_E
 
-BattleFrontier_BattleTowerMultiCorridor_OnTransition: @ 8248D5A
+BattleFrontier_BattleTowerMultiCorridor_OnTransition:
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx::
 	tower_setpartnergfx
 	checkplayergender
 	compare VAR_RESULT, FEMALE
@@ -28,30 +28,30 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: @ 8248D71
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale:: @ 8248D8B
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale::
 	setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_MAY_NORMAL
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx:: @ 8248D91
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx::
 	special SetBattleTowerLinkPlayerGfx
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_OnWarp: @ 8248D95
+BattleFrontier_BattleTowerMultiCorridor_OnWarp:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects:: @ 8248D9F
+BattleFrontier_BattleTowerMultiCorridor_EventScript_SetUpObjects::
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	hideobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	hideobjectat LOCALID_PARTNER, MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR
 	special OffsetCameraForBattle
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_OnFrame: @ 8248DB2
+BattleFrontier_BattleTowerMultiCorridor_OnFrame:
 	map_script_2 VAR_TEMP_1, 0, BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor
 	.2byte 0
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
+BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
 	lockall
 	setflag FLAG_ENABLE_MULTI_CORRIDOR_DOOR
 	setvar VAR_0x8004, 14  @ x coord of far door, used by DrawDoor
@@ -94,7 +94,7 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor:: @ 8248DBC
 	releaseall
 	end
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom::
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
 	compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
@@ -105,23 +105,23 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: @ 8248E71
 	call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: @ 8248E9E
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8
 	waitstate
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: @ 8248EA8
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
 	waitstate
 	return
 
 @ Unnecessary duplicate of the above
-BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: @ 8248EB2
+BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom::
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5
 	waitstate
 	return
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor:
 	walk_down
 	walk_right
 	walk_right
@@ -131,7 +131,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerWalkToDoor: @ 8248EBC
 	walk_right
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor:
 	walk_down
 	walk_left
 	walk_left
@@ -141,7 +141,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerWalkToDoor: @ 8248EC4
 	walk_left
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 8248ECC
+BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor:
 	walk_right
 	walk_right
 	walk_right
@@ -152,7 +152,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor: @ 82
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8248ED5
+BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor:
 	walk_left
 	walk_left
 	walk_left
@@ -163,19 +163,19 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: @ 8
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: @ 8248EDE
+BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor:
 	delay_16
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor: @ 8248EE3
+BattleFrontier_BattleTowerMultiCorridor_Movement_AttendantEnterDoor:
 	walk_up
 	set_invisible
 	step_end
 
-BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator: @ 8248EE6
+BattleFrontier_BattleTowerMultiCorridor_Movement_ExitElevator:
 	walk_down
 	step_end
 

data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc

@@ -1,18 +1,18 @@
-BattleFrontier_ExchangeServiceCorner_MapScripts:: @ 825F070
+BattleFrontier_ExchangeServiceCorner_MapScripts::
 	.byte 0
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome:: @ 825F071
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkWelcome::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize, MSGBOX_DEFAULT
 	special ShowBattlePointsWindow
 	return
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye:: @ 825F07D
+BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
+BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize::
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
@@ -26,7 +26,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: @ 825F08A
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize::
 	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
 	compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
@@ -34,7 +34,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: @ 825F0C9
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor::
 	checkdecorspace VAR_0x8009
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
@@ -49,13 +49,13 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: @ 825F0E5
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor:: @ 825F11D
+BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_PCIsFull, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
+BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem::
 	checkitemspace VAR_0x8009, 1
 	compare VAR_RESULT, FALSE
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
@@ -70,13 +70,13 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: @ 825F12A
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_BagFull:: @ 825F166
+BattleFrontier_ExchangeServiceCorner_EventScript_BagFull::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt, MSGBOX_DEFAULT
 	special CloseBattlePointsWindow
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK
@@ -84,7 +84,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk1:: @ 825F173
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -105,7 +105,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1:: @ 825F185
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
+BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -114,7 +114,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: @ 825F21E
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
+BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -123,7 +123,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: @ 825F241
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
+BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -132,7 +132,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: @ 825F264
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
+BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -141,7 +141,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: @ 825F287
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
+BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -150,7 +150,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: @ 825F2AA
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
+BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -159,7 +159,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: @ 825F2CD
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
+BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -168,7 +168,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: @ 825F2F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
+BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -177,7 +177,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: @ 825F313
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
+BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -186,7 +186,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: @ 825F336
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
+BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
@@ -195,7 +195,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: @ 825F359
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
+BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
@@ -203,7 +203,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DecorClerk2:: @ 825F37C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -219,7 +219,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2:: @ 825F38E
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
+BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -228,7 +228,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: @ 825F3F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
+BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -237,7 +237,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: @ 825F413
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
+BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -246,7 +246,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: @ 825F436
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
+BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -255,7 +255,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: @ 825F459
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
+BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
@@ -264,7 +264,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: @ 825F47C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
+BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
@@ -272,7 +272,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_VitaminClerk:: @ 825F49F
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -289,7 +289,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin:: @ 825F4B1
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
+BattleFrontier_ExchangeServiceCorner_EventScript_Protein::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -298,7 +298,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: @ 825F51E
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
+BattleFrontier_ExchangeServiceCorner_EventScript_Calcium::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -307,7 +307,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: @ 825F541
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
+BattleFrontier_ExchangeServiceCorner_EventScript_Iron::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -316,7 +316,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: @ 825F564
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
+BattleFrontier_ExchangeServiceCorner_EventScript_Zinc::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -325,7 +325,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: @ 825F587
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
+BattleFrontier_ExchangeServiceCorner_EventScript_Carbos::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -334,7 +334,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: @ 825F5AA
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
+BattleFrontier_ExchangeServiceCorner_EventScript_HPUp::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
@@ -343,7 +343,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: @ 825F5CD
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
+BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk::
 	lock
 	faceplayer
 	setvar VAR_TEMP_2, EXCHANGE_CORNER_HOLD_ITEM_CLERK
@@ -351,7 +351,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_HoldItemClerk:: @ 825F5F0
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
+BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem::
 	setvar VAR_0x8004, SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR
 	special ShowFrontierExchangeCornerItemIconWindow
 	special ShowScrollableMultichoice
@@ -371,7 +371,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem:: @ 825F602
 	case MULTI_B_PRESSED, BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
+BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -380,7 +380,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: @ 825F690
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
+BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -389,7 +389,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: @ 825F6B3
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
+BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -398,7 +398,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: @ 825F6D6
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
+BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -407,7 +407,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: @ 825F6F9
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
+BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -416,7 +416,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: @ 825F71C
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
+BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -425,7 +425,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: @ 825F73F
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
+BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -434,7 +434,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: @ 825F762
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
+BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -443,7 +443,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: @ 825F785
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
+BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
@@ -452,29 +452,29 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: @ 825F7A8
 	goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Man:: @ 825F7CB
+BattleFrontier_ExchangeServiceCorner_EventScript_Man::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Sailor:: @ 825F7D4
+BattleFrontier_ExchangeServiceCorner_EventScript_Sailor::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF:: @ 825F7DD
+BattleFrontier_ExchangeServiceCorner_EventScript_PokefanF::
 	lock
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy:: @ 825F7E8
+BattleFrontier_ExchangeServiceCorner_EventScript_RichBoy::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_EventScript_Girl:: @ 825F7F1
+BattleFrontier_ExchangeServiceCorner_EventScript_Girl::
 	msgbox BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord, MSGBOX_NPC
 	end
 
-BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
+BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize:
 	.string "Hello, this is the EXCHANGE SERVICE\n"
 	.string "CORNER.\p"
 	.string "We exchange the Battle Points you\n"
@@ -482,154 +482,154 @@ BattleFrontier_ExchangeServiceCorner_Text_WelcomePleaseChoosePrize: @ 825F7FA
 	.string "Please choose a prize from this list.$"
 
 @ Unused
-BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize: @ 825F890
+BattleFrontier_ExchangeServiceCorner_Text_PleaseChoosePrize:
 	.string "Please choose a prize from this list.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster: @ 825F8B6
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster:
 	.string "You've chosen the KISS POSTER.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion: @ 825F8E6
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion:
 	.string "You've chosen the KISS CUSHION.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll: @ 825F917
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll:
 	.string "You've chosen the SMOOCHUM DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll: @ 825F949
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll:
 	.string "You've chosen the TOGEPI DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll: @ 825F979
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll:
 	.string "You've chosen the MEOWTH DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll: @ 825F9A9
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll:
 	.string "You've chosen the CLEFAIRY DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll: @ 825F9DB
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll:
 	.string "You've chosen the DITTO DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll: @ 825FA0A
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll:
 	.string "You've chosen the CYNDAQUIL DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll: @ 825FA3D
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll:
 	.string "You've chosen the CHIKORITA DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll: @ 825FA70
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll:
 	.string "You've chosen the TOTODILE DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll: @ 825FAA2
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll:
 	.string "You've chosen the LAPRAS DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll: @ 825FAD2
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll:
 	.string "You've chosen the SNORLAX DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll: @ 825FB03
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll:
 	.string "You've chosen the VENUSAUR DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll: @ 825FB35
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll:
 	.string "You've chosen the CHARIZARD DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll: @ 825FB68
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll:
 	.string "You've chosen the BLASTOISE DOLL.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein: @ 825FB9B
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein:
 	.string "You've chosen the PROTEIN.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium: @ 825FBC7
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium:
 	.string "You've chosen the CALCIUM.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron: @ 825FBF3
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron:
 	.string "You've chosen the IRON.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc: @ 825FC1C
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc:
 	.string "You've chosen the ZINC.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos: @ 825FC45
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos:
 	.string "You've chosen the CARBOS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp: @ 825FC70
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp:
 	.string "You've chosen the HP UP.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder: @ 825FC9A
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder:
 	.string "You've chosen the BRIGHTPOWDER.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb: @ 825FCCB
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb:
 	.string "You've chosen the WHITE HERB.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw: @ 825FCFA
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw:
 	.string "You've chosen the QUICK CLAW.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb: @ 825FD29
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb:
 	.string "You've chosen the MENTAL HERB.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand: @ 825FD59
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand:
 	.string "You've chosen the CHOICE BAND.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock: @ 825FD89
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock:
 	.string "You've chosen the KING'S ROCK.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand: @ 825FDB9
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand:
 	.string "You've chosen the FOCUS BAND.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens: @ 825FDE8
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens:
 	.string "You've chosen the SCOPE LENS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers: @ 825FE17
+BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers:
 	.string "You've chosen the LEFTOVERS.\n"
 	.string "Is that correct?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC: @ 825FE45
+BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC:
 	.string "Thank you!\n"
 	.string "We'll send it to your PC at home.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize: @ 825FE72
+BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize:
 	.string "Here is your prize!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints: @ 825FE86
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints:
 	.string "I'm so sorry…\n"
 	.string "You don't have enough Battle Points…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_PCIsFull: @ 825FEB9
+BattleFrontier_ExchangeServiceCorner_Text_PCIsFull:
 	.string "I'm so sorry…\n"
 	.string "Your PC appears to be full…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt: @ 825FEE3
+BattleFrontier_ExchangeServiceCorner_Text_DontHaveSpaceToHoldIt:
 	.string "I'm so sorry…\n"
 	.string "You don't have space to hold it…$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints: @ 825FF12
+BattleFrontier_ExchangeServiceCorner_Text_ThankYouVisitWithPoints:
 	.string "Thank you very much.\p"
 	.string "Please visit us when you have\n"
 	.string "saved up Battle Points.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
+BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls:
 	.string "Oh, they're so nice!\n"
 	.string "I wish I had them!\l"
 	.string "Cute cushions!\l"
@@ -637,18 +637,18 @@ BattleFrontier_ExchangeServiceCorner_Text_WishIHadAllDolls: @ 825FF5D
 	.string "Little plush DOLLS!\l"
 	.string "I wish I had them all!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant: @ 825FFD0
+BattleFrontier_ExchangeServiceCorner_Text_GetYouAnythingYouWant:
 	.string "Leave it to your mommy!\p"
 	.string "If it's anything you want, I'll go\n"
 	.string "through anything to get it, honey!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher: @ 826002E
+BattleFrontier_ExchangeServiceCorner_Text_ItemsWillGetMonTougher:
 	.string "If I can get hold of the items here,\n"
 	.string "my POKéMON will get tougher.\p"
 	.string "You bet they will!\n"
 	.string "No question about it!$"
 
-BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
+BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll:
 	.string "Hah?\n"
 	.string "What are you gawking at?\p"
 	.string "I don't like you staring at my plush\n"
@@ -656,110 +656,110 @@ BattleFrontier_ExchangeServiceCorner_Text_GoGetYourOwnDoll: @ 8260099
 	.string "If you want it, go get one yourself!\n"
 	.string "Isn't that right, SMOOCHUM?$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord: @ 826012D
+BattleFrontier_ExchangeServiceCorner_Text_MoreBattlePointsForRecord:
 	.string "Did you know?\p"
 	.string "If you stretch your record at any of\n"
 	.string "the BATTLE facilities, they start\l"
 	.string "giving you more and more Battle Points.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc:: @ 82601AA
+BattleFrontier_ExchangeServiceCorner_Text_KissPosterDesc::
 	.string "A large poster with a SMOOCHUM print.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc:: @ 82601D0
+BattleFrontier_ExchangeServiceCorner_Text_KissCushionDesc::
 	.string "A SMOOCHUM cushion.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc:: @ 8260201
+BattleFrontier_ExchangeServiceCorner_Text_SmoochumDollDesc::
 	.string "A SMOOCHUM DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc:: @ 826022F
+BattleFrontier_ExchangeServiceCorner_Text_TogepiDollDesc::
 	.string "A TOGEPI DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc:: @ 826025B
+BattleFrontier_ExchangeServiceCorner_Text_MeowthDollDesc::
 	.string "A MEOWTH DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc:: @ 8260287
+BattleFrontier_ExchangeServiceCorner_Text_ClefairyDollDesc::
 	.string "A CLEFAIRY DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc:: @ 82602B5
+BattleFrontier_ExchangeServiceCorner_Text_DittoDollDesc::
 	.string "A DITTO DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc:: @ 82602E0
+BattleFrontier_ExchangeServiceCorner_Text_CyndaquilDollDesc::
 	.string "A CYNDAQUIL DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc:: @ 826030F
+BattleFrontier_ExchangeServiceCorner_Text_ChikoritaDollDesc::
 	.string "A CHIKORITA DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc:: @ 826033E
+BattleFrontier_ExchangeServiceCorner_Text_TotodileDollDesc::
 	.string "A TOTODILE DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc:: @ 826036C
+BattleFrontier_ExchangeServiceCorner_Text_LargeDollDesc::
 	.string "A large DOLL.\n"
 	.string "Place it on a mat or a desk.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc:: @ 8260397
+BattleFrontier_ExchangeServiceCorner_Text_ProteinDesc::
 	.string "Raises the stat ATTACK of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc:: @ 82603BE
+BattleFrontier_ExchangeServiceCorner_Text_CalciumDesc::
 	.string "Raises the stat SP. ATK of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_IronDesc:: @ 82603E6
+BattleFrontier_ExchangeServiceCorner_Text_IronDesc::
 	.string "Raises the stat DEFENSE of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ZincDesc:: @ 826040E
+BattleFrontier_ExchangeServiceCorner_Text_ZincDesc::
 	.string "Raises the stat SP. DEF of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc:: @ 8260436
+BattleFrontier_ExchangeServiceCorner_Text_CarbosDesc::
 	.string "Raises the stat SPEED of one\n"
 	.string "POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc:: @ 826045C
+BattleFrontier_ExchangeServiceCorner_Text_HPUpDesc::
 	.string "Raises the HP of one POKéMON.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc:: @ 826047A
+BattleFrontier_ExchangeServiceCorner_Text_LeftoversDesc::
 	.string "A hold item that gradually restores\n"
 	.string "HP in battle.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc:: @ 82604AC
+BattleFrontier_ExchangeServiceCorner_Text_WhiteHerbDesc::
 	.string "A hold item that restores any\n"
 	.string "lowered stat.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc:: @ 82604D8
+BattleFrontier_ExchangeServiceCorner_Text_QuickClawDesc::
 	.string "A hold item that occasionally allows\n"
 	.string "the first strike.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc:: @ 826050F
+BattleFrontier_ExchangeServiceCorner_Text_MentalHerbDesc::
 	.string "A hold item that snaps POKéMON out\n"
 	.string "of infatuation.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc:: @ 8260542
+BattleFrontier_ExchangeServiceCorner_Text_BrightpowderDesc::
 	.string "A hold item that casts a glare to\n"
 	.string "reduce accuracy.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc:: @ 8260575
+BattleFrontier_ExchangeServiceCorner_Text_ChoiceBandDesc::
 	.string "Raises a move's power, but permits\n"
 	.string "only that move.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc:: @ 82605A8
+BattleFrontier_ExchangeServiceCorner_Text_KingsRockDesc::
 	.string "A hold item that may cause flinching\n"
 	.string "when the foe is hit.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc:: @ 82605E2
+BattleFrontier_ExchangeServiceCorner_Text_FocusBandDesc::
 	.string "A hold item that occasionally\n"
 	.string "prevents fainting.$"
 
-BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc:: @ 8260613
+BattleFrontier_ExchangeServiceCorner_Text_ScopeLensDesc::
 	.string "A hold item that raises the\n"
 	.string "critical-hit rate.$"

data/maps/BattleFrontier_Lounge1/scripts.inc

@@ -1,8 +1,8 @@
-BattleFrontier_Lounge1_MapScripts:: @ 825E774
+BattleFrontier_Lounge1_MapScripts::
 	.byte 0
 
 @ NPC that rates pokemon based on their IVs
-BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
+BattleFrontier_Lounge1_EventScript_Breeder::
 	lock
 	faceplayer
 	call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_BreederIntro
@@ -11,7 +11,7 @@ BattleFrontier_Lounge1_EventScript_Breeder:: @ 825E775
 	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
-BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
+BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder::
 	special ChoosePartyMon
 	waitstate
 	compare VAR_0x8004, 255
@@ -20,11 +20,11 @@ BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: @ 825E792
 	goto_if_eq BattleFrontier_Lounge1_EventScript_CancelMonSelect
 	end
 
-BattleFrontier_Lounge1_EventScript_BreederIntro:: @ 825E7AD
+BattleFrontier_Lounge1_EventScript_BreederIntro::
 	msgbox BattleFrontier_Lounge1_Text_PokemonBreederIntro, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
+BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder::
 	msgbox BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon, MSGBOX_DEFAULT
 	return
 
@@ -32,7 +32,7 @@ BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder:: @ 825E7B6
 @ VAR_0x8005: Sum of the mons IVs
 @ VAR_0x8006: Stat id of highest IV stat
 @ VAR_0x8007: IV of the highest IV stat
-BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
+BattleFrontier_Lounge1_EventScript_ShowMonToBreeder::
 	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
 	compare VAR_RESULT, SPECIES_EGG
 	goto_if_eq BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
@@ -47,13 +47,13 @@ BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: @ 825E7BF
 	goto_if_ge BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs
 	end
 
-BattleFrontier_Lounge1_EventScript_ShowEggToBreeder:: @ 825E7FF
+BattleFrontier_Lounge1_EventScript_ShowEggToBreeder::
 	msgbox BattleFrontier_Lounge1_Text_EvenICantTell, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder
 	end
 
 @ Comment on the highest IV stat
-BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
+BattleFrontier_Lounge1_EventScript_HighestIVStat::
 	compare VAR_0x8006, STAT_HP
 	goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVHP
 	compare VAR_0x8006, STAT_ATK
@@ -69,7 +69,7 @@ BattleFrontier_Lounge1_EventScript_HighestIVStat:: @ 825E80D
 	end
 
 @ Comment on the highest IV value
-BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
+BattleFrontier_Lounge1_EventScript_HighestIVValue::
 	compare VAR_0x8007, 15
 	goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVLow
 	compare VAR_0x8007, 25
@@ -80,94 +80,94 @@ BattleFrontier_Lounge1_EventScript_HighestIVValue:: @ 825E850
 	goto_if_ge BattleFrontier_Lounge1_EventScript_HighestIVMax
 	end
 
-BattleFrontier_Lounge1_EventScript_EndBreederComments:: @ 825E87D
+BattleFrontier_Lounge1_EventScript_EndBreederComments::
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_AverageTotalIVs:: @ 825E87F
+BattleFrontier_Lounge1_EventScript_AverageTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_AverageAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs:: @ 825E88D
+BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_BetterThanAverageAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_HighTotalIVs:: @ 825E89B
+BattleFrontier_Lounge1_EventScript_HighTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_ImpressiveAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs:: @ 825E8A9
+BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs::
 	msgbox BattleFrontier_Lounge1_Text_OutstandingAbility, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVStat
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVHP:: @ 825E8B7
+BattleFrontier_Lounge1_EventScript_HighestIVHP::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectHP, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVAtk:: @ 825E8C5
+BattleFrontier_Lounge1_EventScript_HighestIVAtk::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectAtk, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVDef:: @ 825E8D3
+BattleFrontier_Lounge1_EventScript_HighestIVDef::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectDef, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpeed:: @ 825E8E1
+BattleFrontier_Lounge1_EventScript_HighestIVSpeed::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpeed, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpAtk:: @ 825E8EF
+BattleFrontier_Lounge1_EventScript_HighestIVSpAtk::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpAtk, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVSpDef:: @ 825E8FD
+BattleFrontier_Lounge1_EventScript_HighestIVSpDef::
 	msgbox BattleFrontier_Lounge1_Text_BestAspectSpDef, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_HighestIVValue
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVLow:: @ 825E90B
+BattleFrontier_Lounge1_EventScript_HighestIVLow::
 	msgbox BattleFrontier_Lounge1_Text_StatRelativelyGood, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVMid:: @ 825E919
+BattleFrontier_Lounge1_EventScript_HighestIVMid::
 	msgbox BattleFrontier_Lounge1_Text_StatImpressive, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVHigh:: @ 825E927
+BattleFrontier_Lounge1_EventScript_HighestIVHigh::
 	msgbox BattleFrontier_Lounge1_Text_StatOutstanding, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_HighestIVMax:: @ 825E935
+BattleFrontier_Lounge1_EventScript_HighestIVMax::
 	msgbox BattleFrontier_Lounge1_Text_StatFlawless, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge1_EventScript_EndBreederComments
 	end
 
-BattleFrontier_Lounge1_EventScript_CancelMonSelect:: @ 825E943
+BattleFrontier_Lounge1_EventScript_CancelMonSelect::
 	msgbox BattleFrontier_Lounge1_Text_NoTimeForMyAdvice, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge1_EventScript_Boy1:: @ 825E94D
+BattleFrontier_Lounge1_EventScript_Boy1::
 	msgbox BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_EventScript_Boy2:: @ 825E956
+BattleFrontier_Lounge1_EventScript_Boy2::
 	msgbox BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
+BattleFrontier_Lounge1_Text_PokemonBreederIntro:
 	.string "For 70 years I have raised POKéMON!\n"
 	.string "I am the man they revere as\l"
 	.string "the legendary top POKéMON BREEDER!\p"
@@ -180,95 +180,95 @@ BattleFrontier_Lounge1_Text_PokemonBreederIntro: @ 825E95F
 	.string "Here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_AverageAbility: @ 825EA92
+BattleFrontier_Lounge1_Text_AverageAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe\n"
 	.string "as being of average ability.$"
 
-BattleFrontier_Lounge1_Text_BetterThanAverageAbility: @ 825EAD9
+BattleFrontier_Lounge1_Text_BetterThanAverageAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would describe as\n"
 	.string "having better-than-average ability.$"
 
-BattleFrontier_Lounge1_Text_ImpressiveAbility: @ 825EB2A
+BattleFrontier_Lounge1_Text_ImpressiveAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "quite impressive in ability!$"
 
-BattleFrontier_Lounge1_Text_OutstandingAbility: @ 825EB6F
+BattleFrontier_Lounge1_Text_OutstandingAbility:
 	.string "…Hmm…\p"
 	.string "This one, overall, I would say is\n"
 	.string "wonderfully outstanding in ability!$"
 
-BattleFrontier_Lounge1_Text_BestAspectHP: @ 825EBBB
+BattleFrontier_Lounge1_Text_BestAspectHP:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its HP…$"
 
-BattleFrontier_Lounge1_Text_BestAspectAtk: @ 825EBF8
+BattleFrontier_Lounge1_Text_BestAspectAtk:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its ATTACK…$"
 
-BattleFrontier_Lounge1_Text_BestAspectDef: @ 825EC39
+BattleFrontier_Lounge1_Text_BestAspectDef:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpAtk: @ 825EC7B
+BattleFrontier_Lounge1_Text_BestAspectSpAtk:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL ATTACK…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpDef: @ 825ECC4
+BattleFrontier_Lounge1_Text_BestAspectSpDef:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPECIAL DEFENSE…$"
 
-BattleFrontier_Lounge1_Text_BestAspectSpeed: @ 825ED0E
+BattleFrontier_Lounge1_Text_BestAspectSpeed:
 	.string "Incidentally, the best aspect of it,\n"
 	.string "I would say, is its SPEED…$"
 
-BattleFrontier_Lounge1_Text_StatRelativelyGood: @ 825ED4E
+BattleFrontier_Lounge1_Text_StatRelativelyGood:
 	.string "That stat is relatively good.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatImpressive: @ 825ED87
+BattleFrontier_Lounge1_Text_StatImpressive:
 	.string "That stat is quite impressive.\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatOutstanding: @ 825EDC1
+BattleFrontier_Lounge1_Text_StatOutstanding:
 	.string "That stat is outstanding!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_StatFlawless: @ 825EDF6
+BattleFrontier_Lounge1_Text_StatFlawless:
 	.string "It's flawless! A thing of perfection!\n"
 	.string "…Hm… That's how I call it.$"
 
-BattleFrontier_Lounge1_Text_NoTimeForMyAdvice: @ 825EE37
+BattleFrontier_Lounge1_Text_NoTimeForMyAdvice:
 	.string "What?\n"
 	.string "You have no time for my advice?\p"
 	.string "You should always be eager to learn\n"
 	.string "from the experiences of your elders!$"
 
 @ Unused
-BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending: @ 825EEA6
+BattleFrontier_Lounge1_Text_HaveBusinessNeedsTending:
 	.string "Yes, what is it now?\p"
 	.string "I have business that needs tending!\n"
 	.string "Save it for next time!$"
 
-BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon: @ 825EEF6
+BattleFrontier_Lounge1_Text_LetsLookAtYourPokemon:
 	.string "Ah, youngster! Do your POKéMON's\n"
 	.string "abilities intrigue you?\p"
 	.string "Here, here!\n"
 	.string "Let's have a look at your POKéMON!$"
 
-BattleFrontier_Lounge1_Text_EvenICantTell: @ 825EF5E
+BattleFrontier_Lounge1_Text_EvenICantTell:
 	.string "An expert I am, but even I can't tell\n"
 	.string "anything about an unhatched POKéMON!\p"
 	.string "Show me a POKéMON!\n"
 	.string "A POKéMON is what I need to see!$"
 
-BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding: @ 825EFDD
+BattleFrontier_Lounge1_Text_SaidMyMonIsOutstanding:
 	.string "He said my POKéMON is outstanding!\n"
 	.string "I'm glad I raised it carefully!$"
 
-BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt: @ 825F020
+BattleFrontier_Lounge1_Text_DidntDoAnythingSpecialRaisingIt:
 	.string "He said my POKéMON is outstanding!\n"
 	.string "But I didn't do anything special\l"
 	.string "raising it…$"

data/maps/BattleFrontier_Lounge2/scripts.inc

@@ -1,4 +1,4 @@
-BattleFrontier_Lounge2_MapScripts:: @ 8260642
+BattleFrontier_Lounge2_MapScripts::
 	.byte 0
 
 @ This NPC gives hints about a random facility or battle mode.
@@ -7,7 +7,7 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642
 @    The name of the Frontier Brain there
 @    The type and description of the 3 pokemon they use in their silver battle
 @    The type and description of the 3 pokemon they use in their gold battle
-BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
+BattleFrontier_Lounge2_EventScript_FrontierManiac::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_AlreadyMetManiac
@@ -16,12 +16,12 @@ BattleFrontier_Lounge2_EventScript_FrontierManiac:: @ 8260643
 	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_AlreadyMetManiac:: @ 826065F
+BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
 	msgbox BattleFrontier_Lounge2_Text_SwingByForTheLatestWord, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge2_EventScript_GiveAdvice
 	end
 
-BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
+BattleFrontier_Lounge2_EventScript_GiveAdvice::
 	compare VAR_FRONTIER_MANIAC_FACILITY, 0
 	call_if_eq BattleFrontier_Lounge2_EventScript_BufferSingle
 	compare VAR_FRONTIER_MANIAC_FACILITY, 1
@@ -52,77 +52,77 @@ BattleFrontier_Lounge2_EventScript_GiveAdvice:: @ 826066D
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_BattleTowerNews:: @ 82606F8
+BattleFrontier_Lounge2_EventScript_BattleTowerNews::
 	msgbox BattleFrontier_Lounge2_Text_BattleTowerIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_FacilityNews:: @ 8260701
+BattleFrontier_Lounge2_EventScript_FacilityNews::
 	msgbox BattleFrontier_Lounge2_Text_FacilityIsHottest, MSGBOX_DEFAULT
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferSingle:: @ 826070A
+BattleFrontier_Lounge2_EventScript_BufferSingle::
 	bufferstdstring 0, STDSTRING_SINGLE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferDouble:: @ 826070F
+BattleFrontier_Lounge2_EventScript_BufferDouble::
 	bufferstdstring 0, STDSTRING_DOUBLE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferMulti:: @ 8260714
+BattleFrontier_Lounge2_EventScript_BufferMulti::
 	bufferstdstring 0, STDSTRING_MULTI
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferMultiLink:: @ 8260719
+BattleFrontier_Lounge2_EventScript_BufferMultiLink::
 	bufferstdstring 0, STDSTRING_MULTI_LINK
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleDome:: @ 826071E
+BattleFrontier_Lounge2_EventScript_BufferBattleDome::
 	bufferstdstring 0, STDSTRING_BATTLE_DOME
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleFactory:: @ 8260723
+BattleFrontier_Lounge2_EventScript_BufferBattleFactory::
 	bufferstdstring 0, STDSTRING_BATTLE_FACTORY
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePalace:: @ 8260728
+BattleFrontier_Lounge2_EventScript_BufferBattlePalace::
 	bufferstdstring 0, STDSTRING_BATTLE_PALACE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattleArena:: @ 826072D
+BattleFrontier_Lounge2_EventScript_BufferBattleArena::
 	bufferstdstring 0, STDSTRING_BATTLE_ARENA
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePike:: @ 8260732
+BattleFrontier_Lounge2_EventScript_BufferBattlePike::
 	bufferstdstring 0, STDSTRING_BATTLE_PIKE
 	return
 
-BattleFrontier_Lounge2_EventScript_BufferBattlePyramid:: @ 8260737
+BattleFrontier_Lounge2_EventScript_BufferBattlePyramid::
 	bufferstdstring 0, STDSTRING_BATTLE_PYRAMID
 	return
 
-BattleFrontier_Lounge2_EventScript_Maniac1:: @ 826073C
+BattleFrontier_Lounge2_EventScript_Maniac1::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_NewsGatheringPower, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_Maniac2:: @ 8260747
+BattleFrontier_Lounge2_EventScript_Maniac2::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_AmazingPowersOfObservation, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_Maniac3:: @ 8260752
+BattleFrontier_Lounge2_EventScript_Maniac3::
 	lock
 	msgbox BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge2_EventScript_TriathleteF:: @ 826075D
+BattleFrontier_Lounge2_EventScript_TriathleteF::
 	msgbox BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
+BattleFrontier_Lounge2_Text_FrontierManiacIntro::
 	.string "Howdy! When it comes to news about\n"
 	.string "the BATTLE FRONTIER, I'm no. 1.\p"
 	.string "You can think of me as\n"
@@ -132,34 +132,34 @@ BattleFrontier_Lounge2_Text_FrontierManiacIntro:: @ 8260766
 	.string "I'll happily share the hottest news\n"
 	.string "I gathered about the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_SwingByForTheLatestWord:: @ 8260857
+BattleFrontier_Lounge2_Text_SwingByForTheLatestWord::
 	.string "Howdy! Did you swing by to grill me\n"
 	.string "about the latest word? Oh, all right!$"
 
 @ Unused
-BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight:: @ 82608A1
+BattleFrontier_Lounge2_Text_MyInformationsBeenUsefulRight::
 	.string "Well? Well? Well?\p"
 	.string "I'm sure my information's been\n"
 	.string "seriously useful to you, right?$"
 
-BattleFrontier_Lounge2_Text_FacilityIsHottest:: @ 82608F2
+BattleFrontier_Lounge2_Text_FacilityIsHottest::
 	.string "Let's see now…\p"
 	.string "It sounds like the {STR_VAR_1}\n"
 	.string "is the hottest place going.$"
 
-BattleFrontier_Lounge2_Text_BattleTowerIsHottest:: @ 8260933
+BattleFrontier_Lounge2_Text_BattleTowerIsHottest::
 	.string "Let's see now…\p"
 	.string "It sounds like BATTLE TOWER\n"
 	.string "{STR_VAR_1} is the hottest.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenIsThere:: @ 8260971
+BattleFrontier_Lounge2_Text_SalonMaidenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this mysterious TRAINER called\n"
 	.string "the SALON MAIDEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
+BattleFrontier_Lounge2_Text_SalonMaidenSilverMons::
 	.string "Have you battled the SALON MAIDEN?\p"
 	.string "When she's measuring up her opponent,\n"
 	.string "she apparently uses these POKéMON:\p"
@@ -167,7 +167,7 @@ BattleFrontier_Lounge2_Text_SalonMaidenSilverMons:: @ 8260A1E
 	.string "a FIRE-type VOLCANO POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
+BattleFrontier_Lounge2_Text_SalonMaidenGoldMons::
 	.string "Have you battled the SALON MAIDEN\n"
 	.string "when she's serious?\p"
 	.string "When she's battling flat out,\n"
@@ -176,14 +176,14 @@ BattleFrontier_Lounge2_Text_SalonMaidenGoldMons:: @ 8260AE7
 	.string "an ELECTRIC-type THUNDER POKéMON,\l"
 	.string "and a NORMAL-type SLEEPING POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DomeAceIsThere:: @ 8260BC4
+BattleFrontier_Lounge2_Text_DomeAceIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this flamboyant TRAINER called\n"
 	.string "the DOME ACE that runs the place.$"
 
-BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
+BattleFrontier_Lounge2_Text_DomeAceSilverMons::
 	.string "Have you battled the DOME ACE?\p"
 	.string "When he's treating the opponent\n"
 	.string "lightly, he uses these three POKéMON:\p"
@@ -191,7 +191,7 @@ BattleFrontier_Lounge2_Text_DomeAceSilverMons:: @ 8260C6D
 	.string "a WATER & GROUND MUD FISH POKéMON,\l"
 	.string "and a FIRE & FLYING FLAME POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
+BattleFrontier_Lounge2_Text_DomeAceGoldMons::
 	.string "Have you battled the DOME ACE\n"
 	.string "when he's serious?\p"
 	.string "When he's demonstrating his strategy,\n"
@@ -201,14 +201,14 @@ BattleFrontier_Lounge2_Text_DomeAceGoldMons:: @ 8260D3A
 	.string "and a STEEL- & PSYCHIC-type IRON LEG\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadIsThere:: @ 8260E1E
+BattleFrontier_Lounge2_Text_FactoryHeadIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this freaky TRAINER called\n"
 	.string "the FACTORY HEAD that runs the place.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
+BattleFrontier_Lounge2_Text_FactoryHeadSilverMons::
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "already?\p"
 	.string "Let me think… When he goes to battle,\n"
@@ -216,7 +216,7 @@ BattleFrontier_Lounge2_Text_FactoryHeadSilverMons:: @ 8260EC7
 	.string "He battles under pretty much the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
+BattleFrontier_Lounge2_Text_FactoryHeadGoldMons::
 	.string "Have you battled the FACTORY HEAD\n"
 	.string "when he's serious?\p"
 	.string "When he goes seriously to battle,\n"
@@ -224,14 +224,14 @@ BattleFrontier_Lounge2_Text_FactoryHeadGoldMons:: @ 8260F74
 	.string "He battles under virtually the same\n"
 	.string "conditions as you.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenIsThere:: @ 8261026
+BattleFrontier_Lounge2_Text_PikeQueenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this scary TRAINER called\n"
 	.string "the PIKE QUEEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
+BattleFrontier_Lounge2_Text_PikeQueenSilverMons::
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "before?\p"
 	.string "When she's in a good mood, they say\n"
@@ -240,7 +240,7 @@ BattleFrontier_Lounge2_Text_PikeQueenSilverMons:: @ 82610CC
 	.string "a BUG & ROCK MOLD POKéMON,\l"
 	.string "and a WATER-type TENDER POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
+BattleFrontier_Lounge2_Text_PikeQueenGoldMons::
 	.string "Have you battled the PIKE QUEEN\n"
 	.string "when she's serious?\p"
 	.string "When she's seriously annoyed, they say\n"
@@ -250,14 +250,14 @@ BattleFrontier_Lounge2_Text_PikeQueenGoldMons:: @ 8261194
 	.string "and a WATER- & FLYING-type ATROCIOUS\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonIsThere:: @ 8261282
+BattleFrontier_Lounge2_Text_ArenaTycoonIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this cute TRAINER called\n"
 	.string "the ARENA TYCOON that runs the place.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
+BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons::
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "before?\p"
 	.string "When she's assessing the foe's ability,\n"
@@ -266,7 +266,7 @@ BattleFrontier_Lounge2_Text_ArenaTycoonSilverMons:: @ 8261329
 	.string "a DARK-type MOONLIGHT POKéMON,\l"
 	.string "and a BUG & GHOST SHED POKéMON.$"
 
-BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
+BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons::
 	.string "Have you battled the ARENA TYCOON\n"
 	.string "when she's serious?\p"
 	.string "When she battles for keeps,\n"
@@ -276,14 +276,14 @@ BattleFrontier_Lounge2_Text_ArenaTycoonGoldMons:: @ 8261403
 	.string "and a GRASS- & FIGHTING-type\l"
 	.string "MUSHROOM POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenIsThere:: @ 82614E6
+BattleFrontier_Lounge2_Text_PalaceMavenIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this sinister TRAINER called\n"
 	.string "the PALACE MAVEN that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
+BattleFrontier_Lounge2_Text_PalaceMavenSilverMons::
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "before?\p"
 	.string "When he's testing the opponent's\n"
@@ -292,7 +292,7 @@ BattleFrontier_Lounge2_Text_PalaceMavenSilverMons:: @ 8261591
 	.string "a NORMAL-type LAZY POKéMON, and a\l"
 	.string "WATER- & ICE-type TRANSPORT POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
+BattleFrontier_Lounge2_Text_PalaceMavenGoldMons::
 	.string "Have you battled the PALACE MAVEN\n"
 	.string "when he's serious?\p"
 	.string "When he throws his entire might into\n"
@@ -301,14 +301,14 @@ BattleFrontier_Lounge2_Text_PalaceMavenGoldMons:: @ 826166F
 	.string "a NORMAL-type LAZY POKéMON,\l"
 	.string "and a WATER-type AURORA POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingIsThere:: @ 826174D
+BattleFrontier_Lounge2_Text_PyramidKingIsThere::
 	.string "Bet you didn't know this!\p"
 	.string "One of those top TRAINERS that SCOTT\n"
 	.string "calls the FRONTIER BRAINS is there.\p"
 	.string "It's this fiery-hot TRAINER called\n"
 	.string "the PYRAMID KING that runs the place.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
+BattleFrontier_Lounge2_Text_PyramidKingSilverMons::
 	.string "Have you battled the PYRAMID KING\n"
 	.string "before?\p"
 	.string "When he's checking the foe's power,\n"
@@ -317,7 +317,7 @@ BattleFrontier_Lounge2_Text_PyramidKingSilverMons:: @ 82617F9
 	.string "an ICE-type ICEBERG POKéMON,\l"
 	.string "and a STEEL-type IRON POKéMON.$"
 
-BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
+BattleFrontier_Lounge2_Text_PyramidKingGoldMons::
 	.string "Have you battled the PYRAMID KING\n"
 	.string "when he's serious?\p"
 	.string "When he's pumped with hot power,\n"
@@ -327,7 +327,7 @@ BattleFrontier_Lounge2_Text_PyramidKingGoldMons:: @ 82618C4
 	.string "and a FIRE- & FLYING-type FLAME\l"
 	.string "POKéMON.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice1::
 	.string "Sure, there are several places where\n"
 	.string "you can enter DOUBLE BATTLES.\p"
 	.string "But the DOUBLE BATTLE ROOMS of\n"
@@ -336,44 +336,44 @@ BattleFrontier_Lounge2_Text_DoubleBattleAdvice1:: @ 82619AC
 	.string "how DOUBLE BATTLES are played here\l"
 	.string "in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice2:: @ 8261A91
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice2::
 	.string "Watch yourself in the battles here.\p"
 	.string "I hear there are TRAINERS that have\n"
 	.string "strategies they developed just for\l"
 	.string "DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_DoubleBattleAdvice3:: @ 8261B0C
+BattleFrontier_Lounge2_Text_DoubleBattleAdvice3::
 	.string "Once you're confident and comfortable\n"
 	.string "with DOUBLE BATTLES here, you should\l"
 	.string "think about challenging other places\l"
 	.string "offering DOUBLE BATTLES.$"
 
-BattleFrontier_Lounge2_Text_MultiBattleAdvice:: @ 8261B95
+BattleFrontier_Lounge2_Text_MultiBattleAdvice::
 	.string "All sorts of TRAINERS gather in\n"
 	.string "the BATTLE SALON.\p"
 	.string "Just think--you may run into your\n"
 	.string "friends or followers!\l"
 	.string "You should look carefully!$"
 
-BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice:: @ 8261C1A
+BattleFrontier_Lounge2_Text_LinkMultiBattleAdvice::
 	.string "If you're with a friend, head for the\n"
 	.string "LINK MULTI BATTLE ROOM.\p"
 	.string "If you play with a strong friend,\n"
 	.string "you can expect to see tough foes!$"
 
-BattleFrontier_Lounge2_Text_NewsGatheringPower:: @ 8261C9C
+BattleFrontier_Lounge2_Text_NewsGatheringPower::
 	.string "What amazing news-gathering power!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_AmazingPowersOfObservation:: @ 8261CDC
+BattleFrontier_Lounge2_Text_AmazingPowersOfObservation::
 	.string "What amazing powers of observation!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion:: @ 8261D1D
+BattleFrontier_Lounge2_Text_AmazingPowerOfPersuasion::
 	.string "What amazing power of persuasion!\n"
 	.string "My mentor's like none other!$"
 
-BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe:: @ 8261D5C
+BattleFrontier_Lounge2_Text_ThisPlaceIsScaringMe::
 	.string "…What is this place?\n"
 	.string "It's scaring me…$"
 

data/maps/BattleFrontier_Lounge3/scripts.inc

@@ -1,11 +1,11 @@
-BattleFrontier_Lounge3_MapScripts:: @ 8261D82
+BattleFrontier_Lounge3_MapScripts::
 	.byte 0
 
 	.set BET_AMOUNT_5,  5
 	.set BET_AMOUNT_10, 10
 	.set BET_AMOUNT_15, 15
 
-BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
+BattleFrontier_Lounge3_EventScript_Gambler::
 	lock
 	faceplayer
 	goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler
@@ -17,7 +17,7 @@ BattleFrontier_Lounge3_EventScript_Gambler:: @ 8261D83
 	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
+BattleFrontier_Lounge3_EventScript_AskToEnterChallenge::
 	special ShowFrontierGamblerLookingMessage
 	waitmessage
 	waitbuttonpress
@@ -33,7 +33,7 @@ BattleFrontier_Lounge3_EventScript_AskToEnterChallenge:: @ 8261DAF
 	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
+BattleFrontier_Lounge3_EventScript_ChooseBetAmount::
 	multichoice 20, 4, MULTI_FRONTIER_GAMBLER_BET, FALSE
 	copyvar VAR_FRONTIER_GAMBLER_AMOUNT_BET, VAR_RESULT
 	switch VAR_RESULT
@@ -44,22 +44,22 @@ BattleFrontier_Lounge3_EventScript_ChooseBetAmount:: @ 8261DE9
 	case MULTI_B_PRESSED, BattleFrontier_Lounge3_EventScript_CancelBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet5:: @ 8261E30
+BattleFrontier_Lounge3_EventScript_Bet5::
 	setvar VAR_0x8008, BET_AMOUNT_5
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet10:: @ 8261E3B
+BattleFrontier_Lounge3_EventScript_Bet10::
 	setvar VAR_0x8008, BET_AMOUNT_10
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_Bet15:: @ 8261E46
+BattleFrontier_Lounge3_EventScript_Bet15::
 	setvar VAR_0x8008, BET_AMOUNT_15
 	goto BattleFrontier_Lounge3_EventScript_TryPlaceBet
 	end
 
-BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
+BattleFrontier_Lounge3_EventScript_TryPlaceBet::
 	specialvar VAR_TEMP_1, GetFrontierBattlePoints
 	compare VAR_TEMP_1, VAR_0x8008
 	goto_if_ge BattleFrontier_Lounge3_EventScript_PlaceBet
@@ -69,7 +69,7 @@ BattleFrontier_Lounge3_EventScript_TryPlaceBet:: @ 8261E51
 	goto BattleFrontier_Lounge3_EventScript_ChooseBetAmount
 	end
 
-BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
+BattleFrontier_Lounge3_EventScript_PlaceBet::
 	copyvar VAR_0x8004, VAR_0x8008
 	special TakeFrontierBattlePoints
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
@@ -79,7 +79,7 @@ BattleFrontier_Lounge3_EventScript_PlaceBet:: @ 8261E75
 	goto BattleFrontier_Lounge3_EventScript_FinishBet
 	end
 
-BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
+BattleFrontier_Lounge3_EventScript_FinishBet::
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
@@ -87,7 +87,7 @@ BattleFrontier_Lounge3_EventScript_FinishBet:: @ 8261E96
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
+BattleFrontier_Lounge3_EventScript_CountSilverSymbols::
 	setvar VAR_0x8004, 0
 	call_if_set FLAG_SYS_TOWER_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	call_if_set FLAG_SYS_DOME_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
@@ -98,23 +98,23 @@ BattleFrontier_Lounge3_EventScript_CountSilverSymbols:: @ 8261EA0
 	call_if_set FLAG_SYS_PYRAMID_SILVER, BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount
 	return
 
-BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount:: @ 8261EE5
+BattleFrontier_Lounge3_EventScript_AddSilverSymbolCount::
 	addvar VAR_0x8004, 1
 	return
 
-BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols:: @ 8261EEB
+BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols::
 	msgbox BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_AlreadyMetGambler:: @ 8261EF9
+BattleFrontier_Lounge3_EventScript_AlreadyMetGambler::
 	msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_ge BattleFrontier_Lounge3_EventScript_CheckBetResults
 	goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
+BattleFrontier_Lounge3_EventScript_CheckBetResults::
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET
 	goto_if_eq BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted
 	compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
@@ -122,7 +122,7 @@ BattleFrontier_Lounge3_EventScript_CheckBetResults:: @ 8261F12
 	goto BattleFrontier_Lounge3_EventScript_LostChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
+BattleFrontier_Lounge3_EventScript_WonChallenge::
 	msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT
 	compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5
 	call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet5
@@ -137,82 +137,82 @@ BattleFrontier_Lounge3_EventScript_WonChallenge:: @ 8261F2E
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_LostChallenge:: @ 8261F71
+BattleFrontier_Lounge3_EventScript_LostChallenge::
 	msgbox BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints, MSGBOX_DEFAULT
 	setvar VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WAITING
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_RewardBet5:: @ 8261F80
+BattleFrontier_Lounge3_EventScript_RewardBet5::
 	buffernumberstring 0, (BET_AMOUNT_5 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_5 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_RewardBet10:: @ 8261F8A
+BattleFrontier_Lounge3_EventScript_RewardBet10::
 	buffernumberstring 0, (BET_AMOUNT_10 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_10 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_RewardBet15:: @ 8261F94
+BattleFrontier_Lounge3_EventScript_RewardBet15::
 	buffernumberstring 0, (BET_AMOUNT_15 * 2)
 	setvar VAR_0x8004, (BET_AMOUNT_15 * 2)
 	return
 
-BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted:: @ 8261F9E
+BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted::
 	special ShowFrontierGamblerGoMessage
 	waitmessage
 	waitbuttonpress
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_DeclineChallenge:: @ 8261FA5
+BattleFrontier_Lounge3_EventScript_DeclineChallenge::
 	msgbox BattleFrontier_Lounge3_Text_NotInterested, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge3_EventScript_CancelBet:: @ 8261FAF
+BattleFrontier_Lounge3_EventScript_CancelBet::
 	special CloseBattlePointsWindow
 	goto BattleFrontier_Lounge3_EventScript_DeclineChallenge
 	end
 
-BattleFrontier_Lounge3_EventScript_Man:: @ 8261FB8
+BattleFrontier_Lounge3_EventScript_Man::
 	msgbox BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge3_EventScript_Woman:: @ 8261FC1
+BattleFrontier_Lounge3_EventScript_Woman::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_BackedWrongTrainer, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_PokefanF:: @ 8261FD1
+BattleFrontier_Lounge3_EventScript_PokefanF::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_FatMan:: @ 8261FE1
+BattleFrontier_Lounge3_EventScript_FatMan::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge3_Text_TrainerGoodButRattled, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge3_EventScript_FaceOriginalDirection
 	end
 
-BattleFrontier_Lounge3_EventScript_FaceOriginalDirection:: @ 8261FF1
+BattleFrontier_Lounge3_EventScript_FaceOriginalDirection::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere:: @ 8261FFE
+BattleFrontier_Lounge3_Text_CantYouSeeWereBusyHere::
 	.string "…What's that you want?\p"
 	.string "Can't you see we're kind of busy here?\n"
 	.string "Can't your business wait till later?$"
 
-BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
+BattleFrontier_Lounge3_Text_YouLookToughExplainGambling::
 	.string "…Huh?\n"
 	.string "You look to me like a tough TRAINER.\p"
 	.string "Heheh…\n"
@@ -232,201 +232,201 @@ BattleFrontier_Lounge3_Text_YouLookToughExplainGambling:: @ 8262061
 	.string "Sounds simple, huh?\n"
 	.string "So, anyway…$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle:: @ 8262261
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's SINGLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble:: @ 826230D
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's DOUBLE BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti:: @ 82623B9
+BattleFrontier_Lounge3_Text_ChallengeBattleTowerMulti::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "TOWER's MULTI BATTLE ROOMS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle:: @ 8262464
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's SINGLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble:: @ 826250E
+BattleFrontier_Lounge3_Text_ChallengeBattleDomeDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "DOME's DOUBLE BATTLE Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle:: @ 82625B8
+BattleFrontier_Lounge3_Text_ChallengeBattleFactorySingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Single Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble:: @ 826266A
+BattleFrontier_Lounge3_Text_ChallengeBattleFactoryDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "FACTORY's Battle Swap Double Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle:: @ 826271C
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceSingle::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's SINGLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble:: @ 82627C9
+BattleFrontier_Lounge3_Text_ChallengeBattlePalaceDouble::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be challenging the BATTLE\l"
 	.string "PALACE's DOUBLE BATTLE HALLS.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattleArena:: @ 8262876
+BattleFrontier_Lounge3_Text_ChallengeBattleArena::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "ARENA's Set KO Tourney.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePike:: @ 826291A
+BattleFrontier_Lounge3_Text_ChallengeBattlePike::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE PIKE's\l"
 	.string "Battle Choice.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_ChallengeBattlePyramid:: @ 82629BC
+BattleFrontier_Lounge3_Text_ChallengeBattlePyramid::
 	.string "What I'm looking for is a TRAINER who's\n"
 	.string "going to be entering the BATTLE\l"
 	.string "PYRAMID's Battle Quest.\p"
 	.string "But so far, I haven't seen a TRAINER\n"
 	.string "that has that winning quality.$"
 
-BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe:: @ 8262A60
+BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe::
 	.string "I'll see to it that you benefit, too.\n"
 	.string "So how about it?\l"
 	.string "How about entering that event for me?$"
 
-BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints:: @ 8262ABD
+BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints::
 	.string "All right, that's perfect.\n"
 	.string "So, uh… How about spotting me some\l"
 	.string "of your Battle Points?\p"
 	.string "Trust me, I'll show you my gratitude\n"
 	.string "afterward.$"
 
-BattleFrontier_Lounge3_Text_HowMuchCanYouSpot:: @ 8262B42
+BattleFrontier_Lounge3_Text_HowMuchCanYouSpot::
 	.string "Great, great!\n"
 	.string "So, how much can you spot me?$"
 
-BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints:: @ 8262B6E
+BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints::
 	.string "Oh, no, no, no!\n"
 	.string "You don't have enough Battle Points!\p"
 	.string "I wish you wouldn't monkey around and\n"
 	.string "waste everyone's time!$"
 
-BattleFrontier_Lounge3_Text_ThanksOffYouGo:: @ 8262BE0
+BattleFrontier_Lounge3_Text_ThanksOffYouGo::
 	.string "Heheh! Thanks much!\n"
 	.string "So, off you go!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerSingle:: @ 8262C04
+BattleFrontier_Lounge3_Text_GetToBattleTowerSingle::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "SINGLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerDouble:: @ 8262C90
+BattleFrontier_Lounge3_Text_GetToBattleTowerDouble::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "DOUBLE BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleTowerMulti:: @ 8262D1C
+BattleFrontier_Lounge3_Text_GetToBattleTowerMulti::
 	.string "Get to the BATTLE TOWER's\n"
 	.string "MULTI BATTLE ROOMS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleDomeSingle:: @ 8262DA7
+BattleFrontier_Lounge3_Text_GetToBattleDomeSingle::
 	.string "Get to the BATTLE DOME's\n"
 	.string "SINGLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleDomeDouble:: @ 8262E34
+BattleFrontier_Lounge3_Text_GetToBattleDomeDouble::
 	.string "Get to the BATTLE DOME's\n"
 	.string "DOUBLE BATTLE Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleFactorySingle:: @ 8262EC1
+BattleFrontier_Lounge3_Text_GetToBattleFactorySingle::
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Single Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble:: @ 8262F56
+BattleFrontier_Lounge3_Text_GetToBattleFactoryDouble::
 	.string "Get to the BATTLE FACTORY's\n"
 	.string "Battle Swap Double Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle:: @ 8262FEB
+BattleFrontier_Lounge3_Text_GetToBattlePalaceSingle::
 	.string "Get to the BATTLE PALACE's\n"
 	.string "SINGLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble:: @ 8263078
+BattleFrontier_Lounge3_Text_GetToBattlePalaceDouble::
 	.string "Get to the BATTLE PALACE's\n"
 	.string "DOUBLE BATTLE HALLS pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattleArena:: @ 8263105
+BattleFrontier_Lounge3_Text_GetToBattleArena::
 	.string "Get to the BATTLE ARENA's\n"
 	.string "Set KO Tourney pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePike:: @ 826318C
+BattleFrontier_Lounge3_Text_GetToBattlePike::
 	.string "Get to the BATTLE PIKE's\n"
 	.string "Battle Choice pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_GetToBattlePyramid:: @ 8263211
+BattleFrontier_Lounge3_Text_GetToBattlePyramid::
 	.string "Get to the BATTLE PYRAMID's\n"
 	.string "Battle Quest pronto!\p"
 	.string "It's a must-win situation!\n"
 	.string "Don't blow your chance!\l"
 	.string "Both of our futures depend on you!$"
 
-BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
+BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints::
 	.string "Oh, it's you…\n"
 	.string "Nice try…\p"
 	.string "I hate to break it to you, but I can't\n"
@@ -434,7 +434,7 @@ BattleFrontier_Lounge3_Text_NiceTryCantReturnPoints:: @ 8263298
 	.string "I guess we'll have to let it motivate\n"
 	.string "us to try harder next time!$"
 
-BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
+BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints::
 	.string "Oh, yes!\n"
 	.string "Hello there, champ!\p"
 	.string "I knew you could!\n"
@@ -443,36 +443,36 @@ BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints:: @ 8263334
 	.string "I'll return your Battle Points and,\n"
 	.string "of course, a little extra from me!$"
 
-BattleFrontier_Lounge3_Text_ObtainedBattlePoints:: @ 82633D4
+BattleFrontier_Lounge3_Text_ObtainedBattlePoints::
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Points.$"
 
-BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge:: @ 82633F2
+BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge::
 	.string "If you're up for another challenge,\n"
 	.string "please do think of me!$"
 
-BattleFrontier_Lounge3_Text_NotInterested:: @ 826342D
+BattleFrontier_Lounge3_Text_NotInterested::
 	.string "Not interested?! You shouldn't be\n"
 	.string "so afraid to take a chance!$"
 
-BattleFrontier_Lounge3_Text_Oh:: @ 826346B
+BattleFrontier_Lounge3_Text_Oh::
 	.string "Oh…$"
 
-BattleFrontier_Lounge3_Text_BackedWrongTrainer:: @ 826346F
+BattleFrontier_Lounge3_Text_BackedWrongTrainer::
 	.string "I backed the wrong TRAINER again!\p"
 	.string "Maybe I should be battling normally\n"
 	.string "like everyone else…$"
 
-BattleFrontier_Lounge3_Text_TrainerGoodButRattled:: @ 82634C9
+BattleFrontier_Lounge3_Text_TrainerGoodButRattled::
 	.string "That TRAINER…\p"
 	.string "He's good, but he gets rattled too\n"
 	.string "easily to survive the BATTLE DOME…$"
 
-BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne:: @ 826351D
+BattleFrontier_Lounge3_Text_KnowWinnerWhenISeeOne::
 	.string "Giggle!\n"
 	.string "I know a winner when I see one!$"
 
-BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges:: @ 8263545
+BattleFrontier_Lounge3_Text_ShouldBeTakingChallenges::
 	.string "Those TRAINERS…\n"
 	.string "What are they doing?\l"
 	.string "They should be taking challenges.$"

data/maps/BattleFrontier_Lounge4/scripts.inc

@@ -1,27 +1,27 @@
-BattleFrontier_Lounge4_MapScripts:: @ 826358C
+BattleFrontier_Lounge4_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge4_EventScript_Woman:: @ 826358D
+BattleFrontier_Lounge4_EventScript_Woman::
 	msgbox BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_Cook:: @ 8263596
+BattleFrontier_Lounge4_EventScript_Cook::
 	msgbox BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_EventScript_Man:: @ 826359F
+BattleFrontier_Lounge4_EventScript_Man::
 	msgbox BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring: @ 82635A8
+BattleFrontier_Lounge4_Text_WonderIfInterviewsAiring:
 	.string "I wonder if they'll be airing interviews\n"
 	.string "with tough TRAINERS today?$"
 
-BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere: @ 82635EC
+BattleFrontier_Lounge4_Text_IfIOpenedRestaurantHere:
 	.string "If I opened a restaurant here,\n"
 	.string "it'd make money for sure.$"
 
-BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles: @ 8263625
+BattleFrontier_Lounge4_Text_NeedBreatherAfterBattles:
 	.string "Whew…\p"
 	.string "I need to take a breather after\n"
 	.string "some intense battles…\p"

data/maps/BattleFrontier_Lounge5/scripts.inc

@@ -1,7 +1,7 @@
-BattleFrontier_Lounge5_MapScripts:: @ 82645C5
+BattleFrontier_Lounge5_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
+BattleFrontier_Lounge5_EventScript_NatureGirl::
 	lock
 	faceplayer
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
@@ -22,184 +22,184 @@ BattleFrontier_Lounge5_EventScript_NatureGirl:: @ 82645C6
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_NatureGirlEgg:: @ 8264603
+BattleFrontier_Lounge5_EventScript_NatureGirlEgg::
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlEgg, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown:: @ 826460D
+BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown::
 	msgbox BattleFrontier_Lounge5_Text_NatureGirlNoneShown, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge5_EventScript_Gentleman:: @ 8264617
+BattleFrontier_Lounge5_EventScript_Gentleman::
 	msgbox BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_BlackBelt:: @ 8264620
+BattleFrontier_Lounge5_EventScript_BlackBelt::
 	msgbox BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_EventScript_LittleBoy:: @ 8264629
+BattleFrontier_Lounge5_EventScript_LittleBoy::
 	msgbox BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge5_Text_NatureGirlGreeting:: @ 8264632
+BattleFrontier_Lounge5_Text_NatureGirlGreeting::
 	.string "Ehehe!\n"
 	.string "I can tell what POKéMON are thinking!\p"
 	.string "Please!\n"
 	.string "Can I see your POKéMON?$"
 
-BattleFrontier_Lounge5_Text_NatureGirlNoneShown:: @ 826467F
+BattleFrontier_Lounge5_Text_NatureGirlNoneShown::
 	.string "Boo!\n"
 	.string "Cheapie!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlHardy:: @ 826468D
+BattleFrontier_Lounge5_Text_NatureGirlHardy::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlLonely:: @ 82646E5
+BattleFrontier_Lounge5_Text_NatureGirlLonely::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBrave:: @ 8264741
+BattleFrontier_Lounge5_Text_NatureGirlBrave::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlAdamant:: @ 82647A4
+BattleFrontier_Lounge5_Text_NatureGirlAdamant::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlNaughty:: @ 82647FC
+BattleFrontier_Lounge5_Text_NatureGirlNaughty::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBold:: @ 8264858
+BattleFrontier_Lounge5_Text_NatureGirlBold::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky:: @ 82648BE
+BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlRelaxed:: @ 8264916
+BattleFrontier_Lounge5_Text_NatureGirlRelaxed::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlImpish:: @ 8264972
+BattleFrontier_Lounge5_Text_NatureGirlImpish::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlLax:: @ 82649D5
+BattleFrontier_Lounge5_Text_NatureGirlLax::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlTimid:: @ 8264A3F
+BattleFrontier_Lounge5_Text_NatureGirlTimid::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlHasty:: @ 8264A9B
+BattleFrontier_Lounge5_Text_NatureGirlHasty::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "It will battle even if it has a lot\l"
 	.string "of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlSerious:: @ 8264AF3
+BattleFrontier_Lounge5_Text_NatureGirlSerious::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlJolly:: @ 8264B5D
+BattleFrontier_Lounge5_Text_NatureGirlJolly::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will worry about itself!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlModest:: @ 8264BC3
+BattleFrontier_Lounge5_Text_NatureGirlModest::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself whether\l"
 	.string "or not it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlMild:: @ 8264C36
+BattleFrontier_Lounge5_Text_NatureGirlMild::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlBashful:: @ 8264C95
+BattleFrontier_Lounge5_Text_NatureGirlBashful::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlRash:: @ 8264D01
+BattleFrontier_Lounge5_Text_NatureGirlRash::
 	.string "Hmhm…\p"
 	.string "This one says it likes to be sneaky!\n"
 	.string "It says it likes to be sneaky even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlCalm:: @ 8264D6B
+BattleFrontier_Lounge5_Text_NatureGirlCalm::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "It says it worries about itself even\l"
 	.string "if it has a lot of ouchies!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlGentle:: @ 8264DD7
+BattleFrontier_Lounge5_Text_NatureGirlGentle::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will hit back!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlSassy:: @ 8264E33
+BattleFrontier_Lounge5_Text_NatureGirlSassy::
 	.string "Hmhm…\p"
 	.string "This one says it likes to battle!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlCareful:: @ 8264E8F
+BattleFrontier_Lounge5_Text_NatureGirlCareful::
 	.string "Hmhm…\p"
 	.string "This one says it looks after itself!\n"
 	.string "But if it gets enough ouchies,\l"
 	.string "it will turn sneaky!$"
 
-BattleFrontier_Lounge5_Text_NatureGirlEgg:: @ 8264EEE
+BattleFrontier_Lounge5_Text_NatureGirlEgg::
 	.string "That's silly! An EGG is asleep!\n"
 	.string "I can't talk to it!$"
 
-BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon:: @ 8264F22
+BattleFrontier_Lounge5_Text_LadyClaimsSheUnderstandsPokemon::
 	.string "How charming!\n"
 	.string "That little lady claims she can\l"
 	.string "understand POKéMON!$"
 
-BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound:: @ 8264F64
+BattleFrontier_Lounge5_Text_GirlSayingSomethingProfound::
 	.string "I have this feeling that the little girl\n"
 	.string "is saying something profound.$"
 
-BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot:: @ 8264FAB
+BattleFrontier_Lounge5_Text_GirlPlaysAtRedHouseALot::
 	.string "I know something!\p"
 	.string "That little girl plays at the red house\n"
 	.string "a lot!$"

data/maps/BattleFrontier_Lounge6/scripts.inc

@@ -1,7 +1,7 @@
-BattleFrontier_Lounge6_MapScripts:: @ 8264FEC
+BattleFrontier_Lounge6_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
+BattleFrontier_Lounge6_EventScript_Trader::
 	lock
 	faceplayer
 	goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_TradeCompleted
@@ -32,23 +32,23 @@ BattleFrontier_Lounge6_EventScript_Trader:: @ 8264FED
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_DeclineTrade:: @ 826506B
+BattleFrontier_Lounge6_EventScript_DeclineTrade::
 	msgbox BattleFrontier_Lounge6_Text_WellThatsFineToo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_NotRequestedMon:: @ 8265075
+BattleFrontier_Lounge6_EventScript_NotRequestedMon::
 	bufferspeciesname 0, VAR_0x8009
 	msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_EventScript_TradeCompleted:: @ 8265083
+BattleFrontier_Lounge6_EventScript_TradeCompleted::
 	msgbox BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
+BattleFrontier_Lounge6_Text_WouldYouLikeToTrade:
 	.string "My POKéMON is a {STR_VAR_2}.\n"
 	.string "Do you know it?\l"
 	.string "It's quite cute and rather nice.\p"
@@ -57,24 +57,24 @@ BattleFrontier_Lounge6_Text_WouldYouLikeToTrade: @ 826508D
 	.string "Would you like to trade me a {STR_VAR_1}\n"
 	.string "for my {STR_VAR_2}?$"
 
-BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt: @ 8265128
+BattleFrontier_Lounge6_Text_PromiseIllBeGoodToIt:
 	.string "Oh, it's adorable!\n"
 	.string "Thank you!\l"
 	.string "I promise I'll be good to it!\p"
 	.string "Oh! I hope you'll be good to\n"
 	.string "my {STR_VAR_2}, too!$"
 
-BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon: @ 826518D
+BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon:
 	.string "Oh, I'm sorry!\n"
 	.string "I don't intend to trade for anything\l"
 	.string "but a {STR_VAR_1}.$"
 
-BattleFrontier_Lounge6_Text_WellThatsFineToo: @ 82651CB
+BattleFrontier_Lounge6_Text_WellThatsFineToo:
 	.string "Oh, you won't?\n"
 	.string "Well, that's fine, too.\l"
 	.string "Please come visit us again.$"
 
-BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined: @ 826520E
+BattleFrontier_Lounge6_Text_SkittySoMuchCuterThanImagined:
 	.string "Giggle!\n"
 	.string "A SKITTY is so much cuter than I had\l"
 	.string "imagined. I'm delighted!$"

data/maps/BattleFrontier_Lounge7/scripts.inc

@@ -1,7 +1,7 @@
-BattleFrontier_Lounge7_MapScripts:: @ 8265254
+BattleFrontier_Lounge7_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
+BattleFrontier_Lounge7_EventScript_LeftMoveTutor::
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_1
@@ -11,12 +11,12 @@ BattleFrontier_Lounge7_EventScript_LeftMoveTutor:: @ 8265255
 	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor:: @ 8265276
+BattleFrontier_Lounge7_EventScript_AlreadyMetLeftTutor::
 	msgbox BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
+BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
@@ -41,7 +41,7 @@ BattleFrontier_Lounge7_EventScript_ChooseLeftTutorMove:: @ 8265284
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
+BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 0
@@ -65,57 +65,57 @@ BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove:: @ 826532F
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_Softboiled:: @ 82653D7
+BattleFrontier_Lounge7_EventScript_Softboiled::
 	setvar VAR_0x8008, 16
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_SeismicToss:: @ 82653E2
+BattleFrontier_Lounge7_EventScript_SeismicToss::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_DreamEater:: @ 82653ED
+BattleFrontier_Lounge7_EventScript_DreamEater::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MegaPunch:: @ 82653F8
+BattleFrontier_Lounge7_EventScript_MegaPunch::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MegaKick:: @ 8265403
+BattleFrontier_Lounge7_EventScript_MegaKick::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_BodySlam:: @ 826540E
+BattleFrontier_Lounge7_EventScript_BodySlam::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_RockSlide:: @ 8265419
+BattleFrontier_Lounge7_EventScript_RockSlide::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Counter:: @ 8265424
+BattleFrontier_Lounge7_EventScript_Counter::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ThunderWave:: @ 826542F
+BattleFrontier_Lounge7_EventScript_ThunderWave::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_SwordsDance:: @ 826543A
+BattleFrontier_Lounge7_EventScript_SwordsDance::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
+BattleFrontier_Lounge7_EventScript_RightMoveTutor::
 	lock
 	faceplayer
 	setvar VAR_TEMP_C, SCROLL_MULTI_BF_MOVE_TUTOR_2
@@ -125,12 +125,12 @@ BattleFrontier_Lounge7_EventScript_RightMoveTutor:: @ 8265445
 	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor:: @ 8265466
+BattleFrontier_Lounge7_EventScript_AlreadyMetRightTutor::
 	msgbox BattleFrontier_Lounge7_Text_RightTutorWelcomeBack, MSGBOX_DEFAULT
 	goto BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
+BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	special ShowBattlePointsWindow
@@ -155,7 +155,7 @@ BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove:: @ 8265474
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
+BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove::
 	message BattleFrontier_Lounge7_Text_TeachWhichMove
 	waitmessage
 	setvar VAR_TEMP_E, 1
@@ -179,64 +179,64 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove:: @ 826551F
 	case MULTI_B_PRESSED, BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect
 	end
 
-BattleFrontier_Lounge7_EventScript_DefenseCurl:: @ 82655C7
+BattleFrontier_Lounge7_EventScript_DefenseCurl::
 	setvar VAR_0x8008, 16
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Snore:: @ 82655D2
+BattleFrontier_Lounge7_EventScript_Snore::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_MudSlap:: @ 82655DD
+BattleFrontier_Lounge7_EventScript_MudSlap::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Swift:: @ 82655E8
+BattleFrontier_Lounge7_EventScript_Swift::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_IcyWind:: @ 82655F3
+BattleFrontier_Lounge7_EventScript_IcyWind::
 	setvar VAR_0x8008, 24
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_Endure:: @ 82655FE
+BattleFrontier_Lounge7_EventScript_Endure::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_PsychUp:: @ 8265609
+BattleFrontier_Lounge7_EventScript_PsychUp::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_IcePunch:: @ 8265614
+BattleFrontier_Lounge7_EventScript_IcePunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ThunderPunch:: @ 826561F
+BattleFrontier_Lounge7_EventScript_ThunderPunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_FirePunch:: @ 826562A
+BattleFrontier_Lounge7_EventScript_FirePunch::
 	setvar VAR_0x8008, 48
 	goto BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection
 	end
 
-BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect:: @ 8265635
+BattleFrontier_Lounge7_EventScript_ExitTutorMoveSelect::
 	special CloseBattleFrontierTutorWindow
 	special CloseBattlePointsWindow
 	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
+BattleFrontier_Lounge7_EventScript_CancelChooseMon::
 	msgbox BattleFrontier_Lounge7_Text_YouDontWantTo, MSGBOX_DEFAULT
 	release
 	end
@@ -245,7 +245,7 @@ BattleFrontier_Lounge7_EventScript_CancelChooseMon:: @ 8265645
 @ VAR_TEMP_C is the scroll multichoice ID
 @ VAR_TEMP_D is the move selection
 @ VAR_TEMP_E is which move tutor was spoken to
-BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
+BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection::
 	copyvar VAR_0x8004, VAR_TEMP_D
 	copyvar VAR_0x8005, VAR_TEMP_E
 	special BufferBattleFrontierTutorMoveName
@@ -261,7 +261,7 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection:: @ 826564F
 	goto BattleFrontier_Lounge7_EventScript_ChooseNewMove
 	end
 
-BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
+BattleFrontier_Lounge7_EventScript_TeachTutorMove::
 	msgbox BattleFrontier_Lounge7_Text_TeachMoveToWhichMon, MSGBOX_DEFAULT
 	special GetBattleFrontierTutorMoveIndex
 	fadescreen FADE_TO_BLACK
@@ -277,21 +277,21 @@ BattleFrontier_Lounge7_EventScript_TeachTutorMove:: @ 8265696
 	release
 	end
 
-BattleFrontier_Lounge7_EventScript_ChooseNewMove:: @ 82656CA
+BattleFrontier_Lounge7_EventScript_ChooseNewMove::
 	compare VAR_TEMP_E, 0
 	goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
 	goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove
 	end
 
-BattleFrontier_Lounge7_EventScript_Sailor:: @ 82656DB
+BattleFrontier_Lounge7_EventScript_Sailor::
 	msgbox BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_EventScript_Gentleman:: @ 82656E4
+BattleFrontier_Lounge7_EventScript_Gentleman::
 	msgbox BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
+BattleFrontier_Lounge7_Text_LeftTutorIntro:
 	.string "Buhahaha!\p"
 	.string "You couldn't tell it from looking now,\n"
 	.string "but I used to be one tough TRAINER.\p"
@@ -309,38 +309,38 @@ BattleFrontier_Lounge7_Text_LeftTutorIntro: @ 82656ED
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack: @ 82658AB
+BattleFrontier_Lounge7_Text_LeftTutorWelcomeBack:
 	.string "Buhahaha!\p"
 	.string "Are you back to learn special and\n"
 	.string "yet cute POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_TeachWhichMove: @ 82658EF
+BattleFrontier_Lounge7_Text_TeachWhichMove:
 	.string "Fine, fine, look here!\n"
 	.string "Which move should I teach?$"
 
-BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints: @ 8265921
+BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints:
 	.string "The move {STR_VAR_1}, is it?\n"
 	.string "That will be {STR_VAR_2} Battle Points, okay?$"
 
-BattleFrontier_Lounge7_Text_TeachMoveToWhichMon: @ 826595A
+BattleFrontier_Lounge7_Text_TeachMoveToWhichMon:
 	.string "Fine, fine, now pick the POKéMON\n"
 	.string "I should teach the move to.$"
 
-BattleFrontier_Lounge7_Text_HaventGotEnoughPoints: @ 8265997
+BattleFrontier_Lounge7_Text_HaventGotEnoughPoints:
 	.string "What the…\n"
 	.string "You haven't got enough Battle Points!$"
 
-BattleFrontier_Lounge7_Text_IllTakeBattlePoints: @ 82659C7
+BattleFrontier_Lounge7_Text_IllTakeBattlePoints:
 	.string "Do you see how skilled I am now?\n"
 	.string "I'll take your Battle Points, thanks!$"
 
-BattleFrontier_Lounge7_Text_YouDontWantTo: @ 8265A0E
+BattleFrontier_Lounge7_Text_YouDontWantTo:
 	.string "What's that?\n"
 	.string "You don't want to…\p"
 	.string "If you want to see how skilled I am,\n"
 	.string "you come see me anytime!$"
 
-BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
+BattleFrontier_Lounge7_Text_RightTutorIntro:
 	.string "Ihihihi!\p"
 	.string "I know it's hard to see now, but I used\n"
 	.string "to be one fantastic TRAINER.\p"
@@ -358,19 +358,19 @@ BattleFrontier_Lounge7_Text_RightTutorIntro: @ 8265A6C
 	.string "How about paying for the moves I teach\l"
 	.string "with a wee bit of Battle Points?$"
 
-BattleFrontier_Lounge7_Text_RightTutorWelcomeBack: @ 8265C2C
+BattleFrontier_Lounge7_Text_RightTutorWelcomeBack:
 	.string "Ihihihi!\p"
 	.string "Have you come to learn hard and\n"
 	.string "yet pretty POKéMON moves?$"
 
-BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong: @ 8265C6F
+BattleFrontier_Lounge7_Text_ThinkLadiesDontGetAlong:
 	.string "Those ladies, the way they bad-mouth\n"
 	.string "each other, you probably think that\l"
 	.string "they don't get along.\p"
 	.string "But if that were true, they wouldn't\n"
 	.string "stay out here together, would they?$"
 
-BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
+BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful:
 	.string "When I was just a wee YOUNGSTER,\n"
 	.string "those ladies were strong and beautiful.\p"
 	.string "They were idols among us TRAINERS.\p"
@@ -382,102 +382,102 @@ BattleFrontier_Lounge7_Text_LadiesWereStrongAndBeautiful: @ 8265D17
 	.string "but feel this…\p"
 	.string "Time is so cruel…$"
 
-BattleFrontier_Lounge7_Text_SoftboiledDesc:: @ 8265E30
+BattleFrontier_Lounge7_Text_SoftboiledDesc::
 	.string "Recovers up to\n"
 	.string "half the user's\n"
 	.string "maximum HP.$"
 
-BattleFrontier_Lounge7_Text_SeismicTossDesc:: @ 8265E5B
+BattleFrontier_Lounge7_Text_SeismicTossDesc::
 	.string "Inflicts damage\n"
 	.string "identical to the\n"
 	.string "user's level.$"
 
-BattleFrontier_Lounge7_Text_DreamEaterDesc:: @ 8265E8A
+BattleFrontier_Lounge7_Text_DreamEaterDesc::
 	.string "Recovers half the\n"
 	.string "damage inflicted\n"
 	.string "on a sleeping foe.$"
 
-BattleFrontier_Lounge7_Text_MegaPunchDesc:: @ 8265EC0
+BattleFrontier_Lounge7_Text_MegaPunchDesc::
 	.string "A strong punch\n"
 	.string "thrown with\n"
 	.string "incredible power.$"
 
-BattleFrontier_Lounge7_Text_MegaKickDesc:: @ 8265EED
+BattleFrontier_Lounge7_Text_MegaKickDesc::
 	.string "An extremely\n"
 	.string "powerful kick with\n"
 	.string "intense force.$"
 
-BattleFrontier_Lounge7_Text_BodySlamDesc:: @ 8265F1C
+BattleFrontier_Lounge7_Text_BodySlamDesc::
 	.string "A full-body slam\n"
 	.string "that may cause\n"
 	.string "paralysis.$"
 
-BattleFrontier_Lounge7_Text_RockSlideDesc:: @ 8265F47
+BattleFrontier_Lounge7_Text_RockSlideDesc::
 	.string "Large boulders\n"
 	.string "are hurled. May\n"
 	.string "cause flinching.$"
 
-BattleFrontier_Lounge7_Text_CounterDesc:: @ 8265F77
+BattleFrontier_Lounge7_Text_CounterDesc::
 	.string "Retaliates any\n"
 	.string "physical hit with\n"
 	.string "double the power.$"
 
-BattleFrontier_Lounge7_Text_ThunderWaveDesc:: @ 8265FAA
+BattleFrontier_Lounge7_Text_ThunderWaveDesc::
 	.string "A weak jolt of\n"
 	.string "electricity that\n"
 	.string "paralyzes the foe.$"
 
-BattleFrontier_Lounge7_Text_SwordsDanceDesc:: @ 8265FDD
+BattleFrontier_Lounge7_Text_SwordsDanceDesc::
 	.string "A fighting dance\n"
 	.string "that sharply\n"
 	.string "raises ATTACK.$"
 
-BattleFrontier_Lounge7_Text_DefenseCurlDesc:: @ 826600A
+BattleFrontier_Lounge7_Text_DefenseCurlDesc::
 	.string "Curls up to con-\n"
 	.string "ceal weak spots\n"
 	.string "and raise DEFENSE.$"
 
-BattleFrontier_Lounge7_Text_SnoreDesc:: @ 826603E
+BattleFrontier_Lounge7_Text_SnoreDesc::
 	.string "A loud attack\n"
 	.string "that can be used\n"
 	.string "only while asleep.$"
 
-BattleFrontier_Lounge7_Text_MudSlapDesc:: @ 8266070
+BattleFrontier_Lounge7_Text_MudSlapDesc::
 	.string "Hurls mud in the\n"
 	.string "foe's face to re-\n"
 	.string "duce its accuracy.$"
 
-BattleFrontier_Lounge7_Text_SwiftDesc:: @ 82660A6
+BattleFrontier_Lounge7_Text_SwiftDesc::
 	.string "Sprays star-\n"
 	.string "shaped rays\n"
 	.string "that never miss.$"
 
-BattleFrontier_Lounge7_Text_IcyWindDesc:: @ 82660D0
+BattleFrontier_Lounge7_Text_IcyWindDesc::
 	.string "A chilling attack\n"
 	.string "that lowers the\n"
 	.string "foe's SPEED.$"
 
-BattleFrontier_Lounge7_Text_EndureDesc:: @ 82660FF
+BattleFrontier_Lounge7_Text_EndureDesc::
 	.string "Endures any at-\n"
 	.string "tack for 1 turn,\n"
 	.string "leaving 1HP.$"
 
-BattleFrontier_Lounge7_Text_PsychUpDesc:: @ 826612D
+BattleFrontier_Lounge7_Text_PsychUpDesc::
 	.string "Copies the foe's\n"
 	.string "effect(s) and\n"
 	.string "gives to the user.$"
 
-BattleFrontier_Lounge7_Text_IcePunchDesc:: @ 826615F
+BattleFrontier_Lounge7_Text_IcePunchDesc::
 	.string "An icy punch\n"
 	.string "that may\n"
 	.string "freeze the foe.$"
 
-BattleFrontier_Lounge7_Text_ThunderPunchDesc:: @ 8266185
+BattleFrontier_Lounge7_Text_ThunderPunchDesc::
 	.string "An electrified\n"
 	.string "punch that may\n"
 	.string "paralyze the foe.$"
 
-BattleFrontier_Lounge7_Text_FirePunchDesc:: @ 82661B5
+BattleFrontier_Lounge7_Text_FirePunchDesc::
 	.string "A fiery punch\n"
 	.string "that may burn\n"
 	.string "the foe.$"

data/maps/BattleFrontier_Lounge8/scripts.inc

@@ -1,19 +1,19 @@
-BattleFrontier_Lounge8_MapScripts:: @ 82676C9
+BattleFrontier_Lounge8_MapScripts::
 	.byte 0
 
-BattleFrontier_Lounge8_EventScript_Man:: @ 82676CA
+BattleFrontier_Lounge8_EventScript_Man::
 	msgbox BattleFrontier_Lounge8_Text_WhatATrainerNeeds, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_Woman:: @ 82676D3
+BattleFrontier_Lounge8_EventScript_Woman::
 	msgbox BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_EventScript_NinjaBoy:: @ 82676DC
+BattleFrontier_Lounge8_EventScript_NinjaBoy::
 	msgbox BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling, MSGBOX_NPC
 	end
 
-BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
+BattleFrontier_Lounge8_Text_WhatATrainerNeeds:
 	.string "What a TRAINER needs…\p"
 	.string "Knowledge…\n"
 	.string "Strategy…\l"
@@ -27,14 +27,14 @@ BattleFrontier_Lounge8_Text_WhatATrainerNeeds: @ 82676E5
 	.string "Huh? POKéMON?\n"
 	.string "What's that?$"
 
-BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains: @ 826779C
+BattleFrontier_Lounge8_Text_KnowAboutFrontierBrains:
 	.string "Do you know about the FRONTIER\n"
 	.string "BRAINS?\p"
 	.string "That's what SCOTT calls the seven\n"
 	.string "special TRAINERS that run the seven\l"
 	.string "facilities in the BATTLE FRONTIER.$"
 
-BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling: @ 826782C
+BattleFrontier_Lounge8_Text_ToldMeIHaveTalentForBattling:
 	.string "At the BATTLE TOWER, an older girl\n"
 	.string "told me that I have a lot of talent\l"
 	.string "for battling!\p"

data/maps/BattleFrontier_Lounge9/scripts.inc

@@ -1,3 +1,3 @@
-BattleFrontier_Lounge9_MapScripts:: @ 82678F8
+BattleFrontier_Lounge9_MapScripts::
 	.byte 0
 

data/maps/BattleFrontier_Mart/scripts.inc

@@ -1,9 +1,9 @@
 .set LOCALID_OLD_WOMAN, 2
 
-BattleFrontier_Mart_MapScripts:: @ 8267ACB
+BattleFrontier_Mart_MapScripts::
 	.byte 0
 
-BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
+BattleFrontier_Mart_EventScript_Clerk::
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -14,7 +14,7 @@ BattleFrontier_Mart_EventScript_Clerk:: @ 8267ACC
 	end
 
 	.align 2
-BattleFrontier_Mart_Pokemart: @ 8267AE4
+BattleFrontier_Mart_Pokemart:
 	.2byte ITEM_ULTRA_BALL
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
@@ -32,11 +32,11 @@ BattleFrontier_Mart_Pokemart: @ 8267AE4
 	release
 	end
 
-BattleFrontier_Mart_EventScript_OldMan:: @ 8267B02
+BattleFrontier_Mart_EventScript_OldMan::
 	msgbox BattleFrontier_Mart_Text_ChaperonGrandson, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
+BattleFrontier_Mart_EventScript_OldWoman::
 	lock
 	applymovement LOCALID_OLD_WOMAN, Common_Movement_FaceDown
 	waitmovement 0
@@ -44,23 +44,23 @@ BattleFrontier_Mart_EventScript_OldWoman:: @ 8267B0B
 	release
 	end
 
-BattleFrontier_Mart_EventScript_Boy:: @ 8267B20
+BattleFrontier_Mart_EventScript_Boy::
 	msgbox BattleFrontier_Mart_Text_FacilitiesDontAllowItems, MSGBOX_NPC
 	end
 
-BattleFrontier_Mart_Text_ChaperonGrandson: @ 8267B29
+BattleFrontier_Mart_Text_ChaperonGrandson:
 	.string "We came here to chaperon our\n"
 	.string "grandson.\p"
 	.string "But since we're here, we thought\n"
 	.string "we should get some souvenirs.$"
 
-BattleFrontier_Mart_Text_ProteinMakeNiceGift: @ 8267B8F
+BattleFrontier_Mart_Text_ProteinMakeNiceGift:
 	.string "Dear, what do you think of this?\n"
 	.string "Wouldn't this make a nice gift?\p"
 	.string "It's…PRO…TE…IN?\n"
 	.string "It sounds delicious, doesn't it?$"
 
-BattleFrontier_Mart_Text_FacilitiesDontAllowItems: @ 8267C01
+BattleFrontier_Mart_Text_FacilitiesDontAllowItems:
 	.string "A lot of the BATTLE FRONTIER's\n"
 	.string "facilities don't allow the use of items\l"
 	.string "during battles.\p"

data/maps/BattleFrontier_OutsideEast/scripts.inc

@@ -1,74 +1,74 @@
 .set LOCALID_SUDOWOODO, 14
 
-BattleFrontier_OutsideEast_MapScripts:: @ 8242C04
+BattleFrontier_OutsideEast_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, BattleFrontier_OutsideEast_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideEast_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideEast_OnResume: @ 8242C0F
+BattleFrontier_OutsideEast_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo:: @ 8242C19
+BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-BattleFrontier_OutsideEast_OnTransition: @ 8242C2D
+BattleFrontier_OutsideEast_OnTransition:
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_ShowSudowoodo
 	end
 
-BattleFrontier_OutsideEast_EventScript_ShowSudowoodo:: @ 8242C3F
+BattleFrontier_OutsideEast_EventScript_ShowSudowoodo::
 	clearflag FLAG_HIDE_BATTLE_FRONTIER_SUDOWOODO
 	return
 
-BattleFrontier_OutsideEast_EventScript_BattleTowerSign:: @ 8242C43
+BattleFrontier_OutsideEast_EventScript_BattleTowerSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattleTowerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattlePalaceSign:: @ 8242C4C
+BattleFrontier_OutsideEast_EventScript_BattlePalaceSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattlePalaceSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattleArenaSign:: @ 8242C55
+BattleFrontier_OutsideEast_EventScript_BattleArenaSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattleArenaSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_BattlePyramidSign:: @ 8242C5E
+BattleFrontier_OutsideEast_EventScript_BattlePyramidSign::
 	msgbox BattleFrontier_OutsideEast_Text_BattlePyramidSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_NinjaBoy:: @ 8242C67
+BattleFrontier_OutsideEast_EventScript_NinjaBoy::
 	msgbox BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man1:: @ 8242C70
+BattleFrontier_OutsideEast_EventScript_Man1::
 	msgbox BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Hiker:: @ 8242C79
+BattleFrontier_OutsideEast_EventScript_Hiker::
 	msgbox BattleFrontier_OutsideEast_Text_PyramidTooHarsh, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_HexManiac:: @ 8242C82
+BattleFrontier_OutsideEast_EventScript_HexManiac::
 	msgbox BattleFrontier_OutsideEast_Text_ThriveInDarkness, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_BlackBelt1:: @ 8242C8B
+BattleFrontier_OutsideEast_EventScript_BlackBelt1::
 	msgbox BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Cook:: @ 8242C94
+BattleFrontier_OutsideEast_EventScript_Cook::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_BelieveInYouBuddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
+BattleFrontier_OutsideEast_EventScript_Zigzagoon::
 	lock
 	faceplayer
 	waitse
@@ -78,33 +78,33 @@ BattleFrontier_OutsideEast_EventScript_Zigzagoon:: @ 8242C9F
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RichBoy:: @ 8242CB2
+BattleFrontier_OutsideEast_EventScript_RichBoy::
 	msgbox BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_ExpertF:: @ 8242CBB
+BattleFrontier_OutsideEast_EventScript_ExpertF::
 	msgbox BattleFrontier_OutsideEast_Text_OnceBeatGymLeader, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_TriathleteF:: @ 8242CC4
+BattleFrontier_OutsideEast_EventScript_TriathleteF::
 	msgbox BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Twin:: @ 8242CCD
+BattleFrontier_OutsideEast_EventScript_Twin::
 	msgbox BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man2:: @ 8242CD6
+BattleFrontier_OutsideEast_EventScript_Man2::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_TriathleteM:: @ 8242CE1
+BattleFrontier_OutsideEast_EventScript_TriathleteM::
 	msgbox BattleFrontier_OutsideEast_Text_DidScottBringYouHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
+BattleFrontier_OutsideEast_EventScript_Sudowoodo::
 	lock
 	faceplayer
 	waitse
@@ -114,7 +114,7 @@ BattleFrontier_OutsideEast_EventScript_Sudowoodo:: @ 8242CEA
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
+BattleFrontier_OutsideEast_EventScript_WaterSudowoodo::
 	lock
 	faceplayer
 	special DoWateringBerryTreeAnim
@@ -145,12 +145,12 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo:: @ 8242CFC
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo:: @ 8242D60
+BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo::
 	setflag FLAG_DEFEATED_SUDOWOODO
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
+BattleFrontier_OutsideEast_Movement_SudowoodoShake:
 	face_right
 	delay_8
 	face_down
@@ -168,59 +168,59 @@ BattleFrontier_OutsideEast_Movement_SudowoodoShake: @ 8242D69
 	face_down
 	step_end
 
-BattleFrontier_OutsideEast_EventScript_Maniac1:: @ 8242D79
+BattleFrontier_OutsideEast_EventScript_Maniac1::
 	msgbox BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Girl:: @ 8242D82
+BattleFrontier_OutsideEast_EventScript_Girl::
 	msgbox BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_PsychicM:: @ 8242D8B
+BattleFrontier_OutsideEast_EventScript_PsychicM::
 	msgbox BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Man3:: @ 8242D94
+BattleFrontier_OutsideEast_EventScript_Man3::
 	msgbox BattleFrontier_OutsideEast_Text_GotWipedOut, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman1:: @ 8242D9D
+BattleFrontier_OutsideEast_EventScript_Woman1::
 	msgbox BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman2:: @ 8242DA6
+BattleFrontier_OutsideEast_EventScript_Woman2::
 	msgbox BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_BlackBelt2:: @ 8242DAF
+BattleFrontier_OutsideEast_EventScript_BlackBelt2::
 	msgbox BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_Maniac2:: @ 8242DB8
+BattleFrontier_OutsideEast_EventScript_Maniac2::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Woman3:: @ 8242DC3
+BattleFrontier_OutsideEast_EventScript_Woman3::
 	lock
 	msgbox BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_RankingHallSign:: @ 8242DCE
+BattleFrontier_OutsideEast_EventScript_RankingHallSign::
 	msgbox BattleFrontier_OutsideEast_Text_RankingHallSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign:: @ 8242DD7
+BattleFrontier_OutsideEast_EventScript_ExchangeCornerSign::
 	msgbox BattleFrontier_OutsideEast_Text_ExchangeCornerSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideEast_EventScript_Gentleman:: @ 8242DE0
+BattleFrontier_OutsideEast_EventScript_Gentleman::
 	msgbox BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
+BattleFrontier_OutsideEast_EventScript_OldWoman::
 	lock
 	faceplayer
 	goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone
@@ -228,47 +228,47 @@ BattleFrontier_OutsideEast_EventScript_OldWoman:: @ 8242DE9
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone:: @ 8242DFE
+BattleFrontier_OutsideEast_EventScript_OldWomanSudowoodoGone::
 	msgbox BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideEast_EventScript_Camper:: @ 8242E08
+BattleFrontier_OutsideEast_EventScript_Camper::
 	msgbox BattleFrontier_OutsideEast_Text_StickyMonWithLongTail, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideEast_Text_BattleTowerSign: @ 8242E11
+BattleFrontier_OutsideEast_Text_BattleTowerSign:
 	.string "This is the BATTLE TOWER!\n"
 	.string "Keep the win streak as the toughest\l"
 	.string "TRAINER!$"
 
-BattleFrontier_OutsideEast_Text_BattlePalaceSign: @ 8242E58
+BattleFrontier_OutsideEast_Text_BattlePalaceSign:
 	.string "This is the BATTLE PALACE!\n"
 	.string "Keep your eyes on POKéMON battles!$"
 
-BattleFrontier_OutsideEast_Text_BattleArenaSign: @ 8242E96
+BattleFrontier_OutsideEast_Text_BattleArenaSign:
 	.string "This is the BATTLE ARENA!\n"
 	.string "Let the toughest teams gather!$"
 
-BattleFrontier_OutsideEast_Text_BattlePyramidSign: @ 8242ECF
+BattleFrontier_OutsideEast_Text_BattlePyramidSign:
 	.string "This is the BATTLE PYRAMID!\n"
 	.string "Advance through the Battle Quest!$"
 
-BattleFrontier_OutsideEast_Text_RankingHallSign: @ 8242F0D
+BattleFrontier_OutsideEast_Text_RankingHallSign:
 	.string "BATTLE FRONTIER RANKING HALL\n"
 	.string "Set your sights on new records!$"
 
-BattleFrontier_OutsideEast_Text_ExchangeCornerSign: @ 8242F4A
+BattleFrontier_OutsideEast_Text_ExchangeCornerSign:
 	.string "BATTLE POINT EXCHANGE SERVICE CORNER\n"
 	.string "Exchange your Battle Points!$"
 
-BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial: @ 8242F8C
+BattleFrontier_OutsideEast_Text_BattleTowerFeelsSpecial:
 	.string "Wow!\n"
 	.string "It's huge!\p"
 	.string "The BATTLE TOWER feels special.\n"
 	.string "It's different from the others.$"
 
-BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
+BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier:
 	.string "My grand ambition is to conquer both\n"
 	.string "the BATTLE FRONTIER and the POKéMON\l"
 	.string "LEAGUE.\p"
@@ -276,26 +276,26 @@ BattleFrontier_OutsideEast_Text_ConquerLeagueAndFrontier: @ 8242FDC
 	.string "I… I'm going to ask MIMI next door\n"
 	.string "if she will be friends with me!$"
 
-BattleFrontier_OutsideEast_Text_PyramidTooHarsh: @ 824308C
+BattleFrontier_OutsideEast_Text_PyramidTooHarsh:
 	.string "The BATTLE PYRAMID's too harsh!\n"
 	.string "I just can't make it to the top!\p"
 	.string "Since I'm out of options, maybe I can\n"
 	.string "climb the outside…$"
 
-BattleFrontier_OutsideEast_Text_ThriveInDarkness: @ 8243106
+BattleFrontier_OutsideEast_Text_ThriveInDarkness:
 	.string "I thrive in darkness…\n"
 	.string "Yes… What is worthy of me?\l"
 	.string "None other than the BATTLE PYRAMID…\p"
 	.string "What say you to wandering in darkness\n"
 	.string "and in utter and total desperation?$"
 
-BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam: @ 82431A5
+BattleFrontier_OutsideEast_Text_PutTogetherUltimateTeam:
 	.string "I didn't sleep for a week, but then\n"
 	.string "I put together the ultimate team!\p"
 	.string "I can't see myself losing, no joke.\n"
 	.string "We're storming the BATTLE ARENA!$"
 
-BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
+BattleFrontier_OutsideEast_Text_DidScottBringYouHere:
 	.string "Did SCOTT bring you here, too?\n"
 	.string "What is it with that guy?\p"
 	.string "It sounds like he really does know\n"
@@ -303,16 +303,16 @@ BattleFrontier_OutsideEast_Text_DidScottBringYouHere: @ 8243230
 	.string "I've never seen him battling in person\n"
 	.string "ever.$"
 
-BattleFrontier_OutsideEast_Text_BelieveInYouBuddy: @ 82432DD
+BattleFrontier_OutsideEast_Text_BelieveInYouBuddy:
 	.string "ZIGG!\n"
 	.string "I believe in you, little buddy!\p"
 	.string "I'll make my little ZIGG any favorite\n"
 	.string "tasty treats you like if you win!$"
 
-BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant: @ 824334B
+BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant:
 	.string "ZIGZAGOON looks vacant…$"
 
-BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
+BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody:
 	.string "People call me a busybody,\n"
 	.string "but I can't help it.\p"
 	.string "Your hat's on crooked!\n"
@@ -321,29 +321,29 @@ BattleFrontier_OutsideEast_Text_PeopleCallMeBusybody: @ 8243363
 	.string "I don't know if I can stand to just\n"
 	.string "watch at the BATTLE PALACE…$"
 
-BattleFrontier_OutsideEast_Text_OnceBeatGymLeader: @ 8243425
+BattleFrontier_OutsideEast_Text_OnceBeatGymLeader:
 	.string "I may not look that impressive now,\n"
 	.string "but I once beat a GYM LEADER.\p"
 	.string "Who knows, maybe I should give it\n"
 	.string "another shot at glory.$"
 
-BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles: @ 82434A0
+BattleFrontier_OutsideEast_Text_FastOnBikeAndBattles:
 	.string "I'm fast on my BIKE, and that goes for\n"
 	.string "the way I battle, too.\p"
 	.string "I win matches in the blink of\n"
 	.string "an eye!$"
 
-BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon: @ 8243504
+BattleFrontier_OutsideEast_Text_BetterThanDaddyAtPokemon:
 	.string "I'm better than my daddy\n"
 	.string "at POKéMON.$"
 
-BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy: @ 8243529
+BattleFrontier_OutsideEast_Text_GoRackUpSomeWinsForDaddy:
 	.string "Go on, my baby sweetie!\n"
 	.string "Go rack up some wins for Daddy!\p"
 	.string "You're just like your mother,\n"
 	.string "so you'll be dominating!$"
 
-BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
+BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena:
 	.string "It wasn't easy getting here,\n"
 	.string "but I'd heard about this knockout\l"
 	.string "pretty girl at the BATTLE ARENA.\p"
@@ -352,13 +352,13 @@ BattleFrontier_OutsideEast_Text_HeardPrettyGirlAtBattleArena: @ 8243598
 	.string "A whole teeming mob of sweaty,\n"
 	.string "stinky, and primitive martial artists!$"
 
-BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere: @ 8243668
+BattleFrontier_OutsideEast_Text_SometimesImportantOldManInThere:
 	.string "I sometimes see this really important-\n"
 	.string "looking old man going in there.\p"
 	.string "He has these really awesome POKéMON.\n"
 	.string "He seems really nice, though.$"
 
-BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
+BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid:
 	.string "Do you know it?\n"
 	.string "The legend of the BATTLE PYRAMID?\p"
 	.string "When there comes a confident TRAINER\n"
@@ -370,7 +370,7 @@ BattleFrontier_OutsideEast_Text_LegendOfBattlePyramid: @ 82436F2
 	.string "What's it supposed to mean?\n"
 	.string "That, my friend, I can't say!$"
 
-BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
+BattleFrontier_OutsideEast_Text_GotWipedOut:
 	.string "Man! Oh man!\n"
 	.string "I've never lost once before!\p"
 	.string "But I got wiped out with no saving\n"
@@ -378,7 +378,7 @@ BattleFrontier_OutsideEast_Text_GotWipedOut: @ 8243809
 	.string "And then I'm told I don't have any\n"
 	.string "talent?! Man!$"
 
-BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
+BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower:
 	.string "This guy ran into a horribly tough\n"
 	.string "TRAINER while he was on the BATTLE\l"
 	.string "TOWER challenge.\p"
@@ -386,23 +386,23 @@ BattleFrontier_OutsideEast_Text_ToughTrainerInBattleTower: @ 8243895
 	.string "You need to be cautious if you ever\n"
 	.string "decide to go to the BATTLE TOWER.$"
 
-BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll: @ 8243943
+BattleFrontier_OutsideEast_Text_EnoughBattlePointsForDoll:
 	.string "Yes!\n"
 	.string "I've finally got enough Battle Points!\p"
 	.string "I guess I'll trade for another giant\n"
 	.string "plush DOLL!$"
 
-BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere: @ 82439A0
+BattleFrontier_OutsideEast_Text_LikeToHaveNameRecordedHere:
 	.string "Oh, yeah, okay!\n"
 	.string "So this is the RANKING HALL!\p"
 	.string "I'd like to go down in history as\n"
 	.string "a super champ and have my name\l"
 	.string "recorded here for posterity.$"
 
-BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou: @ 8243A2B
+BattleFrontier_OutsideEast_Text_CanDoAnythingWithYou:
 	.string "With you by my side, I can do anything.$"
 
-BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
+BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome:
 	.string "Ooh, darling, you are so wonderful!\p"
 	.string "Ooh, I just can't wait anymore!\p"
 	.string "Let's go to a MULTI BATTLE ROOM\n"
@@ -413,7 +413,7 @@ BattleFrontier_OutsideEast_Text_PowerOfOurLoveWillOvercome: @ 8243A53
 	.string "Why, before us, darling, everything\n"
 	.string "will topple like dominoes!$"
 
-BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B68
+BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers:
 	.string "The BATTLE FRONTIER isn't exclusively\n"
 	.string "for tough TRAINERS.\p"
 	.string "Many people with special abilities\n"
@@ -422,19 +422,19 @@ BattleFrontier_OutsideEast_Text_FrontierNotExclusivelyForToughTrainers: @ 8243B6
 	.string "He may have built this place to serve\n"
 	.string "a bigger objective…$"
 
-BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle: @ 8243C2C
+BattleFrontier_OutsideEast_Text_OddTreeHereSeemsToWiggle:
 	.string "Excuse me, young one.\n"
 	.string "Have you good eyesight?\p"
 	.string "There is an odd tree past here, and to\n"
 	.string "my tired eyes it seems to wiggle.$"
 
-BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere: @ 8243CA3
+BattleFrontier_OutsideEast_Text_OnceAnOddTreePastHere:
 	.string "Excuse me, young one.\n"
 	.string "Have you a good memory?\p"
 	.string "I have this feeling there once was\n"
 	.string "an odd tree past here.$"
 
-BattleFrontier_OutsideEast_Text_StickyMonWithLongTail: @ 8243D0B
+BattleFrontier_OutsideEast_Text_StickyMonWithLongTail:
 	.string "I…\n"
 	.string "I saw it!\p"
 	.string "There was a sticky sort of a POKéMON\n"

data/maps/BattleFrontier_OutsideWest/scripts.inc

@@ -7,16 +7,16 @@
 .set LOCALID_FISHERMAN_2, 18
 .set LOCALID_MAN_4, 23
 
-BattleFrontier_OutsideWest_MapScripts:: @ 823D3E1
+BattleFrontier_OutsideWest_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_OutsideWest_OnTransition
 	.byte 0
 
-BattleFrontier_OutsideWest_OnTransition: @ 823D3E7
+BattleFrontier_OutsideWest_OnTransition:
 	setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0
 	setflag FLAG_HIDE_BATTLE_TOWER_REPORTER
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
+BattleFrontier_OutsideWest_EventScript_FerryAttendant::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT
@@ -28,7 +28,7 @@ BattleFrontier_OutsideWest_EventScript_FerryAttendant:: @ 823D3F0
 	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
+BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination::
 	multichoicedefault 18, 6, MULTI_SSTIDAL_BATTLE_FRONTIER, 2, FALSE
 	switch VAR_RESULT
 	case 0, BattleFrontier_OutsideWest_EventScript_FerryToSlateport
@@ -37,12 +37,12 @@ BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination:: @ 823D416
 	case MULTI_B_PRESSED, BattleFrontier_OutsideWest_EventScript_CancelFerrySelect
 	end
 
-BattleFrontier_OutsideWest_EventScript_NoSSTicket:: @ 823D44E
+BattleFrontier_OutsideWest_EventScript_NoSSTicket::
 	msgbox BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
+BattleFrontier_OutsideWest_EventScript_FerryToSlateport::
 	msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
@@ -53,7 +53,7 @@ BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: @ 823D458
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
+BattleFrontier_OutsideWest_EventScript_FerryToLilycove::
 	msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
@@ -64,13 +64,13 @@ BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: @ 823D483
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination:: @ 823D4AE
+BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination::
 	message BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo
 	waitmessage
 	goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
 	end
 
-BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
+BattleFrontier_OutsideWest_EventScript_BoardFerry::
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
@@ -80,38 +80,38 @@ BattleFrontier_OutsideWest_EventScript_BoardFerry:: @ 823D4BA
 	call Common_EventScript_FerryDepartIsland
 	return
 
-BattleFrontier_OutsideWest_EventScript_CancelFerrySelect:: @ 823D4D8
+BattleFrontier_OutsideWest_EventScript_CancelFerrySelect::
 	msgbox BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattleDomeSign:: @ 823D4E2
+BattleFrontier_OutsideWest_EventScript_BattleDomeSign::
 	msgbox BattleFrontier_OutsideWest_Text_BattleDomeSign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattleFactorySign:: @ 823D4EB
+BattleFrontier_OutsideWest_EventScript_BattleFactorySign::
 	msgbox BattleFrontier_OutsideWest_Text_BattleFactorySign, MSGBOX_SIGN
 	end
 
-BattleFrontier_OutsideWest_EventScript_BattlePikeSign:: @ 823D4F4
+BattleFrontier_OutsideWest_EventScript_BattlePikeSign::
 	msgbox BattleFrontier_OutsideWest_Text_BattlePikeSign, MSGBOX_SIGN
 	end
 
 @ Unused. Of note, Battle Tower is in the East section in the final release
-BattleFrontier_OutsideWest_EventScript_UnusedNPC1:: @ 823D4FD
+BattleFrontier_OutsideWest_EventScript_UnusedNPC1::
 	msgbox BattleFrontier_OutsideWest_Text_ThisIsBattleTower, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnusedNPC2:: @ 823D4FD
+BattleFrontier_OutsideWest_EventScript_UnusedNPC2::
 	msgbox BattleFrontier_OutsideWest_Text_CantFindBattleTower, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Boy1:: @ 823D50F
+BattleFrontier_OutsideWest_EventScript_Boy1::
 	msgbox BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
+BattleFrontier_OutsideWest_EventScript_Fisherman2::
 	lock
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere
@@ -122,21 +122,21 @@ BattleFrontier_OutsideWest_EventScript_Fisherman2:: @ 823D518
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man1:: @ 823D52D
+BattleFrontier_OutsideWest_EventScript_Man1::
 	msgbox BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Maniac1:: @ 823D536
+BattleFrontier_OutsideWest_EventScript_Maniac1::
 	lock
 	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_Maniac2:: @ 823D53D
+BattleFrontier_OutsideWest_EventScript_Maniac2::
 	lock
 	goto BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk
 	end
 
-BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
+BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk::
 	applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT
@@ -151,7 +151,7 @@ BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: @ 823D544
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
+BattleFrontier_OutsideWest_EventScript_Camper::
 	lock
 	faceplayer
 	delay 20
@@ -167,15 +167,15 @@ BattleFrontier_OutsideWest_EventScript_Camper:: @ 823D57F
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: @ 823D5BA
+BattleFrontier_OutsideWest_EventScript_CamperFaceFactory::
 	applymovement LOCALID_CAMPER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory:: @ 823D5C5
+BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory::
 	return
 
-BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
+BattleFrontier_OutsideWest_EventScript_Girl::
 	lock
 	faceplayer
 	message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper
@@ -192,47 +192,47 @@ BattleFrontier_OutsideWest_EventScript_Girl:: @ 823D5C6
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderNorth:: @ 823D5FD
+BattleFrontier_OutsideWest_EventScript_GirlShudderNorth::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderNorth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderSouth:: @ 823D608
+BattleFrontier_OutsideWest_EventScript_GirlShudderSouth::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderSouth
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderWest:: @ 823D613
+BattleFrontier_OutsideWest_EventScript_GirlShudderWest::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderWest
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_EventScript_GirlShudderEast:: @ 823D61E
+BattleFrontier_OutsideWest_EventScript_GirlShudderEast::
 	applymovement LOCALID_GIRL, BattleFrontier_OutsideWest_Movement_GirlShudderEast
 	waitmovement 0
 	return
 
-BattleFrontier_OutsideWest_Movement_GirlShudderNorth: @ 823D629
+BattleFrontier_OutsideWest_Movement_GirlShudderNorth:
 	walk_in_place_fastest_down
 	walk_in_place_fastest_down
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderSouth: @ 823D62C
+BattleFrontier_OutsideWest_Movement_GirlShudderSouth:
 	walk_in_place_fastest_up
 	walk_in_place_fastest_up
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderWest: @ 823D62F
+BattleFrontier_OutsideWest_Movement_GirlShudderWest:
 	walk_in_place_fastest_right
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_OutsideWest_Movement_GirlShudderEast: @ 823D632
+BattleFrontier_OutsideWest_Movement_GirlShudderEast:
 	walk_in_place_fastest_left
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
+BattleFrontier_OutsideWest_EventScript_Woman2::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT
@@ -242,70 +242,70 @@ BattleFrontier_OutsideWest_EventScript_Woman2:: @ 823D635
 	goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors
 	end
 
-BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors:: @ 823D653
+BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors::
 	msgbox BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors:: @ 823D65D
+BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors::
 	msgbox BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Fisherman1:: @ 823D667
+BattleFrontier_OutsideWest_EventScript_Fisherman1::
 	msgbox BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling, MSGBOX_NPC
 	end
 
 @ Unused
-BattleFrontier_OutsideWest_EventScript_UnusedNPC3:: @ 823D670
+BattleFrontier_OutsideWest_EventScript_UnusedNPC3::
 	msgbox BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Gentleman:: @ 823D679
+BattleFrontier_OutsideWest_EventScript_Gentleman::
 	msgbox BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Lass:: @ 823D682
+BattleFrontier_OutsideWest_EventScript_Lass::
 	msgbox BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_ExpertM:: @ 823D68B
+BattleFrontier_OutsideWest_EventScript_ExpertM::
 	msgbox BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man2:: @ 823D694
+BattleFrontier_OutsideWest_EventScript_Man2::
 	msgbox BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Woman1:: @ 823D69D
+BattleFrontier_OutsideWest_EventScript_Woman1::
 	msgbox BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_FatMan1:: @ 823D6A6
+BattleFrontier_OutsideWest_EventScript_FatMan1::
 	msgbox BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_FatMan2:: @ 823D6AF
+BattleFrontier_OutsideWest_EventScript_FatMan2::
 	msgbox BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Woman3:: @ 823D6B8
+BattleFrontier_OutsideWest_EventScript_Woman3::
 	lock
 	msgbox BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_Boy2:: @ 823D6C3
+BattleFrontier_OutsideWest_EventScript_Boy2::
 	lock
 	msgbox BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_OldMan:: @ 823D6CE
+BattleFrontier_OutsideWest_EventScript_OldMan::
 	msgbox BattleFrontier_OutsideWest_Text_DomeAceIsMine, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
+BattleFrontier_OutsideWest_EventScript_Man4::
 	lock
 	faceplayer
 	msgbox BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers, MSGBOX_DEFAULT
@@ -315,76 +315,76 @@ BattleFrontier_OutsideWest_EventScript_Man4:: @ 823D6D7
 	release
 	end
 
-BattleFrontier_OutsideWest_EventScript_PokefanF:: @ 823D6EE
+BattleFrontier_OutsideWest_EventScript_PokefanF::
 	msgbox BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier, MSGBOX_NPC
 	end
 
-BattleFrontier_OutsideWest_Text_BattleDomeSign: @ 823D6F7
+BattleFrontier_OutsideWest_Text_BattleDomeSign:
 	.string "This is the BATTLE DOME!\n"
 	.string "Your path to the invincible superstar!$"
 
-BattleFrontier_OutsideWest_Text_BattleFactorySign: @ 823D737
+BattleFrontier_OutsideWest_Text_BattleFactorySign:
 	.string "This is the BATTLE FACTORY!\n"
 	.string "Seek out the toughest POKéMON!$"
 
-BattleFrontier_OutsideWest_Text_BattlePikeSign: @ 823D772
+BattleFrontier_OutsideWest_Text_BattlePikeSign:
 	.string "This is the BATTLE PIKE!\n"
 	.string "Choose one of three paths!$"
 
-BattleFrontier_OutsideWest_Text_ThisIsBattleTower: @ 823D7A6
+BattleFrontier_OutsideWest_Text_ThisIsBattleTower:
 	.string "This is the BATTLE TOWER.\p"
 	.string "TRAINERS bring their best-raised\n"
 	.string "POKéMON for elimination-style matches.$"
 
-BattleFrontier_OutsideWest_Text_MayISeeYourTicket: @ 823D808
+BattleFrontier_OutsideWest_Text_MayISeeYourTicket:
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard: @ 823D842
+BattleFrontier_OutsideWest_Text_MustHaveTicketToBoard:
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo: @ 823D89D
+BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo:
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_SlateportItIs: @ 823D8F2
+BattleFrontier_OutsideWest_Text_SlateportItIs:
 	.string "SLATEPORT CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_LilycoveItIs: @ 823D90E
+BattleFrontier_OutsideWest_Text_LilycoveItIs:
 	.string "LILYCOVE CITY it is, then!$"
 
-BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime: @ 823D929
+BattleFrontier_OutsideWest_Text_SailWithUsAnotherTime:
 	.string "Please sail with us another time!$"
 
-BattleFrontier_OutsideWest_Text_PleaseBoardFerry: @ 823D94B
+BattleFrontier_OutsideWest_Text_PleaseBoardFerry:
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo: @ 823D97A
+BattleFrontier_OutsideWest_Text_ThenWhereWouldYouLikeToGo:
 	.string "Then, where would you like to go?$"
 
-BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends: @ 823D99C
+BattleFrontier_OutsideWest_Text_BestOutOfAllMyFriends:
 	.string "I'm the best out of all my friends.\n"
 	.string "But here…\l"
 	.string "I've been useless!$"
 
-BattleFrontier_OutsideWest_Text_CantFindBattleTower: @ 823D9DD
+BattleFrontier_OutsideWest_Text_CantFindBattleTower:
 	.string "I want to go to the BATTLE TOWER,\n"
 	.string "but I can't find it even though I have\l"
 	.string "a map of the BATTLE FRONTIER.\p"
 	.string "This place is just too big!$"
 
-BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere: @ 823DA60
+BattleFrontier_OutsideWest_Text_GotSeasickOnWayHere:
 	.string "I wanted to take a challenge as soon\n"
 	.string "as I arrived here.\p"
 	.string "But on the way, I got seasick…\n"
 	.string "Urrrrp…$"
 
-BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
+BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere:
 	.string "It's not as if just anyone can come\n"
 	.string "here, you know?\p"
 	.string "Only those TRAINERS who've been\n"
@@ -392,94 +392,94 @@ BattleFrontier_OutsideWest_Text_OnlyToughTrainersBroughtHere: @ 823DABF
 	.string "That's why many TRAINERS don't even\n"
 	.string "know about the BATTLE FRONTIER.$"
 
-BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons: @ 823DB7D
+BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons:
 	.string "Hey, bro…\p"
 	.string "Are you sure we can make challenges\n"
 	.string "even if we don't have any POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons: @ 823DBCE
+BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons:
 	.string "Uh…\n"
 	.string "I'm sure it'll be okay.\p"
 	.string "I think…\p"
 	.string "But remember that big scary guy?\n"
 	.string "He said, “I'll lend you POKéMON!”$"
 
-BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons: @ 823DC36
+BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons:
 	.string "That's the BATTLE FACTORY.\n"
 	.string "You can rent strong POKéMON there.\p"
 	.string "But it makes me wonder.\n"
 	.string "Who's raising those rental POKéMON?$"
 
-BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper: @ 823DCB0
+BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper:
 	.string "I'm scared of going into the BATTLE\n"
 	.string "PIKE because of SEVIPER…\p"
 	.string "B-but I came all the way here, so I will\n"
 	.string "try to conquer everything!\l"
 	.string "…Shudder…$"
 
-BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors: @ 823DD3B
+BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors:
 	.string "Let's play rock, paper, scissors!\n"
 	.string "One, two, three!\p"
 	.string "… … … … … …$"
 
-BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge: @ 823DD7A
+BattleFrontier_OutsideWest_Text_WonIllTakePikeChallenge:
 	.string "Yay! I won!\n"
 	.string "I will take the BATTLE PIKE challenge!$"
 
-BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge: @ 823DDAD
+BattleFrontier_OutsideWest_Text_LostIllPutOffPikeChallenge:
 	.string "Oh, no…\n"
 	.string "I lost.\p"
 	.string "I guess I'm not very lucky today.\n"
 	.string "I'll put off my BATTLE PIKE challenge\l"
 	.string "until tomorrow.$"
 
-BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling: @ 823DE15
+BattleFrontier_OutsideWest_Text_ChooseFishingOverBattling:
 	.string "I believe I'm the only person here who,\n"
 	.string "for some unknown reason, would choose\l"
 	.string "fishing over battling.\p"
 	.string "Huh? You can't catch anything here?\n"
 	.string "That's disappointing…$"
 
-BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol: @ 823DEB4
+BattleFrontier_OutsideWest_Text_KeepBattlingUntilIGetSymbol:
 	.string "Today, I'm going to keep battling, no\n"
 	.string "matter what, until I get a Symbol.$"
 
-BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome: @ 823DEFD
+BattleFrontier_OutsideWest_Text_YoureOffToChallengeDome:
 	.string "Oh? You're off to challenge\n"
 	.string "the BATTLE DOME?\p"
 	.string "I'll wish you the best of luck.\n"
 	.string "Let us both win our way up and meet\l"
 	.string "in challenges.$"
 
-BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa: @ 823DF7D
+BattleFrontier_OutsideWest_Text_DomeIsHereGrandpa:
 	.string "Grandpa, over here!\n"
 	.string "The BATTLE DOME is here!\l"
 	.string "Go get 'em, Grandpa!$"
 
-BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe: @ 823DFBF
+BattleFrontier_OutsideWest_Text_WontLetGentlemenBeatMe:
 	.string "Ah, so this here is the BATTLE DOME?\n"
 	.string "I won't let GENTLEMEN beat me!\p"
 	.string "But where is the entrance?$"
 
-BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo: @ 823E01E
+BattleFrontier_OutsideWest_Text_NothingHereNotLongAgo:
 	.string "There used to be nothing here not all\n"
 	.string "that long ago.\p"
 	.string "But, now look at this place! Amazing!\n"
 	.string "I'll bring my mother out to see this.$"
 
-BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier: @ 823E09F
+BattleFrontier_OutsideWest_Text_FinallyArrivedAtFrontier:
 	.string "I've finally arrived at the BATTLE\n"
 	.string "FRONTIER!\p"
 	.string "I'm sure to grab attention with\n"
 	.string "my looks and ability!$"
 
-BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople: @ 823E102
+BattleFrontier_OutsideWest_Text_SquareFilledWithToughPeople:
 	.string "Munch, munch…\p"
 	.string "It looks like this square's filled with\n"
 	.string "tough people.\p"
 	.string "Munch, munch…$"
 
-BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
+BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike:
 	.string "Crunch, munch…\p"
 	.string "A while back, I met this older girl\n"
 	.string "at the BATTLE PIKE.\p"
@@ -492,13 +492,13 @@ BattleFrontier_OutsideWest_Text_MetOlderGirlAtPike: @ 823E154
 	.string "scary experience, sure enough.\p"
 	.string "Crunch, munch…$"
 
-BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet: @ 823E273
+BattleFrontier_OutsideWest_Text_LastTimeOurEyesMet:
 	.string "Huh? Will you listen to yourself?\n"
 	.string "That's nothing!\p"
 	.string "Why, the last time I cheered for him,\n"
 	.string "our eyes met and sparks flew!$"
 
-BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
+BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering:
 	.string "Whaaaaaat?!\n"
 	.string "Pfft!\p"
 	.string "That only happened because\n"
@@ -506,7 +506,7 @@ BattleFrontier_OutsideWest_Text_DomeAceLookedBecauseOfMyCheering: @ 823E2E9
 	.string "The DOME ACE only looked our way\n"
 	.string "because my cheering was so loud!$"
 
-BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
+BattleFrontier_OutsideWest_Text_DomeAceIsMine:
 	.string "Oh, shush!\n"
 	.string "Keep that racket down!\p"
 	.string "You fair-weather fans should stick\n"
@@ -514,7 +514,7 @@ BattleFrontier_OutsideWest_Text_DomeAceIsMine: @ 823E37E
 	.string "The DOME ACE is mine!\n"
 	.string "The only idol for me!$"
 
-BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
+BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers:
 	.string "Those people squabbling over there…\p"
 	.string "It's hard to believe, but they once\n"
 	.string "were TRAINERS, and good ones, too.\p"
@@ -528,7 +528,7 @@ BattleFrontier_OutsideWest_Text_FansOverThereUsedToBeTrainers: @ 823E410
 	.string "They go cheer for their idol at the\l"
 	.string "BATTLE DOME every day now.$"
 
-BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier: @ 823E5A5
+BattleFrontier_OutsideWest_Text_MonWithLongTailInFrontier:
 	.string "I heard a rumor that someone saw\n"
 	.string "a POKéMON with an unusually long tail\l"
 	.string "somewhere in the BATTLE FRONTIER.\p"

data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc

@@ -1,15 +1,15 @@
 .set LOCALID_NURSE, 1
 
-BattleFrontier_PokemonCenter_1F_MapScripts:: @ 82678F9
+BattleFrontier_PokemonCenter_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_PokemonCenter_1F_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, CableClub_OnResume
 	.byte 0
 
-BattleFrontier_PokemonCenter_1F_OnTransition: @ 8267904
+BattleFrontier_PokemonCenter_1F_OnTransition:
 	setrespawn HEAL_LOCATION_BATTLE_FRONTIER_OUTSIDE_EAST
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
+BattleFrontier_PokemonCenter_1F_EventScript_Nurse::
 	setvar VAR_0x800B, LOCALID_NURSE
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -17,19 +17,19 @@ BattleFrontier_PokemonCenter_1F_EventScript_Nurse:: @ 8267908
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid:: @ 8267916
+BattleFrontier_PokemonCenter_1F_EventScript_SchoolKid::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Man:: @ 826791F
+BattleFrontier_PokemonCenter_1F_EventScript_Man::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Picnicker:: @ 8267928
+BattleFrontier_PokemonCenter_1F_EventScript_Picnicker::
 	msgbox BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge, MSGBOX_NPC
 	end
 
-BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
+BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
 	lock
 	faceplayer
 	waitse
@@ -39,7 +39,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty:: @ 8267931
 	release
 	end
 
-BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
+BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon:
 	.string "There was someone here using a \n"
 	.string "POKéMON I've never seen before.\p"
 	.string "I never learned about it at\n"
@@ -47,15 +47,15 @@ BattleFrontier_PokemonCenter_1F_Text_NeverSeenPokemon: @ 8267944
 	.string "I wonder where you can catch POKéMON\n"
 	.string "like that.$"
 
-BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena: @ 82679EB
+BattleFrontier_PokemonCenter_1F_Text_NextStopBattleArena:
 	.string "Okay! Next stop, the BATTLE ARENA!\n"
 	.string "I'd better get the right POKéMON from\l"
 	.string "the PC Storage System.$"
 
-BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge: @ 8267A4B
+BattleFrontier_PokemonCenter_1F_Text_GoingThroughEveryChallenge:
 	.string "Giggle… I'm going to go through every\n"
 	.string "challenge with just this baby!$"
 
-BattleFrontier_PokemonCenter_1F_Text_Skitty: @ 8267A90
+BattleFrontier_PokemonCenter_1F_Text_Skitty:
 	.string "SKITTY: Mya myaaah!$"
 

data/maps/BattleFrontier_PokemonCenter_2F/scripts.inc

@@ -1,4 +1,4 @@
-BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
+BattleFrontier_PokemonCenter_2F_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, CableClub_OnFrame
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, CableClub_OnWarp
 	map_script MAP_SCRIPT_ON_LOAD, CableClub_OnLoad
@@ -6,15 +6,15 @@ BattleFrontier_PokemonCenter_2F_MapScripts:: @ 8267AA4
 	.byte 0
 
 @ The below 3 are unused and leftover from RS
-BattleFrontier_PokemonCenter_2F_EventScript_Colosseum:: @ 8267AB9
+BattleFrontier_PokemonCenter_2F_EventScript_Colosseum::
 	call CableClub_EventScript_Colosseum
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter:: @ 8267ABF
+BattleFrontier_PokemonCenter_2F_EventScript_TradeCenter::
 	call CableClub_EventScript_TradeCenter
 	end
 
-BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner:: @ 8267AC5
+BattleFrontier_PokemonCenter_2F_EventScript_RecordCorner::
 	call CableClub_EventScript_RecordCorner
 	end
 

data/maps/BattleFrontier_RankingHall/scripts.inc

@@ -1,67 +1,67 @@
-BattleFrontier_RankingHall_MapScripts:: @ 825E4A9
+BattleFrontier_RankingHall_MapScripts::
 	.byte 0
 
-BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: @ 825E4AA
+BattleFrontier_RankingHall_EventScript_TowerSinglesRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: @ 825E4B6
+BattleFrontier_RankingHall_EventScript_TowerDoublesRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: @ 825E4C2
+BattleFrontier_RankingHall_EventScript_TowerMultisRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: @ 825E4CE
+BattleFrontier_RankingHall_EventScript_TowerLinkRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_ArenaRecords:: @ 825E4DA
+BattleFrontier_RankingHall_EventScript_ArenaRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PalaceRecords:: @ 825E4E6
+BattleFrontier_RankingHall_EventScript_PalaceRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_FactoryRecords:: @ 825E4F2
+BattleFrontier_RankingHall_EventScript_FactoryRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_DomeRecords:: @ 825E4FE
+BattleFrontier_RankingHall_EventScript_DomeRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PikeRecords:: @ 825E50A
+BattleFrontier_RankingHall_EventScript_PikeRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_PyramidRecords:: @ 825E516
+BattleFrontier_RankingHall_EventScript_PyramidRecords::
 	lockall
 	setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID
 	goto BattleFrontier_RankingHall_EventScript_ShowRecords
 	end
 
-BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
+BattleFrontier_RankingHall_EventScript_ShowRecords::
 	special ShowRankingHallRecordsWindow
 	waitbuttonpress
 	special ScrollRankingHallRecordsWindow
@@ -70,19 +70,19 @@ BattleFrontier_RankingHall_EventScript_ShowRecords:: @ 825E522
 	releaseall
 	end
 
-BattleFrontier_RankingHall_EventScript_Attendant:: @ 825E52F
+BattleFrontier_RankingHall_EventScript_Attendant::
 	msgbox BattleFrontier_RankingHall_Text_ExplainRankingHall, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign:: @ 825E538
+BattleFrontier_RankingHall_EventScript_DomePikeFactoryRecordsSign::
 	msgbox BattleFrontier_RankingHall_Text_DomePikeFactoryRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn:: @ 825E541
+BattleFrontier_RankingHall_EventScript_PalaceArenaPyramidRecordsSIgn::
 	msgbox BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords, MSGBOX_SIGN
 	end
 
-BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
+BattleFrontier_RankingHall_EventScript_NinjaBoy::
 	lock
 	faceplayer
 	msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
@@ -92,42 +92,42 @@ BattleFrontier_RankingHall_EventScript_NinjaBoy:: @ 825E54A
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList:: @ 825E569
+BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList::
 	msgbox BattleFrontier_RankingHall_Text_WowThatsSuper, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_RankingHall_EventScript_Boy:: @ 825E573
+BattleFrontier_RankingHall_EventScript_Boy::
 	msgbox BattleFrontier_RankingHall_Text_MyNamesNotUpThere, MSGBOX_NPC
 	end
 
-BattleFrontier_RankingHall_Text_ExplainRankingHall: @ 825E57C
+BattleFrontier_RankingHall_Text_ExplainRankingHall:
 	.string "This is the RANKING HALL.\p"
 	.string "This is where we recognize the immortal\n"
 	.string "TRAINERS who left great records in\l"
 	.string "BATTLE FRONTIER events.$"
 
-BattleFrontier_RankingHall_Text_DomePikeFactoryRecords: @ 825E5F9
+BattleFrontier_RankingHall_Text_DomePikeFactoryRecords:
 	.string "BATTLE DOME, BATTLE PIKE,\n"
 	.string "and BATTLE FACTORY Records$"
 
-BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords: @ 825E62E
+BattleFrontier_RankingHall_Text_PalaceArenaPyramidRecords:
 	.string "BATTLE PALACE, BATTLE ARENA,\n"
 	.string "and BATTLE PYRAMID Records$"
 
-BattleFrontier_RankingHall_Text_IsYourNameOnThisList: @ 825E666
+BattleFrontier_RankingHall_Text_IsYourNameOnThisList:
 	.string "Hi, is your name on this list?$"
 
-BattleFrontier_RankingHall_Text_WowThatsSuper: @ 825E685
+BattleFrontier_RankingHall_Text_WowThatsSuper:
 	.string "Wow, that's super!\n"
 	.string "I'll have to try harder, too!$"
 
-BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName: @ 825E6B6
+BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName:
 	.string "Oh, is that right?\p"
 	.string "If you saw your friend's name up here,\n"
 	.string "I bet it would make you work harder!$"
 
-BattleFrontier_RankingHall_Text_MyNamesNotUpThere: @ 825E715
+BattleFrontier_RankingHall_Text_MyNamesNotUpThere:
 	.string "Hmm…\n"
 	.string "My name's not up there…\p"
 	.string "Well, it's only natural since I haven't\n"

data/maps/BattleFrontier_ReceptionGate/scripts.inc

@@ -2,20 +2,20 @@
 .set LOCALID_GUIDE, 2
 .set LOCALID_SCOTT, 4
 
-BattleFrontier_ReceptionGate_MapScripts:: @ 82661DA
+BattleFrontier_ReceptionGate_MapScripts::
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, BattleFrontier_ReceptionGate_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, BattleFrontier_ReceptionGate_OnTransition
 	.byte 0
 
-BattleFrontier_ReceptionGate_OnTransition: @ 82661E5
+BattleFrontier_ReceptionGate_OnTransition:
 	setflag FLAG_LANDMARK_BATTLE_FRONTIER
 	end
 
-BattleFrontier_ReceptionGate_OnFrame: @ 82661E9
+BattleFrontier_ReceptionGate_OnFrame:
 	map_script_2 VAR_HAS_ENTERED_BATTLE_FRONTIER, 0, BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering
 	.2byte 0
 
-BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
+BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering::
 	lockall
 	setvar VAR_HAS_ENTERED_BATTLE_FRONTIER, 1
 	playse SE_PIN
@@ -30,7 +30,7 @@ BattleFrontier_ReceptionGate_EventScript_FirstTimeEntering:: @ 82661F3
 	goto BattleFrontier_ReceptionGate_EventScript_ScottScene
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
+BattleFrontier_ReceptionGate_EventScript_ScottScene::
 	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	msgbox BattleFrontier_ReceptionGate_Text_IssueFrontierPass, MSGBOX_DEFAULT
 	playfanfare MUS_OBTAIN_ITEM
@@ -66,14 +66,14 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene:: @ 8266229
 	releaseall
 	end
 
-BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter: @ 82662D2
+BattleFrontier_ReceptionGate_Movement_PlayerApproachCounter:
 	walk_up
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
+BattleFrontier_ReceptionGate_Movement_PlayerFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -82,12 +82,12 @@ BattleFrontier_ReceptionGate_Movement_PlayerFaceScott: @ 82662D7
 	step_end
 
 @ Unused
-BattleFrontier_ReceptionGate_Movement_WalkDown: @ 82662DD
+BattleFrontier_ReceptionGate_Movement_WalkDown:
 	walk_down
 	walk_down
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
+BattleFrontier_ReceptionGate_Movement_ScottEnter:
 	walk_down
 	walk_down
 	walk_down
@@ -97,7 +97,7 @@ BattleFrontier_ReceptionGate_Movement_ScottEnter: @ 82662E0
 	walk_left
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
+BattleFrontier_ReceptionGate_Movement_ScottExit:
 	walk_right
 	walk_up
 	walk_up
@@ -107,7 +107,7 @@ BattleFrontier_ReceptionGate_Movement_ScottExit: @ 82662E8
 	walk_up
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
+BattleFrontier_ReceptionGate_Movement_GreeterFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -115,7 +115,7 @@ BattleFrontier_ReceptionGate_Movement_GreeterFaceScott: @ 82662F0
 	walk_in_place_fastest_right
 	step_end
 
-BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
+BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott:
 	delay_16
 	delay_16
 	delay_16
@@ -123,7 +123,7 @@ BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: @ 82662F6
 	walk_in_place_fastest_left
 	step_end
 
-BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
+BattleFrontier_ReceptionGate_EventScript_Greeter::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
@@ -131,14 +131,14 @@ BattleFrontier_ReceptionGate_EventScript_Greeter:: @ 82662FC
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_FacilityGuide:: @ 8266310
+BattleFrontier_ReceptionGate_EventScript_FacilityGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFacilities, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
+BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich2
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BF_RECEPTIONIST
@@ -158,64 +158,64 @@ BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout:: @ 8266320
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleTower:: @ 82663AE
+BattleFrontier_ReceptionGate_EventScript_BattleTower::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleTowerInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleDome:: @ 82663BC
+BattleFrontier_ReceptionGate_EventScript_BattleDome::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleDomeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePalace:: @ 82663CA
+BattleFrontier_ReceptionGate_EventScript_BattlePalace::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePalaceInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleArena:: @ 82663D8
+BattleFrontier_ReceptionGate_EventScript_BattleArena::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleArenaInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattleFactory:: @ 82663E6
+BattleFrontier_ReceptionGate_EventScript_BattleFactory::
 	msgbox BattleFrontier_ReceptionGate_Text_BattleFactoryInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePike:: @ 82663F4
+BattleFrontier_ReceptionGate_EventScript_BattlePike::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePikeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePyramid:: @ 8266402
+BattleFrontier_ReceptionGate_EventScript_BattlePyramid::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePyramidInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RankingHall:: @ 8266410
+BattleFrontier_ReceptionGate_EventScript_RankingHall::
 	msgbox BattleFrontier_ReceptionGate_Text_RankingHallInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExchangeCorner:: @ 826641E
+BattleFrontier_ReceptionGate_EventScript_ExchangeCorner::
 	msgbox BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFacilityToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide:: @ 826642C
+BattleFrontier_ReceptionGate_EventScript_ExitFacilityGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RulesGuide:: @ 8266436
+BattleFrontier_ReceptionGate_EventScript_RulesGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToRules, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
+BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhat
 	waitmessage
 	multichoice 15, 0, MULTI_FRONTIER_RULES, FALSE
@@ -229,44 +229,44 @@ BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout:: @ 8266446
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_LevelMode:: @ 82664A4
+BattleFrontier_ReceptionGate_EventScript_LevelMode::
 	msgbox BattleFrontier_ReceptionGate_Text_LevelModeInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_Level50:: @ 82664B2
+BattleFrontier_ReceptionGate_EventScript_Level50::
 	msgbox BattleFrontier_ReceptionGate_Text_Level50Info, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_OpenLevel:: @ 82664C0
+BattleFrontier_ReceptionGate_EventScript_OpenLevel::
 	msgbox BattleFrontier_ReceptionGate_Text_OpenLevelInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_MonEntry:: @ 82664CE
+BattleFrontier_ReceptionGate_EventScript_MonEntry::
 	msgbox BattleFrontier_ReceptionGate_Text_MonEntryInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_HoldItems:: @ 82664DC
+BattleFrontier_ReceptionGate_EventScript_HoldItems::
 	msgbox BattleFrontier_ReceptionGate_Text_HoldItemsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseRuleToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide:: @ 82664EA
+BattleFrontier_ReceptionGate_EventScript_ExitRulesGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide:: @ 82664F4
+BattleFrontier_ReceptionGate_EventScript_FrontierPassGuide::
 	lock
 	faceplayer
 	msgbox BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @ 8266504
+BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout::
 	message BattleFrontier_ReceptionGate_Text_LearnAboutWhich1
 	waitmessage
 	multichoice 16, 4, MULTI_FRONTIER_PASS_INFO, FALSE
@@ -278,62 +278,62 @@ BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout:: @
 	case MULTI_B_PRESSED, BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide
 	end
 
-BattleFrontier_ReceptionGate_EventScript_Symbols:: @ 826654C
+BattleFrontier_ReceptionGate_EventScript_Symbols::
 	msgbox BattleFrontier_ReceptionGate_Text_SymbolsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_RecordBattle:: @ 826655A
+BattleFrontier_ReceptionGate_EventScript_RecordBattle::
 	msgbox BattleFrontier_ReceptionGate_Text_RecordedBattleInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_BattlePoints:: @ 8266568
+BattleFrontier_ReceptionGate_EventScript_BattlePoints::
 	msgbox BattleFrontier_ReceptionGate_Text_BattlePointsInfo, MSGBOX_DEFAULT
 	goto BattleFrontier_ReceptionGate_EventScript_ChooseFrontierPassInfoToLearnAbout
 	end
 
-BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide:: @ 8266576
+BattleFrontier_ReceptionGate_EventScript_ExitFrontierPassGuide::
 	msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay: @ 8266580
+BattleFrontier_ReceptionGate_Text_FirstTimeHereThisWay:
 	.string "Is it your first time here?\n"
 	.string "Please step this way!$"
 
-BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier: @ 82665B2
+BattleFrontier_ReceptionGate_Text_WelcomeToBattleFrontier:
 	.string "The front lines of POKéMON battling!\n"
 	.string "Welcome to the BATTLE FRONTIER!$"
 
-BattleFrontier_ReceptionGate_Text_IssueFrontierPass: @ 82665F7
+BattleFrontier_ReceptionGate_Text_IssueFrontierPass:
 	.string "For a first-time visitor, we issue\n"
 	.string "the FRONTIER PASS.\p"
 	.string "It's for use at all the facilities\n"
 	.string "in the BATTLE FRONTIER.\p"
 	.string "Here you are!$"
 
-BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass: @ 8266676
+BattleFrontier_ReceptionGate_Text_ObtainedFrontierPass:
 	.string "{PLAYER} obtained\n"
 	.string "the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass: @ 8266695
+BattleFrontier_ReceptionGate_Text_PlacedTrainerCardInFrontierPass:
 	.string "{PLAYER} placed the TRAINER CARD\n"
 	.string "in the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier: @ 82666C6
+BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier:
 	.string "We hope you enjoy all that the BATTLE\n"
 	.string "FRONTIER has to offer!$"
 
-BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame: @ 8266703
+BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame:
 	.string "???: Well, if it isn't {PLAYER}{KUN}!\n"
 	.string "You came out here!$"
 
-BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay: @ 8266733
+BattleFrontier_ReceptionGate_Text_OhMrScottGoodDay:
 	.string "GUIDE: Oh! MR. SCOTT, sir!\n"
 	.string "Good day to you, sir!$"
 
-BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
+BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere:
 	.string "SCOTT: It's great to see you here,\n"
 	.string "it really is!\p"
 	.string "I hope you'll take your time and\n"
@@ -343,21 +343,21 @@ BattleFrontier_ReceptionGate_Text_ScottGreatToSeeYouHere: @ 8266764
 	.string "I also have my quarters here, so feel\n"
 	.string "free to visit if you have time.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToFacilities: @ 8266857
+BattleFrontier_ReceptionGate_Text_YourGuideToFacilities:
 	.string "I'm your guide to the various facilities\n"
 	.string "here in the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhich2: @ 826689D
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich2:
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_BattleTowerInfo: @ 82668C2
+BattleFrontier_ReceptionGate_Text_BattleTowerInfo:
 	.string "It is the gigantic tower considered\n"
 	.string "to be the BATTLE FRONTIER's symbol.\p"
 	.string "There are four kinds of BATTLE ROOMS\n"
 	.string "in the tower for SINGLE, DOUBLE, MULTI,\l"
 	.string "and LINK MULTI BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
+BattleFrontier_ReceptionGate_Text_BattleDomeInfo:
 	.string "The BATTLE DOME is the large building\n"
 	.string "shaped like a huge egg.\p"
 	.string "Events named Battle Tourneys are held\n"
@@ -366,20 +366,20 @@ BattleFrontier_ReceptionGate_Text_BattleDomeInfo: @ 826696F
 	.string "two courses--for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePalaceInfo: @ 8266A34
+BattleFrontier_ReceptionGate_Text_BattlePalaceInfo:
 	.string "The BATTLE PALACE is the red building\n"
 	.string "on the right of the BATTLE FRONTIER.\p"
 	.string "There are two kinds of BATTLE HALLS\n"
 	.string "for SINGLE and DOUBLE BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattleArenaInfo: @ 8266AC2
+BattleFrontier_ReceptionGate_Text_BattleArenaInfo:
 	.string "The BATTLE ARENA is the dojo-like\n"
 	.string "building at the center-right of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Set KO Tourney\n"
 	.string "takes place at the BATTLE ARENA.$"
 
-BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
+BattleFrontier_ReceptionGate_Text_BattleFactoryInfo:
 	.string "The BATTLE FACTORY is the large\n"
 	.string "building that is the closest to us.\p"
 	.string "An event called the Battle Swap\n"
@@ -388,20 +388,20 @@ BattleFrontier_ReceptionGate_Text_BattleFactoryInfo: @ 8266B5D
 	.string "two courses for SINGLE and DOUBLE\l"
 	.string "BATTLES.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePikeInfo: @ 8266C24
+BattleFrontier_ReceptionGate_Text_BattlePikeInfo:
 	.string "The BATTLE PIKE is the building shaped\n"
 	.string "like a POKéMON at the center-left of\l"
 	.string "the BATTLE FRONTIER.\p"
 	.string "An event called the Battle Choice\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePyramidInfo: @ 8266CBB
+BattleFrontier_ReceptionGate_Text_BattlePyramidInfo:
 	.string "The BATTLE PYRAMID is the enormous\n"
 	.string "pyramid.\p"
 	.string "An event called the Battle Quest\n"
 	.string "is conducted there.$"
 
-BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
+BattleFrontier_ReceptionGate_Text_RankingHallInfo:
 	.string "The RANKING HALL is located near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "There, you may see the most fantastic\n"
@@ -409,28 +409,28 @@ BattleFrontier_ReceptionGate_Text_RankingHallInfo: @ 8266D1C
 	.string "took on the many challenges of\l"
 	.string "the BATTLE FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo: @ 8266DCB
+BattleFrontier_ReceptionGate_Text_ExchangeCornerInfo:
 	.string "The EXCHANGE SERVICE CORNER is near\n"
 	.string "the BATTLE TOWER.\p"
 	.string "The Battle Points you have earned in\n"
 	.string "the BATTLE FRONTIER may be exchanged\l"
 	.string "for fabulous prizes there.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToRules: @ 8266E66
+BattleFrontier_ReceptionGate_Text_YourGuideToRules:
 	.string "I'm your guide to the basic rules that\n"
 	.string "are common to all the challenges\l"
 	.string "offered by the facilities in the BATTLE\l"
 	.string "FRONTIER.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhat: @ 8266EE0
+BattleFrontier_ReceptionGate_Text_LearnAboutWhat:
 	.string "What would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_LevelModeInfo: @ 8266F04
+BattleFrontier_ReceptionGate_Text_LevelModeInfo:
 	.string "All the challenges at the BATTLE\n"
 	.string "FRONTIER's facilities come in\l"
 	.string "two courses--Level 50 and Open Level.$"
 
-BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
+BattleFrontier_ReceptionGate_Text_Level50Info:
 	.string "The Level 50 course is open to POKéMON\n"
 	.string "up to and including Level 50.\p"
 	.string "Please keep in mind, however, that\n"
@@ -441,7 +441,7 @@ BattleFrontier_ReceptionGate_Text_Level50Info: @ 8266F69
 	.string "To begin, we hope you will challenge\n"
 	.string "this course.$"
 
-BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
+BattleFrontier_ReceptionGate_Text_OpenLevelInfo:
 	.string "The Open Level course places no limit\n"
 	.string "on the levels of POKéMON entering\l"
 	.string "challenges.\p"
@@ -451,7 +451,7 @@ BattleFrontier_ReceptionGate_Text_OpenLevelInfo: @ 8267080
 	.string "However, no TRAINER you face will\n"
 	.string "have any POKéMON below Level 60.$"
 
-BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
+BattleFrontier_ReceptionGate_Text_MonEntryInfo:
 	.string "Virtually any kind of POKéMON may take\n"
 	.string "on the challenges at all facilities.\p"
 	.string "EGGS and certain kinds of POKéMON,\n"
@@ -462,7 +462,7 @@ BattleFrontier_ReceptionGate_Text_MonEntryInfo: @ 826716A
 	.string "of the same kind of POKéMON are not\l"
 	.string "permitted.$"
 
-BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
+BattleFrontier_ReceptionGate_Text_HoldItemsInfo:
 	.string "When entering a challenge at a BATTLE\n"
 	.string "FRONTIER facility, POKéMON may not\l"
 	.string "be holding the same kind of item.\p"
@@ -470,13 +470,13 @@ BattleFrontier_ReceptionGate_Text_HoldItemsInfo: @ 8267298
 	.string "entering a challenge are holding\l"
 	.string "different items.$"
 
-BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass: @ 8267357
+BattleFrontier_ReceptionGate_Text_YourGuideToFrontierPass:
 	.string "I'm your guide to the FRONTIER PASS.$"
 
-BattleFrontier_ReceptionGate_Text_LearnAboutWhich1: @ 826737C
+BattleFrontier_ReceptionGate_Text_LearnAboutWhich1:
 	.string "Which would you like to learn about?$"
 
-BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
+BattleFrontier_ReceptionGate_Text_SymbolsInfo:
 	.string "There are seven facilities at\n"
 	.string "the BATTLE FRONTIER.\p"
 	.string "TRAINERS who gain recognition for\n"
@@ -488,7 +488,7 @@ BattleFrontier_ReceptionGate_Text_SymbolsInfo: @ 82673A1
 	.string "It's certainly not easy to win symbols.\n"
 	.string "I wish you the best of luck!$"
 
-BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
+BattleFrontier_ReceptionGate_Text_RecordedBattleInfo:
 	.string "It is possible to record one battle\n"
 	.string "on your FRONTIER PASS.\p"
 	.string "You may record a battle you had with\n"
@@ -500,7 +500,7 @@ BattleFrontier_ReceptionGate_Text_RecordedBattleInfo: @ 82674F3
 	.string "You may choose to record your match\n"
 	.string "at the end of a battle.$"
 
-BattleFrontier_ReceptionGate_Text_BattlePointsInfo: @ 826761C
+BattleFrontier_ReceptionGate_Text_BattlePointsInfo:
 	.string "Battle Points are rewards given to\n"
 	.string "TRAINERS who battled outstandingly\l"
 	.string "at the BATTLE FRONTIER.\p"

data/maps/BattleFrontier_ScottsHouse/scripts.inc

@@ -1,9 +1,9 @@
 .set LOCALID_SCOTT, 1
 
-BattleFrontier_ScottsHouse_MapScripts:: @ 82636A7
+BattleFrontier_ScottsHouse_MapScripts::
 	.byte 0
 
-BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
+BattleFrontier_ScottsHouse_EventScript_Scott::
 	lock
 	faceplayer
 	goto_if_set FLAG_TEMP_4, BattleFrontier_ScottsHouse_EventScript_GivenBerry
@@ -12,20 +12,20 @@ BattleFrontier_ScottsHouse_EventScript_Scott:: @ 82636A8
 	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveItems
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveItems:: @ 82636CB
+BattleFrontier_ScottsHouse_EventScript_CheckGiveItems::
 	goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier
 	goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols
 	goto_if_unset FLAG_COLLECTED_ALL_GOLD_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols
 	goto BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveShield:: @ 82636EC
+BattleFrontier_ScottsHouse_EventScript_CheckGiveShield::
 	goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield
 	goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
+BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols::
 	goto_if_unset FLAG_SYS_TOWER_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_DOME_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PALACE_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
@@ -42,7 +42,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols:: @ 8263704
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
+BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols::
 	goto_if_unset FLAG_SYS_TOWER_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_DOME_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
 	goto_if_unset FLAG_SYS_PALACE_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
@@ -59,17 +59,17 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols:: @ 826376A
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_BerryPocketFull:: @ 82637D0
+BattleFrontier_ScottsHouse_EventScript_BerryPocketFull::
 	msgbox BattleFrontier_ScottsHouse_Text_BerryPocketStuffed, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenBerry:: @ 82637DA
+BattleFrontier_ScottsHouse_EventScript_GivenBerry::
 	msgbox BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
+BattleFrontier_ScottsHouse_EventScript_RandomComment::
 	random 3
 	compare VAR_RESULT, 1
 	goto_if_eq BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment
@@ -79,17 +79,17 @@ BattleFrontier_ScottsHouse_EventScript_RandomComment:: @ 82637E4
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment:: @ 8263807
+BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment::
 	msgbox BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment:: @ 8263811
+BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment::
 	msgbox BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
+BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	tower_get TOWER_DATA_WIN_STREAK
@@ -102,7 +102,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield:: @ 826381B
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
+BattleFrontier_ScottsHouse_EventScript_GiveSilverShield::
 	msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
 	givedecoration DECOR_SILVER_SHIELD
 	compare VAR_RESULT, FALSE
@@ -112,17 +112,17 @@ BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: @ 826387A
 	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_NoRoomForShield:: @ 82638A0
+BattleFrontier_ScottsHouse_EventScript_NoRoomForShield::
 	msgbox BattleFrontier_ScottsHouse_Text_ComeBackForThisLater, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenShield:: @ 82638AA
+BattleFrontier_ScottsHouse_EventScript_GivenShield::
 	msgbox BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
+BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield::
 	setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
 	frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
 	tower_get TOWER_DATA_WIN_STREAK
@@ -135,7 +135,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield:: @ 82638B4
 	goto BattleFrontier_ScottsHouse_EventScript_RandomComment
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
+BattleFrontier_ScottsHouse_EventScript_GiveGoldShield::
 	msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
 	givedecoration DECOR_GOLD_SHIELD
 	compare VAR_RESULT, FALSE
@@ -145,12 +145,12 @@ BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: @ 8263913
 	goto BattleFrontier_ScottsHouse_EventScript_GivenShield
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints:: @ 8263939
+BattleFrontier_ScottsHouse_EventScript_GivenBattlePoints::
 	msgbox BattleFrontier_ScottsHouse_Text_ExpectingGreatThings, MSGBOX_DEFAULT
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
+BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier::
 	msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
 	closemessage
 	delay 30
@@ -175,31 +175,31 @@ BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier:: @ 8263943
 	goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints:: @ 82639BC
+BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints::
 	buffernumberstring 0, 4
 	setvar VAR_0x8004, 4
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints:: @ 82639CB
+BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints::
 	buffernumberstring 0, 3
 	setvar VAR_0x8004, 3
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints:: @ 82639DA
+BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints::
 	buffernumberstring 0, 2
 	setvar VAR_0x8004, 2
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint:: @ 82639E9
+BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint::
 	buffernumberstring 0, 1
 	setvar VAR_0x8004, 1
 	goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
 	end
 
-BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
+BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints::
 	special GiveFrontierBattlePoints
 	msgbox BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
 	msgbox BattleFrontier_ScottsHouse_Text_ExplainBattlePoints, MSGBOX_DEFAULT
@@ -208,27 +208,27 @@ BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints:: @ 82639F8
 	release
 	end
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: @ 8263A13
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: @ 8263A1E
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: @ 8263A29
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: @ 8263A34
+BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest::
 	applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
+BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier:
 	.string "SCOTT: Well, hello and welcome!\n"
 	.string "Heheh… Sorry about the cramped space.\p"
 	.string "Anyway, {PLAYER}{KUN}, let me formally\n"
@@ -237,7 +237,7 @@ BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier: @ 8263A3F
 	.string "It took me years and years, but I've\l"
 	.string "finally given shape to my dream.$"
 
-BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
+BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal:
 	.string "On reflection, it was a terribly long\n"
 	.string "journey…\p"
 	.string "I left home alone on a quest to find\n"
@@ -245,7 +245,7 @@ BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal: @ 8263B29
 	.string "No one can imagine how much effort\n"
 	.string "or time it took to make this real.$"
 
-BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
+BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing:
 	.string "But that's all in the past.\n"
 	.string "No point dwelling on that!\p"
 	.string "All I want for you is to enjoy battling\n"
@@ -254,11 +254,11 @@ BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing: @ 8263BD4
 	.string "as a memento for all the time our\l"
 	.string "paths crossed on our journeys.$"
 
-BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints: @ 8263CB0
+BattleFrontier_ScottsHouse_Text_ObtainedXBattlePoints:
 	.string "{PLAYER} obtained\n"
 	.string "{STR_VAR_1} Battle Point(s).$"
 
-BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
+BattleFrontier_ScottsHouse_Text_ExplainBattlePoints:
 	.string "SCOTT: You can check your Battle\n"
 	.string "Points on your FRONTIER PASS.\p"
 	.string "The more success you have here at\n"
@@ -267,10 +267,10 @@ BattleFrontier_ScottsHouse_Text_ExplainBattlePoints: @ 8263CD0
 	.string "Use your Battle Points the way you\n"
 	.string "see fit, like trading them for items.$"
 
-BattleFrontier_ScottsHouse_Text_ExpectingGreatThings: @ 8263DB8
+BattleFrontier_ScottsHouse_Text_ExpectingGreatThings:
 	.string "I'm expecting great things from you!$"
 
-BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
+BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers:
 	.string "SCOTT: Every TRAINER is an individual.\n"
 	.string "They all lead lives of their own.\p"
 	.string "But when they're in a battle,\n"
@@ -282,7 +282,7 @@ BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers: @ 8263DDD
 	.string "TRAINERS who are serious about\l"
 	.string "battling, and invite them here.$"
 
-BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
+BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain:
 	.string "SCOTT: Have you met any of\n"
 	.string "the FRONTIER BRAINS?\p"
 	.string "Better yet, have you obtained any\n"
@@ -292,7 +292,7 @@ BattleFrontier_ScottsHouse_Text_HaveYouMetFrontierBrain: @ 8263F12
 	.string "But I'm sure that seeing how tough\n"
 	.string "you are will startle even them!$"
 
-BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
+BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier:
 	.string "SCOTT: You don't just train for battle,\n"
 	.string "right?\p"
 	.string "I think I remember you working on\n"
@@ -302,7 +302,7 @@ BattleFrontier_ScottsHouse_Text_MayFindWildMonsInFrontier: @ 8263FFE
 	.string "the BATTLE FRONTIER somewhere…\l"
 	.string "Fufufu!$"
 
-BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols:
 	.string "SCOTT: Are you enjoying things in\n"
 	.string "the BATTLE FRONTIER?\p"
 	.string "…Wait a second…\n"
@@ -317,7 +317,7 @@ BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols: @ 82640BC
 	.string "I want you to have this.\n"
 	.string "I'm sure you can put it to proper use.$"
 
-BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
+BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols:
 	.string "SCOTT: I hope you're enjoying\n"
 	.string "everything in the BATTLE FRONTIER.\p"
 	.string "…Wait a second…\n"
@@ -332,35 +332,35 @@ BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols: @ 8264216
 	.string "I think you will be able to\n"
 	.string "appreciate the value of my gift!$"
 
-BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere: @ 8264373
+BattleFrontier_ScottsHouse_Text_SoGladIBroughtYouHere:
 	.string "I must say I have the gift of knowing\n"
 	.string "a good TRAINER when I see one.\p"
 	.string "I'm so glad I had the foresight to\n"
 	.string "bring you here!$"
 
-BattleFrontier_ScottsHouse_Text_BerryPocketStuffed: @ 82643EB
+BattleFrontier_ScottsHouse_Text_BerryPocketStuffed:
 	.string "Your BERRY POCKET seems to\n"
 	.string "be stuffed.$"
 
-BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow: @ 8264412
+BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow:
 	.string "SCOTT: Oh, I heard about you!\n"
 	.string "How you ruled the BATTLE TOWER!\l"
 	.string "You beat over 50 TRAINERS in a row?\p"
 	.string "That's fantastic!\n"
 	.string "I want you to have this!$"
 
-BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow: @ 826449F
+BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow:
 	.string "SCOTT: Oh, my! I heard about you!\n"
 	.string "How you overwhelmed the BATTLE TOWER!\l"
 	.string "You beat over 100 TRAINERS in a row?\p"
 	.string "That's ridiculously spectacular!\n"
 	.string "You've got to have this!$"
 
-BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings: @ 8264546
+BattleFrontier_ScottsHouse_Text_ExpectingToHearEvenGreaterThings:
 	.string "I'll be expecting to hear even greater\n"
 	.string "things about you now!$"
 
-BattleFrontier_ScottsHouse_Text_ComeBackForThisLater: @ 8264583
+BattleFrontier_ScottsHouse_Text_ComeBackForThisLater:
 	.string "Oops, well, if you have too much\n"
 	.string "stuff, come back for this later.$"
 

data/maps/BattlePyramidSquare01/scripts.inc

@@ -1,2 +1,2 @@
-BattlePyramidSquare01_MapScripts:: @ 823D1A5
+BattlePyramidSquare01_MapScripts::
 	.byte 0

data/maps/BirthIsland_Exterior/scripts.inc

@@ -1,17 +1,18 @@
-.set LOCALID_DEOXYS_ROCK, 1
 .set LOCALID_DEOXYS, 2
 
-BirthIsland_Exterior_MapScripts:: @ 8267F15
+@ Note: LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK is a local id for this map used elsewhere. It's defined in event_objects.h
+
+BirthIsland_Exterior_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, BirthIsland_Exterior_OnTransition
 	map_script MAP_SCRIPT_ON_RESUME, BirthIsland_Exterior_OnResume
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, BirthIsland_Exterior_OnReturnToField
 	.byte 0
 
-BirthIsland_Exterior_OnReturnToField: @ 8267F25
+BirthIsland_Exterior_OnReturnToField:
 	special SetDeoxysRockPalette
 	end
 
-BirthIsland_Exterior_OnTransition: @ 8267F29
+BirthIsland_Exterior_OnTransition:
 	setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS
 	setvar VAR_OBJ_GFX_ID_0, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	setvar VAR_DEOXYS_ROCK_STEP_COUNT, 0
@@ -20,29 +21,29 @@ BirthIsland_Exterior_OnTransition: @ 8267F29
 	call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle
 	end
 
-BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle:: @ 8267F4E
+BirthIsland_Exterior_EventScript_HideDeoxysAndPuzzle::
 	setflag FLAG_HIDE_DEOXYS
 	setflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	return
 
-BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle:: @ 8267F55
+BirthIsland_Exterior_EventScript_TryShowDeoxysPuzzle::
 	goto_if_set FLAG_DEFEATED_DEOXYS, Common_EventScript_NopReturn
 	clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE
 	clearflag FLAG_DEOXYS_ROCK_COMPLETE
 	return
 
-BirthIsland_Exterior_OnResume: @ 8267F65
+BirthIsland_Exterior_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, BirthIsland_Exterior_EventScript_TryRemoveDeoxys
 	end
 
-BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: @ 8267F6F
+BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject LOCALID_DEOXYS
 	return
 
-BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
+BirthIsland_Exterior_EventScript_Triangle::
 	lock
 	faceplayer
 	special DoDeoxysRockInteraction
@@ -54,25 +55,25 @@ BirthIsland_Exterior_EventScript_Triangle:: @ 8267F83
 	case 3, BirthIsland_Exterior_EventScript_NotSolved3
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved1:: @ 8267FBB
+BirthIsland_Exterior_EventScript_NotSolved1::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved2:: @ 8267FBD
+BirthIsland_Exterior_EventScript_NotSolved2::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_NotSolved3:: @ 8267FBF
+BirthIsland_Exterior_EventScript_NotSolved3::
 	release
 	end
 
-BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
+BirthIsland_Exterior_EventScript_Deoxys::
 	waitse
-	setfieldeffectargument 0, LOCALID_DEOXYS_ROCK
+	setfieldeffectargument 0, LOCALID_BIRTH_ISLAND_EXTERIOR_ROCK
-	setfieldeffectargument 1, 58
+	setfieldeffectargument 1, MAP_NUM(BIRTH_ISLAND_EXTERIOR)
-	setfieldeffectargument 2, 26
+	setfieldeffectargument 2, MAP_GROUP(BIRTH_ISLAND_EXTERIOR)
 	dofieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
-	playbgm MUS_RG_ENCOUNTER_DEOXYS, 0
+	playbgm MUS_RG_ENCOUNTER_DEOXYS, FALSE
 	waitfieldeffect FLDEFF_DESTROY_DEOXYS_ROCK
 	addobject LOCALID_DEOXYS
 	applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
@@ -101,18 +102,18 @@ BirthIsland_Exterior_EventScript_Deoxys:: @ 8267FC1
 	release
 	end
 
-BirthIsland_Exterior_EventScript_DefeatedDeoxys:: @ 826803B
+BirthIsland_Exterior_EventScript_DefeatedDeoxys::
 	setflag FLAG_DEFEATED_DEOXYS
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_EventScript_RanFromDeoxys:: @ 8268049
+BirthIsland_Exterior_EventScript_RanFromDeoxys::
 	setvar VAR_0x8004, SPECIES_DEOXYS
 	goto Common_EventScript_LegendaryFlewAway
 	end
 
-BirthIsland_Exterior_Movement_DeoxysApproach: @ 8268054
+BirthIsland_Exterior_Movement_DeoxysApproach:
 	walk_slow_down
 	walk_slow_down
 	walk_slow_down

data/maps/BirthIsland_Harbor/scripts.inc

@@ -1,10 +1,10 @@
 .set LOCALID_SAILOR, 1
 .set LOCALID_SS_TIDAL, 2
 
-BirthIsland_Harbor_MapScripts:: @ 826805C
+BirthIsland_Harbor_MapScripts::
 	.byte 0
 
-BirthIsland_Harbor_EventScript_Sailor:: @ 826805D
+BirthIsland_Harbor_EventScript_Sailor::
 	lock
 	faceplayer
 	msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO
@@ -23,7 +23,7 @@ BirthIsland_Harbor_EventScript_Sailor:: @ 826805D
 	release
 	end
 
-BirthIsland_Harbor_EventScript_AsYouLike:: @ 82680A2
+BirthIsland_Harbor_EventScript_AsYouLike::
 	msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
 	release
 	end

data/maps/CaveOfOrigin_1F/scripts.inc

@@ -1,7 +1,7 @@
-CaveOfOrigin_1F_MapScripts:: @ 8235768
+CaveOfOrigin_1F_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_1F_OnTransition
 	.byte 0
 
-CaveOfOrigin_1F_OnTransition: @ 823576E
+CaveOfOrigin_1F_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end

data/maps/CaveOfOrigin_B1F/scripts.inc

@@ -1,9 +1,9 @@
 .set LOCALID_WALLACE, 1
 
-CaveOfOrigin_B1F_MapScripts:: @ 82357A8
+CaveOfOrigin_B1F_MapScripts::
 	.byte 0
 
-CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
+CaveOfOrigin_B1F_EventScript_Wallace::
 	lock
 	faceplayer
 	msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT
@@ -23,7 +23,7 @@ CaveOfOrigin_B1F_EventScript_Wallace:: @ 82357A9
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
+CaveOfOrigin_B1F_EventScript_WheresRayquaza::
 	multichoice 0, 0, MULTI_WHERES_RAYQUAZA, FALSE
 	switch VAR_RESULT
 	case 0, CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin
@@ -33,22 +33,22 @@ CaveOfOrigin_B1F_EventScript_WheresRayquaza:: @ 82357F0
 	goto CaveOfOrigin_B1F_EventScript_DontRemember
 	end
 
-CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin:: @ 823582C
+CaveOfOrigin_B1F_EventScript_AtCaveOfOrigin::
 	message CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_AtMtPyre:: @ 8235837
+CaveOfOrigin_B1F_EventScript_AtMtPyre::
 	message CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_DontRemember:: @ 8235842
+CaveOfOrigin_B1F_EventScript_DontRemember::
 	message CaveOfOrigin_B1F_Text_CantYouRememberSomehow
 	waitmessage
 	goto CaveOfOrigin_B1F_EventScript_WheresRayquaza
 
-CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
+CaveOfOrigin_B1F_EventScript_AtSkyPillar::
 	msgbox CaveOfOrigin_B1F_Text_WellHeadToSkyPillar, MSGBOX_DEFAULT
 	closemessage
 	playse SE_EXIT
@@ -61,7 +61,7 @@ CaveOfOrigin_B1F_EventScript_AtSkyPillar:: @ 823584D
 	release
 	end
 
-CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E
+CaveOfOrigin_B1F_Text_WallaceStory:
 	.string "Ah, so you are {PLAYER}{KUN}?\n"
 	.string "I've heard tales of your exploits.\p"
 	.string "My name is WALLACE.\p"
@@ -85,19 +85,19 @@ CaveOfOrigin_B1F_Text_WallaceStory: @ 823586E
 	.string "But even I have no clue as to\n"
 	.string "RAYQUAZA's whereabouts…$"
 
-CaveOfOrigin_B1F_Text_WhereIsRayquaza: @ 8235ACE
+CaveOfOrigin_B1F_Text_WhereIsRayquaza:
 	.string "WALLACE: {PLAYER}{KUN}, do you perhaps\n"
 	.string "know where RAYQUAZA is now?\p"
 	.string "If you do, please tell me.$"
 
-CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin: @ 8235B23
+CaveOfOrigin_B1F_Text_ButWereInCaveOfOrigin:
 	.string "WALLACE: The CAVE OF ORIGIN?\p"
 	.string "But that's right here!\n"
 	.string "I need you to do better than that!\p"
 	.string "Please, I need you to think about\n"
 	.string "where RAYQUAZA might be right now.$"
 
-CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF
+CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat:
 	.string "WALLACE: MT. PYRE?\p"
 	.string "But when I met the old lady there\n"
 	.string "earlier, she made no mention of it.\p"
@@ -106,12 +106,12 @@ CaveOfOrigin_B1F_Text_OldLadyDidntMentionThat: @ 8235BBF
 	.string "{PLAYER}{KUN}, could you think about this\n"
 	.string "more carefully for me?$"
 
-CaveOfOrigin_B1F_Text_CantYouRememberSomehow: @ 8235C99
+CaveOfOrigin_B1F_Text_CantYouRememberSomehow:
 	.string "WALLACE: Huh? You don't remember?\n"
 	.string "Hmm… That's a problem…\p"
 	.string "Can't you remember somehow?$"
 
-CaveOfOrigin_B1F_Text_WellHeadToSkyPillar: @ 8235CEE
+CaveOfOrigin_B1F_Text_WellHeadToSkyPillar:
 	.string "WALLACE: The SKY PILLAR?\p"
 	.string "That's it!\n"
 	.string "It must be the SKY PILLAR!\p"

data/maps/CaveOfOrigin_Entrance/scripts.inc

@@ -1,8 +1,8 @@
-CaveOfOrigin_Entrance_MapScripts:: @ 8235759
+CaveOfOrigin_Entrance_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, CaveOfOrigin_Entrance_OnResume
 	.byte 0
 
-CaveOfOrigin_Entrance_OnResume: @ 823575F
+CaveOfOrigin_Entrance_OnResume:
 	setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17
 	end
 

data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc

@@ -1,7 +1,7 @@
-CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778
+CaveOfOrigin_UnusedRubySapphireMap1_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap1_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap1_OnTransition: @ 823577E
+CaveOfOrigin_UnusedRubySapphireMap1_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end

data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc

@@ -1,8 +1,8 @@
-CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788
+CaveOfOrigin_UnusedRubySapphireMap2_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap2_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap2_OnTransition: @ 823578E
+CaveOfOrigin_UnusedRubySapphireMap2_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
 

data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc

@@ -1,8 +1,8 @@
-CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798
+CaveOfOrigin_UnusedRubySapphireMap3_MapScripts::
 	map_script MAP_SCRIPT_ON_TRANSITION, CaveOfOrigin_UnusedRubySapphireMap3_OnTransition
 	.byte 0
 
-CaveOfOrigin_UnusedRubySapphireMap3_OnTransition: @ 823579E
+CaveOfOrigin_UnusedRubySapphireMap3_OnTransition:
 	call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_EventScript_DisableTriggers
 	end
 

data/maps/ContestHall/scripts.inc

@@ -1,4 +1,4 @@
-ContestHall_MapScripts:: @ 823B781
+ContestHall_MapScripts::
 	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, ContestHall_OnWarp
 	map_script MAP_SCRIPT_ON_FRAME_TABLE, ContestHall_OnFrame
 	map_script MAP_SCRIPT_ON_TRANSITION, ContestHall_OnTransition
@@ -6,17 +6,17 @@ ContestHall_MapScripts:: @ 823B781
 	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, ContestHall_OnReturn
 	.byte 0
 
-ContestHall_OnReturn: @ 823B79B
+ContestHall_OnReturn:
 	special LoadLinkContestPlayerPalettes
 	end
 
-ContestHall_OnTransition: @ 823B79F
+ContestHall_OnTransition:
 	call ContestHall_EventScript_ReadyContestMusic
 	setvar VAR_TEMP_0, 1
 	call ContestHall_EventScript_AddRandomAudienceMembers
 	end
 
-ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
+ContestHall_EventScript_ReadyContestMusic::
 	call ContestHall_EventScript_TryWaitForLink
 	special GetContestMultiplayerId
 	compare VAR_RESULT, 0
@@ -31,49 +31,49 @@ ContestHall_EventScript_ReadyContestMusic:: @ 823B7AF
 	call_if_eq ContestHall_EventScript_SaveContestMusic
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer1:: @ 823B7EF
+ContestHall_EventScript_SaveContestMusicPlayer1::
 	savebgm MUS_LINK_CONTEST_P1
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer2:: @ 823B7F3
+ContestHall_EventScript_SaveContestMusicPlayer2::
 	savebgm MUS_LINK_CONTEST_P2
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer3:: @ 823B7F7
+ContestHall_EventScript_SaveContestMusicPlayer3::
 	savebgm MUS_LINK_CONTEST_P3
 	return
 
-ContestHall_EventScript_SaveContestMusicPlayer4:: @ 823B7FB
+ContestHall_EventScript_SaveContestMusicPlayer4::
 	savebgm MUS_LINK_CONTEST_P4
 	return
 
-ContestHall_EventScript_SaveContestMusic:: @ 823B7FF
+ContestHall_EventScript_SaveContestMusic::
 	savebgm MUS_CONTEST
 	return
 
-ContestHall_OnResume: @ 823B803
+ContestHall_OnResume:
 	compare VAR_TEMP_9, 1
 	call_if_eq ContestHall_EventScript_ReShowAudience
 	end
 
-ContestHall_EventScript_ReShowAudience:: @ 823B80F
+ContestHall_EventScript_ReShowAudience::
 	call ContestHall_EventScript_CreateAudience
 	return
 
-ContestHall_OnFrame: @ 823B815
+ContestHall_OnFrame:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_Contest
 	.2byte 0
 
-ContestHall_OnWarp: @ 823B81F
+ContestHall_OnWarp:
 	map_script_2 VAR_CONTEST_HALL_STATE, 1, ContestHall_EventScript_SetContestObjects
 	.2byte 0
 
-ContestHall_EventScript_Contest:: @ 823B829
+ContestHall_EventScript_Contest::
 	call ContestHall_EventScript_DoContest
 	call ContestHall_EventScript_SetExitWarp
 	end
 
-ContestHall_EventScript_SetContestObjects:: @ 823B834
+ContestHall_EventScript_SetContestObjects::
 	special LoadLinkContestPlayerPalettes
 	hideobjectat OBJ_EVENT_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	call ContestHall_EventScript_CreateAudience
@@ -81,14 +81,14 @@ ContestHall_EventScript_SetContestObjects:: @ 823B834
 
 @ There are 8 audience member object events, 7 of which are given random gfx below (the 8th is the Artist)
 @ The rest of the audience is created statically by ContestHall_EventScript_CreateAudience
-ContestHall_EventScript_AddRandomAudienceMembers:: @ 823B842
+ContestHall_EventScript_AddRandomAudienceMembers::
 	call ContestHall_EventScript_GetRandomAudienceGfxId
 	call ContestHall_EventScript_SetRandomAudienceGfx
 	compare VAR_TEMP_0, 8
 	goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
 	return
 
-ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
+ContestHall_EventScript_SetRandomAudienceGfx::
 	switch VAR_TEMP_0
 	case 1, ContestHall_EventScript_SetRandomAudience1
 	case 2, ContestHall_EventScript_SetRandomAudience2
@@ -99,42 +99,42 @@ ContestHall_EventScript_SetRandomAudienceGfx:: @ 823B858
 	case 7, ContestHall_EventScript_SetRandomAudience7
 	end
 
-ContestHall_EventScript_SetRandomAudience1:: @ 823B8AB
+ContestHall_EventScript_SetRandomAudience1::
 	copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience2:: @ 823B8B6
+ContestHall_EventScript_SetRandomAudience2::
 	copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience3:: @ 823B8C1
+ContestHall_EventScript_SetRandomAudience3::
 	copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience4:: @ 823B8CC
+ContestHall_EventScript_SetRandomAudience4::
 	copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience5:: @ 823B8D7
+ContestHall_EventScript_SetRandomAudience5::
 	copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience6:: @ 823B8E2
+ContestHall_EventScript_SetRandomAudience6::
 	copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_SetRandomAudience7:: @ 823B8ED
+ContestHall_EventScript_SetRandomAudience7::
 	copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1
 	addvar VAR_TEMP_0, 1
 	return
 
-ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
+ContestHall_EventScript_GetRandomAudienceGfxId::
 	setvar VAR_RESULT, 32
 	special GenerateContestRand
 	addvar VAR_RESULT, 1
@@ -173,135 +173,135 @@ ContestHall_EventScript_GetRandomAudienceGfxId:: @ 823B8F8
 	case 32, ContestHall_EventScript_RandomAudienceScientist1
 	end
 
-ContestHall_EventScript_RandomAudienceNinjaBoy:: @ 823BA6B
+ContestHall_EventScript_RandomAudienceNinjaBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_NINJA_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceTwin:: @ 823BA71
+ContestHall_EventScript_RandomAudienceTwin::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_TWIN
 	return
 
-ContestHall_EventScript_RandomAudienceBoy1:: @ 823BA77
+ContestHall_EventScript_RandomAudienceBoy1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_1
 	return
 
-ContestHall_EventScript_RandomAudienceGirl1:: @ 823BA7D
+ContestHall_EventScript_RandomAudienceGirl1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_1
 	return
 
-ContestHall_EventScript_RandomAudienceGirl2:: @ 823BA83
+ContestHall_EventScript_RandomAudienceGirl2::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_2
 	return
 
-ContestHall_EventScript_RandomAudienceLittleBoy:: @ 823BA89
+ContestHall_EventScript_RandomAudienceLittleBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceGirl:: @ 823BA8F
+ContestHall_EventScript_RandomAudienceGirl::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LITTLE_GIRL
 	return
 
-ContestHall_EventScript_RandomAudienceBoy3:: @ 823BA95
+ContestHall_EventScript_RandomAudienceBoy3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BOY_3
 	return
 
-ContestHall_EventScript_RandomAudienceGirl3:: @ 823BA9B
+ContestHall_EventScript_RandomAudienceGirl3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_GIRL_3
 	return
 
-ContestHall_EventScript_RandomAudienceRichBoy:: @ 823BAA1
+ContestHall_EventScript_RandomAudienceRichBoy::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_RICH_BOY
 	return
 
-ContestHall_EventScript_RandomAudienceFatMan:: @ 823BAA7
+ContestHall_EventScript_RandomAudienceFatMan::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_FAT_MAN
 	return
 
-ContestHall_EventScript_RandomAudiencePokefanF:: @ 823BAAD
+ContestHall_EventScript_RandomAudiencePokefanF::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_F
 	return
 
-ContestHall_EventScript_RandomAudienceMan1:: @ 823BAB3
+ContestHall_EventScript_RandomAudienceMan1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_1
 	return
 
-ContestHall_EventScript_RandomAudienceWoman2:: @ 823BAB9
+ContestHall_EventScript_RandomAudienceWoman2::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_2
 	return
 
-ContestHall_EventScript_RandomAudienceExpertM:: @ 823BABF
+ContestHall_EventScript_RandomAudienceExpertM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_M
 	return
 
-ContestHall_EventScript_RandomAudienceExpertF:: @ 823BAC5
+ContestHall_EventScript_RandomAudienceExpertF::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_EXPERT_F
 	return
 
-ContestHall_EventScript_RandomAudiencePokefanM:: @ 823BACB
+ContestHall_EventScript_RandomAudiencePokefanM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_POKEFAN_M
 	return
 
-ContestHall_EventScript_RandomAudienceWoman4:: @ 823BAD1
+ContestHall_EventScript_RandomAudienceWoman4::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_4
 	return
 
-ContestHall_EventScript_RandomAudienceCook:: @ 823BAD7
+ContestHall_EventScript_RandomAudienceCook::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_COOK
 	return
 
-ContestHall_EventScript_RandomAudienceLass:: @ 823BADD
+ContestHall_EventScript_RandomAudienceLass::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_LASS
 	return
 
-ContestHall_EventScript_RandomAudienceOldWoman:: @ 823BAE3
+ContestHall_EventScript_RandomAudienceOldWoman::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_OLD_WOMAN
 	return
 
-ContestHall_EventScript_RandomAudienceCamper:: @ 823BAE9
+ContestHall_EventScript_RandomAudienceCamper::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_CAMPER
 	return
 
-ContestHall_EventScript_RandomAudiencePicnicker:: @ 823BAEF
+ContestHall_EventScript_RandomAudiencePicnicker::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_PICNICKER
 	return
 
-ContestHall_EventScript_RandomAudienceMan3:: @ 823BAF5
+ContestHall_EventScript_RandomAudienceMan3::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_MAN_3
 	return
 
-ContestHall_EventScript_RandomAudienceWoman5:: @ 823BAFB
+ContestHall_EventScript_RandomAudienceWoman5::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_WOMAN_5
 	return
 
-ContestHall_EventScript_RandomAudienceYoungster:: @ 823BB01
+ContestHall_EventScript_RandomAudienceYoungster::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_YOUNGSTER
 	return
 
-ContestHall_EventScript_RandomAudienceBugCatcher:: @ 823BB07
+ContestHall_EventScript_RandomAudienceBugCatcher::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BUG_CATCHER
 	return
 
-ContestHall_EventScript_RandomAudiencePsychicM:: @ 823BB0D
+ContestHall_EventScript_RandomAudiencePsychicM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_PSYCHIC_M
 	return
 
-ContestHall_EventScript_RandomAudienceSchoolKidM:: @ 823BB13
+ContestHall_EventScript_RandomAudienceSchoolKidM::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCHOOL_KID_M
 	return
 
-ContestHall_EventScript_RandomAudienceBlackBelt:: @ 823BB19
+ContestHall_EventScript_RandomAudienceBlackBelt::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BLACK_BELT
 	return
 
-ContestHall_EventScript_RandomAudienceBeauty:: @ 823BB1F
+ContestHall_EventScript_RandomAudienceBeauty::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_BEAUTY
 	return
 
-ContestHall_EventScript_RandomAudienceScientist1:: @ 823BB25
+ContestHall_EventScript_RandomAudienceScientist1::
 	setvar VAR_TEMP_1, OBJ_EVENT_GFX_SCIENTIST_1
 	return
 
-ContestHall_EventScript_CreateAudience:: @ 823BB2B
+ContestHall_EventScript_CreateAudience::
 	specialvar VAR_RESULT, IsWirelessContest
 	compare VAR_RESULT, TRUE
 	goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
@@ -313,12 +313,12 @@ ContestHall_EventScript_CreateAudience:: @ 823BB2B
 	case CONTEST_TYPE_LINK, ContestHall_EventScript_CreateMasterContestAudience
 	return
 
-ContestHall_EventScript_CreateNormalContestAudience:: @ 823BB78
+ContestHall_EventScript_CreateNormalContestAudience::
 	createvobject OBJ_EVENT_GFX_NINJA_BOY, 20, 3, 2, 3, DIR_SOUTH
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
+ContestHall_EventScript_CreateSuperContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -331,7 +331,7 @@ ContestHall_EventScript_CreateSuperContestAudience:: @ 823BB8B
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
+ContestHall_EventScript_CreateHyperContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -353,7 +353,7 @@ ContestHall_EventScript_CreateHyperContestAudience:: @ 823BBE6
 	createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
 	return
 
-ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
+ContestHall_EventScript_CreateMasterContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -383,7 +383,7 @@ ContestHall_EventScript_CreateMasterContestAudience:: @ 823BC92
 	createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 11, 9, 3, DIR_NORTH
 	return
 
-ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
+ContestHall_EventScript_CreateWirelessContestAudience::
 	createvobject OBJ_EVENT_GFX_BEAUTY, 0, 2, 3, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_MAN_5, 1, 2, 4, 3, DIR_EAST
 	createvobject OBJ_EVENT_GFX_HIKER, 2, 2, 7, 3, DIR_EAST
@@ -407,7 +407,7 @@ ContestHall_EventScript_CreateWirelessContestAudience:: @ 823BD86
 	createvobject OBJ_EVENT_GFX_SCIENTIST_1, 24, 11, 2, 3, DIR_SOUTH
 	return
 
-ContestHall_EventScript_SetExitWarp:: @ 823BE44
+ContestHall_EventScript_SetExitWarp::
 	special ClearLinkContestFlags
 	switch VAR_CONTEST_TYPE
 	case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_SetExitWarpNormalContest
@@ -417,32 +417,32 @@ ContestHall_EventScript_SetExitWarp:: @ 823BE44
 	case CONTEST_TYPE_LINK, ContestHall_EventScript_SetExitWarpLinkContest
 	return
 
-ContestHall_EventScript_SetExitWarpNormalContest:: @ 823BE84
+ContestHall_EventScript_SetExitWarpNormalContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpSuperContest:: @ 823BE8E
+ContestHall_EventScript_SetExitWarpSuperContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpHyperContest:: @ 823BE98
+ContestHall_EventScript_SetExitWarpHyperContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpMasterContest:: @ 823BEA2
+ContestHall_EventScript_SetExitWarpMasterContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4
 	waitstate
 	end
 
-ContestHall_EventScript_SetExitWarpLinkContest:: @ 823BEAC
+ContestHall_EventScript_SetExitWarpLinkContest::
 	warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4
 	waitstate
 	end
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfx::
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
@@ -450,11 +450,11 @@ LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: @ 823BEB6
 	goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: @ 823BECE
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay:: @ 823BED4
+LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay::
 	setvar VAR_OBJ_GFX_ID_3, OBJ_EVENT_GFX_RIVAL_MAY_NORMAL
 	return
 

data/maps/DesertRuins/scripts.inc

@@ -1,25 +1,25 @@
-DesertRuins_MapScripts:: @ 822D95B
+DesertRuins_MapScripts::
 	map_script MAP_SCRIPT_ON_RESUME, DesertRuins_OnResume
 	map_script MAP_SCRIPT_ON_LOAD, DesertRuins_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, DesertRuins_OnTransition
 	.byte 0
 
-DesertRuins_OnResume: @ 822D96B
+DesertRuins_OnResume:
 	call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_TryRemoveRegirock
 	end
 
-DesertRuins_EventScript_TryRemoveRegirock:: @ 822D975
+DesertRuins_EventScript_TryRemoveRegirock::
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
 	removeobject VAR_LAST_TALKED
 	return
 
-DesertRuins_OnLoad: @ 822D989
+DesertRuins_OnLoad:
 	call_if_unset FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_HideRegiEntrance
 	end
 
-DesertRuins_EventScript_HideRegiEntrance:: @ 822D993
+DesertRuins_EventScript_HideRegiEntrance::
 	setmetatile 7, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 8, 19, METATILE_Cave_EntranceCover, 1
 	setmetatile 9, 19, METATILE_Cave_EntranceCover, 1
@@ -28,16 +28,16 @@ DesertRuins_EventScript_HideRegiEntrance:: @ 822D993
 	setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1
 	return
 
-DesertRuins_OnTransition: @ 822D9CA
+DesertRuins_OnTransition:
 	setflag FLAG_LANDMARK_DESERT_RUINS
 	call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_ShowRegirock
 	end
 
-DesertRuins_EventScript_ShowRegirock:: @ 822D9D7
+DesertRuins_EventScript_ShowRegirock::
 	clearflag FLAG_HIDE_REGIROCK
 	return
 
-DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB
+DesertRuins_EventScript_CaveEntranceMiddle::
 	lockall
 	goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
 	braillemessage DesertRuins_Braille_UseRockSmash
@@ -46,12 +46,12 @@ DesertRuins_EventScript_CaveEntranceMiddle:: @ 822D9DB
 	releaseall
 	end
 
-DesertRuins_EventScript_BigHoleInWall:: @ 822D9EE
+DesertRuins_EventScript_BigHoleInWall::
 	msgbox gText_BigHoleInTheWall, MSGBOX_DEFAULT
 	releaseall
 	end
 
-DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8
+DesertRuins_EventScript_CaveEntranceSide::
 	lockall
 	braillemessage DesertRuins_Braille_UseRockSmash
 	waitbuttonpress
@@ -59,7 +59,7 @@ DesertRuins_EventScript_CaveEntranceSide:: @ 822D9F8
 	releaseall
 	end
 
-DesertRuins_EventScript_Regirock:: @ 822DA02
+DesertRuins_EventScript_Regirock::
 	lock
 	faceplayer
 	waitse
@@ -82,12 +82,12 @@ DesertRuins_EventScript_Regirock:: @ 822DA02
 	release
 	end
 
-DesertRuins_EventScript_DefeatedRegirock:: @ 822DA49
+DesertRuins_EventScript_DefeatedRegirock::
 	setflag FLAG_DEFEATED_REGIROCK
 	goto Common_EventScript_RemoveStaticPokemon
 	end
 
-DesertRuins_EventScript_RanFromRegirock:: @ 822DA52
+DesertRuins_EventScript_RanFromRegirock::
 	setvar VAR_0x8004, SPECIES_REGIROCK
 	goto Common_EventScript_LegendaryFlewAway
 	end