Fix FREE_ENIGMA_BERRY breaking GF Rom Header (#9599)

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

.all-contributorsrc

@@ -57,7 +57,8 @@
       "profile": "https://github.com/ghoulslash",
       "contributions": [
         "maintenance",
-        "code"
+        "code",
+        "design"
       ]
     },
     {
@@ -375,7 +376,8 @@
       "profile": "https://github.com/Pyredrid",
       "contributions": [
         "userTesting",
-        "maintenance"
+        "maintenance",
+        "code"
       ]
     },
     {
@@ -478,6 +480,222 @@
         "doc",
         "data"
       ]
+    },
+    {
+      "login": "shachar700",
+      "name": "shachar700",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48739719?v=4",
+      "profile": "https://github.com/shachar700",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "purrfectdoodle",
+      "name": "Eva",
+      "avatar_url": "https://avatars.githubusercontent.com/u/105788407?v=4",
+      "profile": "http://purrfectdoodle.com",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "amiosi",
+      "name": "amiosi",
+      "avatar_url": "https://avatars.githubusercontent.com/u/44352097?v=4",
+      "profile": "https://github.com/amiosi",
+      "contributions": [
+        "data"
+      ]
+    },
+    {
+      "login": "mrdollsteak",
+      "name": "mrdollsteak",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5975698?v=4",
+      "profile": "https://github.com/mrdollsteak",
+      "contributions": [
+        "data"
+      ]
+    },
+    {
+      "login": "TheXaman",
+      "name": "TheXaman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/48356183?v=4",
+      "profile": "https://github.com/TheXaman",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ZnogyroP",
+      "name": "ZnogyroP",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20970593?v=4",
+      "profile": "https://github.com/ZnogyroP",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "luckytyphlosion",
+      "name": "luckytyphlosion",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10688458?v=4",
+      "profile": "https://github.com/luckytyphlosion",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ShinyDragonHunter",
+      "name": "Josh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32826900?v=4",
+      "profile": "https://github.com/ShinyDragonHunter",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Gamer2020",
+      "name": "Gamer2020",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6243575?v=4",
+      "profile": "https://github.com/Gamer2020",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SonikkuA-DatH",
+      "name": "SonikkuA-DatH",
+      "avatar_url": "https://avatars.githubusercontent.com/u/58025603?v=4",
+      "profile": "https://github.com/SonikkuA-DatH",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "Jaizu",
+      "name": "Jaizu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/18596778?v=4",
+      "profile": "https://jaizu.moe",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "izrofid",
+      "name": "Kildemal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/206095739?v=4",
+      "profile": "https://github.com/izrofid",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Skeli789",
+      "name": "Skeli",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17243618?v=4",
+      "profile": "https://github.com/Skeli789",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "ostomachion",
+      "name": "Josh Hufford",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8021794?v=4",
+      "profile": "http://hufford.io",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Kasenn",
+      "name": "Kasenn",
+      "avatar_url": "https://avatars.githubusercontent.com/u/115586266?v=4",
+      "profile": "https://github.com/Kasenn",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "SabataLunar",
+      "name": "SabataLunar",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26584469?v=4",
+      "profile": "https://github.com/SabataLunar",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "PacFire",
+      "name": "PacFire",
+      "avatar_url": "https://avatars.githubusercontent.com/u/108960850?v=4",
+      "profile": "https://github.com/PacFire",
+      "contributions": [
+        "design"
+      ]
+    },
+    {
+      "login": "ChrispyChris27",
+      "name": "ChrispyChris27",
+      "avatar_url": "https://avatars.githubusercontent.com/u/173648816?v=4",
+      "profile": "https://github.com/ChrispyChris27",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "LogicalLlama",
+      "name": "LogicalLlama",
+      "avatar_url": "https://avatars.githubusercontent.com/u/248230900?v=4",
+      "profile": "https://github.com/LogicalLlama",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "KnightGallade",
+      "name": "KnightGallade",
+      "avatar_url": "https://avatars.githubusercontent.com/u/189022270?v=4",
+      "profile": "https://github.com/KnightGallade",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "luuma",
+      "name": "luuma",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31407427?v=4",
+      "profile": "https://github.com/luuma",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DragonScaledEmma",
+      "name": "Emma",
+      "avatar_url": "https://avatars.githubusercontent.com/u/220702264?v=4",
+      "profile": "https://github.com/DragonScaledEmma",
+      "contributions": [
+        "bug"
+      ]
+    }
+    {
+      "login": "gammel2013",
+      "name": "gammel2013",
+      "avatar_url": "https://avatars.githubusercontent.com/u/160730477?v=4",
+      "profile": "https://github.com/Gammel2013",
+      "contributions": [
+        "bug"
+      ]
+    }
+    {
+      "login": "blusunrize",
+      "name": "blusunrize",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4106382?v=4",
+      "profile": "https://github.com/BluSunrize",
+      "contributions": [
+        "bug"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml

@@ -7,7 +7,7 @@ body:
       value: |
         Please fill in all fields with as many details as possible.
         Once your bug is posted, make sure you and your collaborators are added to `CREDITS.md` by [tagging the bot on GitHub](https://github.com/rh-hideout/pokeemerald-expansion/wiki/CREDITS.md-Frequently-Asked-Questions). EVERY contribution matters, even reporting bugs!
-  - type: textarea         
+  - type: textarea
     id: description
     attributes:
       label: Description
@@ -24,13 +24,13 @@ body:
       description: |
         What exact steps can somebody else follow in order to recreate the issue on their own?
       placeholder: |
-        Provide as much context as possible as to what was done to create the issue. 
+        Provide as much context as possible as to what was done to create the issue.
     validations:
       required: true
   - type: textarea
-    id: media 
+    id: media
     attributes:
-      label: Images / Video 
+      label: Images / Video
       description: |
         Do you have images or videos to show the problem happen?
       placeholder: |
@@ -43,16 +43,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.14.1 (Latest release)
+        - 1.15.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.14.4
+        - 1.14.3
+        - 1.14.2
+        - 1.14.1
         - 1.14.0
-        - 1.13.4
-        - 1.13.3
-        - 1.13.2
-        - 1.13.1
-        - 1.13.0
-        - pre-1.13.0
+        - pre-1.14.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml

@@ -24,13 +24,13 @@ body:
       description: |
         What exact steps can somebody else follow in order to recreate the issue on their own?
       placeholder: |
-        Provide as much context as possible as to what was done to create the issue. 
+        Provide as much context as possible as to what was done to create the issue.
     validations:
-      required: true 
+      required: true
   - type: textarea
-    id: media 
+    id: media
     attributes:
-      label: Images / Video 
+      label: Images / Video
       description: |
         Do you have images or videos to show the problem happen?
       placeholder: |
@@ -43,16 +43,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.14.1 (Latest release)
+        - 1.15.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.14.4
+        - 1.14.3
+        - 1.14.2
+        - 1.14.1
         - 1.14.0
-        - 1.13.4
-        - 1.13.3
-        - 1.13.2
-        - 1.13.1
-        - 1.13.0
-        - pre-1.13.0
+        - pre-1.14.0
     validations:
       required: true
   - type: input

.github/ISSUE_TEMPLATE/03_feature_requests.yaml

@@ -15,13 +15,13 @@ body:
       description: |
         What is the current behavior? What behavior would you expect your feature request to provide? What other information can you provide to help your feature get implemented?
       placeholder: |
-        Provide as much context as possible. 
+        Provide as much context as possible.
     validations:
       required: true
   - type: textarea
     id: media
     attributes:
-      label: Images / Video 
+      label: Images / Video
       description: |
         Have other projects or games solved this problem? Do you have images or video to show this happening?
       placeholder: |

.github/ISSUE_TEMPLATE/04_other_errors.yaml

@@ -24,13 +24,13 @@ body:
       description: |
         What exact steps can somebody else follow in order to recreate the issue on their own?
       placeholder: |
-        Provide as much context as possible as to what was done to create the issue. 
+        Provide as much context as possible as to what was done to create the issue.
     validations:
-      required: false 
+      required: false
   - type: textarea
-    id: media 
+    id: media
     attributes:
-      label: Images / Video 
+      label: Images / Video
       description: |
         Do you have images or videos to show the problem happen?
       placeholder: |
@@ -43,16 +43,15 @@ body:
       label: Version
       description: What version of pokeemerald-expansion are you using?
       options:
-        - 1.14.1 (Latest release)
+        - 1.15.0 (Latest release)
         - master (default, unreleased bugfixes)
         - upcoming (Edge)
+        - 1.14.4
+        - 1.14.3
+        - 1.14.2
+        - 1.14.1
         - 1.14.0
-        - 1.13.4
-        - 1.13.3
-        - 1.13.2
-        - 1.13.1
-        - 1.13.0
-        - pre-1.13.0
+        - pre-1.14.0
     validations:
       required: true
   - type: input

.github/docs_validate/inclusive_summary.py

@@ -0,0 +1,64 @@
+#!/usr/bin/python3
+
+"""
+Checks that all documentation pages that should be mentioned in
+`docs/SUMMARY.md` are mentioned the file
+"""
+
+import glob
+import re
+import os
+from pathlib import Path
+
+errorLines = []
+
+if not os.path.exists("Makefile"):
+    errorLines.append("Please run this script from your root folder.")
+
+summaryFile = Path("docs/SUMMARY.md")
+if not errorLines:
+    if not summaryFile.is_file():
+        errorLines.append("docs/SUMMARY.md missing")
+
+summaryContents = []
+if not errorLines:
+    with open(summaryFile, 'r', encoding='UTF-8') as file:
+        entry_pattern = re.compile(r" *\- \[[^\]]*\]\(([^\)]*)\)\n")
+        lineNo = 0
+        while line:=file.readline():
+            lineNo = lineNo + 1
+            if line == "# Summary\n" or line == "\n":
+                pass
+            elif match:=entry_pattern.match(line):
+                if "" != match.group(1):
+                    summaryContents.append(Path(match.group(1)))
+            else:
+                if not errorLines:
+                    errorLines.append("## Unexpected lines in docs/SUMMARY.md")
+                errorLines.append(f"- {lineNo}: {line.strip()}")
+
+if not errorLines:
+    for pathName in glob.glob("**/*.md", root_dir="docs", recursive=True):
+        path = Path(pathName)
+        if path == Path("SUMMARY.md"):
+            pass
+        elif path == Path("changelogs/template.md"):
+            pass
+        elif path in summaryContents:
+            pass
+        else:
+            if not errorLines:
+                errorLines.append("## `docs/**/*.md` files present but not mentioned in `docs/SUMMARY.md`")
+            errorLines.append("- " + str(path))
+
+if errorLines:
+    for line in errorLines:
+        print(line)
+
+    if 'GITHUB_STEP_SUMMARY' in os.environ:
+        with open(os.environ['GITHUB_STEP_SUMMARY'], 'w', encoding='UTF-8') as file:
+            for line in errorLines:
+                file.write(line)
+                file.write('\n')
+
+    quit(1)

.github/workflows/build.yml

@@ -7,42 +7,218 @@ on:
       - upcoming
   pull_request:
 
+env:
+  GAME_REVISION: 0
+  GAME_LANGUAGE: ENGLISH
+  COMPARE: 0
+  UNUSED_ERROR: 1
+  DEPRECATED_ERROR: 1
+
 jobs:
-  build:
+  build-emerald:
     if: github.actor != 'allcontributors[bot]'
     runs-on: ubuntu-latest
-    env:
-      GAME_VERSION: EMERALD
-      GAME_REVISION: 0
-      GAME_LANGUAGE: ENGLISH
-      COMPARE: 0
-      UNUSED_ERROR: 1
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Install binutils
         run: |
-          sudo apt update
-          sudo apt install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
-        # build-essential and git are already installed
+          sudo apt-get update
+          sudo apt-get install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
 
-      - name: ROM
+      - name: Cache build tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            tools/bin2c/bin2c
+            tools/gbafix/gbafix
+            tools/gbagfx/gbagfx
+            tools/jsonproc/jsonproc
+            tools/mapjson/mapjson
+            tools/mid2agb/mid2agb
+            tools/preproc/preproc
+            tools/ramscrgen/ramscrgen
+            tools/rsfont/rsfont
+            tools/scaninc/scaninc
+            tools/trainerproc/trainerproc
+            tools/compresSmol/compresSmol
+            tools/compresSmol/compresSmolTilemap
+            tools/wav2agb/wav2agb
+          key: tools-${{ runner.os }}-${{ hashFiles('tools/*/Makefile', 'tools/**/*.c', 'tools/**/*.cpp', 'tools/**/*.h') }}
+
+      - name: ROM (Emerald)
         env:
-          COMPARE: 0
-        run: make -j${nproc} -O all
-        
-      - name: LTO
+          GAME_VERSION: EMERALD
+        run: make -j$(nproc) -O all
+
+  build-firered:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install binutils
         run: |
-          make tidy
-          make -j${nproc} LTO=1
-        # make tidy to purge previous build
+          sudo apt-get update
+          sudo apt-get install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
+
+      - name: Cache build tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            tools/bin2c/bin2c
+            tools/gbafix/gbafix
+            tools/gbagfx/gbagfx
+            tools/jsonproc/jsonproc
+            tools/mapjson/mapjson
+            tools/mid2agb/mid2agb
+            tools/preproc/preproc
+            tools/ramscrgen/ramscrgen
+            tools/rsfont/rsfont
+            tools/scaninc/scaninc
+            tools/trainerproc/trainerproc
+            tools/compresSmol/compresSmol
+            tools/compresSmol/compresSmolTilemap
+            tools/wav2agb/wav2agb
+          key: tools-${{ runner.os }}-${{ hashFiles('tools/*/Makefile', 'tools/**/*.c', 'tools/**/*.cpp', 'tools/**/*.h') }}
+
+      - name: ROM (Firered)
+        run: make firered -j$(nproc) -O
+
+  build-leafgreen:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install binutils
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
+
+      - name: Cache build tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            tools/bin2c/bin2c
+            tools/gbafix/gbafix
+            tools/gbagfx/gbagfx
+            tools/jsonproc/jsonproc
+            tools/mapjson/mapjson
+            tools/mid2agb/mid2agb
+            tools/preproc/preproc
+            tools/ramscrgen/ramscrgen
+            tools/rsfont/rsfont
+            tools/scaninc/scaninc
+            tools/trainerproc/trainerproc
+            tools/compresSmol/compresSmol
+            tools/compresSmol/compresSmolTilemap
+            tools/wav2agb/wav2agb
+          key: tools-${{ runner.os }}-${{ hashFiles('tools/*/Makefile', 'tools/**/*.c', 'tools/**/*.cpp', 'tools/**/*.h') }}
+
+      - name: ROM (Leafgreen)
+        run: make leafgreen -j$(nproc) -O
+
+  release:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install binutils
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
+
+      - name: Cache build tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            tools/bin2c/bin2c
+            tools/gbafix/gbafix
+            tools/gbagfx/gbagfx
+            tools/jsonproc/jsonproc
+            tools/mapjson/mapjson
+            tools/mid2agb/mid2agb
+            tools/preproc/preproc
+            tools/ramscrgen/ramscrgen
+            tools/rsfont/rsfont
+            tools/scaninc/scaninc
+            tools/trainerproc/trainerproc
+            tools/compresSmol/compresSmol
+            tools/compresSmol/compresSmolTilemap
+            tools/wav2agb/wav2agb
+          key: tools-${{ runner.os }}-${{ hashFiles('tools/*/Makefile', 'tools/**/*.c', 'tools/**/*.cpp', 'tools/**/*.h') }}
+
+      - name: Release
+        env:
+          GAME_VERSION: EMERALD
+        run: make -j$(nproc) release
+
+  test:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install binutils
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi libpng-dev python3
+
+      - name: Cache build tools
+        uses: actions/cache@v4
+        with:
+          path: |
+            tools/bin2c/bin2c
+            tools/gbafix/gbafix
+            tools/gbagfx/gbagfx
+            tools/jsonproc/jsonproc
+            tools/mapjson/mapjson
+            tools/mid2agb/mid2agb
+            tools/preproc/preproc
+            tools/ramscrgen/ramscrgen
+            tools/rsfont/rsfont
+            tools/scaninc/scaninc
+            tools/trainerproc/trainerproc
+            tools/compresSmol/compresSmol
+            tools/compresSmol/compresSmolTilemap
+            tools/wav2agb/wav2agb
+            tools/patchelf/patchelf
+            tools/mgba-rom-test-hydra/mgba-rom-test-hydra
+          key: tools-check-${{ runner.os }}-${{ hashFiles('tools/*/Makefile', 'tools/**/*.c', 'tools/**/*.cpp', 'tools/**/*.h') }}
 
       - name: Test
         env:
+          GAME_VERSION: EMERALD
           TEST: 1
-        run: |
-          make -j${nproc} check
+        run: make -j$(nproc) check
+
+  # Gate job: satisfies the "build" branch protection rule.
+  # Passes only when all parallel build/test jobs succeed.
+  build:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    needs: [build-emerald, build-firered, build-leafgreen, release, test]
+    steps:
+      - name: All builds passed
+        run: echo "All builds and tests passed."
+
+  docs_validate:
+    if: github.actor != 'allcontributors[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Check that SUMMARY.md includes markdown doc files
+        run: .github/docs_validate/inclusive_summary.py
+
   allcontributors:
     if: github.actor == 'allcontributors[bot]'
     runs-on: ubuntu-latest
@@ -50,4 +226,3 @@ jobs:
     steps:
       - name: Automatically pass for allcontributors
         run: echo "CI automatically passes for allcontributors" && exit 0
-

.github/workflows/docs.yml

@@ -17,7 +17,7 @@ jobs:
           fetch-depth: 0
       - name: Install latest mdbook
         run: |
-          tag="v0.5.0-beta.1"
+          tag="v0.5.1"
           url="https://github.com/rust-lang/mdbook/releases/download/${tag}/mdbook-${tag}-x86_64-unknown-linux-gnu.tar.gz"
           mkdir mdbook
           curl -sSL $url | tar -xz --directory=./mdbook

.gitignore

@@ -42,18 +42,26 @@ prefabs.json
 *.sym
 *.js
 /pokeemerald-*.png
+/pokefirered-*.png
+/pokeleafgreen-*.png
 src/data/map_group_count.h
 include/constants/heal_locations.h
 include/constants/script_commands.h
 tools/trainerproc/trainerproc
 src/data/battle_partners.h
+src/data/pokemon/teachable_learnsets.h
 src/data/trainers.h
+src/data/trainers_frlg.h
 src/data/debug_trainers.h
+src/data/tutor_moves.h
 test/battle/trainer_control.h
+test/battle/partner_control.h
 tools/compresSmol/compresSmol
 tools/compresSmol/compresSmolTilemap
+tools/aif2pcm/aif2pcm
 *.Identifier
 *.smol
 *.fastSmol
 *.smolTM
 __pycache__
+.map_version

CONTRIBUTING.md

@@ -6,7 +6,7 @@ All contributions are encouraged and valued. Please make sure to read the releva
 
 ## Bug Reports
 
-We use [GitHub](https://github.com/rh-hideout/pokeemerald-expansion/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen+label%3Abug) issues to track bugs. 
+We use [GitHub](https://github.com/rh-hideout/pokeemerald-expansion/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen+label%3Abug) issues to track bugs.
 
 ### What should I do before making a bug report?
 
@@ -15,7 +15,7 @@ We use [GitHub](https://github.com/rh-hideout/pokeemerald-expansion/issues?q=sor
 
 ### How do I submit a bug report?
 
-If you run into an issue with the project, open an [issue](https://github.com/rh-hideout/pokeemerald-expansion/issues/new). 
+If you run into an issue with the project, open an [issue](https://github.com/rh-hideout/pokeemerald-expansion/issues/new).
 
 The best bug reports have enough information that we won't have to contact you for more information. We welcome all efforts to improve pokeemerald-expansion, but would be very grateful if you completed as much of the checklist as possible in your bug report. This will help other contributiors fix your issue.
 
@@ -23,7 +23,7 @@ The best bug reports have enough information that we won't have to contact you f
 
 - A maintainer will [label](https://github.com/rh-hideout/pokeemerald-expansion/labels) the bug report.
 - A maintainer will try to reproduce the bug with your provided steps.
-    - If there are no reproduction steps or no obvious way to reproduce the issue, somebody will ask you for those steps. Until the bug can be reproduced, the bug will retain the `bug:unconfirmed` label. Unconfirmed bugs are less likely get fixed.
+    - If there are no reproduction steps or no obvious way to reproduce the issue, somebody will ask you for those steps. Until the bug can be reproduced, the bug will retain the `bug:unconfirmed` label. Unconfirmed bugs are less likely to get fixed.
 - If the team is able to reproduce the bug, it will be labeled `bug:confirmed`, and the bug will be left to be [fixed by someone](#Pull-Requests).
     - If the issue is particularly game-breaking, a maintainer will add it to a future version's [milestone](), meaning that version will not be released until the problem is solved.
 
@@ -31,7 +31,7 @@ The best bug reports have enough information that we won't have to contact you f
 
 This section guides you through submitting a feature request for pokeemerald-expansion, **including completely new features and minor improvements to existing functionality**. Following these guidelines will help maintainers and the community to understand your suggestion and find related suggestions.
 
-- We use [GitHub](https://github.com/rh-hideout/pokeemerald-expansion/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen+label%3Afeature-request) issues to track feature requests. 
+- We use [GitHub](https://github.com/rh-hideout/pokeemerald-expansion/issues?q=sort%3Aupdated-desc+is%3Aissue+is%3Aopen+label%3Afeature-request) issues to track feature requests.
 
 ### What should I do before making a feature request?
 
@@ -44,7 +44,7 @@ This section guides you through submitting a feature request for pokeemerald-exp
 
 ### How do I submit a feature request?
 
-To request a feature to be added to the project, open a [feature request](https://github.com/rh-hideout/pokeemerald-expansion/issues/new). 
+To request a feature to be added to the project, open a [feature request](https://github.com/rh-hideout/pokeemerald-expansion/issues/new).
 
 ### What happens after I submit a feature request?
 
@@ -61,8 +61,11 @@ If you have read all of this and still need help, feel free to start a thread in
 - If you're new to git and GitHub, [Team Aqua's Asset Repo](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/) has a [guide on forking and cloning the repository](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/wiki/The-Basics-of-GitHub). Make sure you have a [local copy](INSTALL.md) of `pokeemerald-expansion`.
 - Make sure your contribution is in [scope](docs/team_procedures/scope.md) - if it is not clear if something is in scope, you can start a discussion thread in the [#pr-discussions](https://discord.com/channels/419213663107416084/1102784418369785948) channel of the [the RHH Discord Server!](https://discord.gg/6CzjAG6GZk).
 - Choose a branch to contribute your PR to:
-    - **`master`**: Fixes for bugs that are currently present in the `master` branch.
-    - **`upcoming`**: All other pull requests.
+    - **`master`**: If your PR contains meets any of the following criteria, it should go to `master`:
+      - Fixes for bugs that are currently present in the `master` branch
+      - PR is only documentation updates / changes
+      - PR is only tests
+    - **`upcoming`**: All other pull requests go to `upcoming`.
 - Create a new branch from the most recent version of the branch you've chosen.
 - If your contribution introduces, removes, or changes a lot of existing code, we reccomend getting a maintainer to agree to review it before you start on the work! We have a table that lists all [current maintainers and their areas of expertise](#maintainers).
 
@@ -105,11 +108,11 @@ git push --set-upstream origin newFeature
 ```
 
 #### 7. Open Pull Request
-Once your work is complete and pushed to the branch on Github, you can open a [pull request from your branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork), targeting the branch you've chosen from `pokeemerald-expansion`. Please fill out the pull request description as completely as possible. 
+Once your work is complete and pushed to the branch on Github, you can open a [pull request from your branch](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork), targeting the branch you've chosen from `pokeemerald-expansion`. Please fill out the pull request description as completely as possible.
 
 ### What happens after I submit a pull request?
 
-A maintainer will then assign themselves as a reviewer of your pull request, and may provide feedback in the form of a PR review. 
+A maintainer will then assign themselves as a reviewer of your pull request, and may provide feedback in the form of a PR review.
 
 Contributors are responsible for responding to and updating their branch by addressing the feedback in the review. Contributors are also responsible for making sure the branch passes the checklist at all times.
 
@@ -122,21 +125,20 @@ Once all items on the merge checklist are true, the branch will be merged in.
 
 ## Maintainers
 
-This list was last updated 2025 April 1.
+This list was last updated 2025 Dec 23.
 
 | Name | Discord | Currently Active | Areas of Expertise |
 | --- | --- | --- | --- |
 | [Alex](https://github.com/AlexOn1ine) | rainonline | ✅ | Battle Engine, Battle AI
 | [Egg](https://github.com/DizzyEggg) | egg9255 | ✅ | Battle Engine, Battle AI
-| [ghoulslash](https://github.com/ghoulslash) | ghoulslash | ✅ | Dexnav, Overworld, Battle Engine
 | [Jasper](https://github.com/Bassoonian) | bassoonian | ✅ | Berries, Day / Night System, Followers, Feature Branches
 | [MGriffin](https://github.com/mrgriffin) | mgriffin | ✅ | Tests, Trainer Control
 | [psf](https://github.com/pkmnsnfrn) | pkmnsnfrn | ✅ | Rematches, Difficulty, Trainer Slides, Fake RTC, Fishing Minigames, Imperial / Metric, OW Item Balls, Sky Battles
 | [Hedara](https://github.com/hedara90) | hedara | ✅ | Compression, Sprites
 | [Pawkkie](https://github.com/Pawkkie) | pawkkie | ✅ | Battle AI
 | [SBird](https://github.com/SBird1337) | karathan | ✅ | Dynamic Multichoice, Damage Calculation, Animations, Trainer Control, Tests
-| [Agustin](https://github.com/AgustinGDLV) | agustingdlv | Inactive | Gimmicks, Battle Engine, Tests, Items
-| [tertu](https://github.com/tertu-m) | tertu | Inactive | Randomizer
+| [Jamie](https://github.com/FosterProgramming) | foster_harmony | ✅ | Overworld, Tests, Day / Night System, Dexnav, Battle Frontier, HGSS Dex, Pokerus, Learnsets, Mon Generation, Vs Seeker
+| [grintoul](https://github.com/grintoul1) | grintoul | ✅ | Tests, Battle AI, Battle Engine, Overworld, Trainer Slides, Follower NPCs, Multi Battles
 
 ## Attribution
 This guide is based on the [contributing.md](https://contributing.md/generator)!

CREDITS.md

@@ -1,13 +1,3 @@
-<!-- ## Old List of Credits -->
-<!-- - **mvit**: ability pop up and mega evo gfx -->
-<!-- - **Doesnt**: berries gfx, pokeball particles -->
-<!-- - **MrDollSteak**: Pokedex descriptions -->
-<!-- - **Avara**: item descriptions -->
-<!-- - **TheLaw**: move animations -->
-<!-- - **BreadCrumbs**: code review -->
-<!-- - **Syreldar**: testing, wrote an explanation post -->
-<!-- - **Pyredrid**: automating issue creation, code review and testing -->
-
 ## Credits ✨
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
@@ -22,7 +12,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/AlexOn1ine"><img src="https://avatars.githubusercontent.com/u/93446519?v=4?s=100" width="100px;" alt="Alex"/><br /><sub><b>Alex</b></sub></a><br /><a href="#maintenance-AlexOn1ine" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=AlexOn1ine" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Bassoonian"><img src="https://avatars.githubusercontent.com/u/16993385?v=4?s=100" width="100px;" alt="Bassoonian"/><br /><sub><b>Bassoonian</b></sub></a><br /><a href="#maintenance-Bassoonian" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Bassoonian" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DizzyEggg"><img src="https://avatars.githubusercontent.com/u/16259973?v=4?s=100" width="100px;" alt="DizzyEggg"/><br /><sub><b>DizzyEggg</b></sub></a><br /><a href="#maintenance-DizzyEggg" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=DizzyEggg" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ghoulslash"><img src="https://avatars.githubusercontent.com/u/41651341?v=4?s=100" width="100px;" alt="ghoulslash"/><br /><sub><b>ghoulslash</b></sub></a><br /><a href="#maintenance-ghoulslash" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ghoulslash" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ghoulslash"><img src="https://avatars.githubusercontent.com/u/41651341?v=4?s=100" width="100px;" alt="ghoulslash"/><br /><sub><b>ghoulslash</b></sub></a><br /><a href="#maintenance-ghoulslash" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ghoulslash" title="Code">💻</a> <a href="#design-ghoulslash" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hedara90"><img src="https://avatars.githubusercontent.com/u/149414898?v=4?s=100" width="100px;" alt="hedara90"/><br /><sub><b>hedara90</b></sub></a><br /><a href="#maintenance-hedara90" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=hedara90" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.martin-griffin.com/"><img src="https://avatars.githubusercontent.com/u/838573?v=4?s=100" width="100px;" alt="Martin Griffin"/><br /><sub><b>Martin Griffin</b></sub></a><br /><a href="#maintenance-mrgriffin" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=mrgriffin" title="Code">💻</a></td>
     </tr>
@@ -64,7 +54,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://metin2.dev/index.php"><img src="https://avatars.githubusercontent.com/u/42327659?v=4?s=100" width="100px;" alt="Enrico Drago"/><br /><sub><b>Enrico Drago</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Syreldar" title="Documentation">📖</a> <a href="#userTesting-Syreldar" title="User Testing">📓</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pyredrid"><img src="https://avatars.githubusercontent.com/u/8324784?v=4?s=100" width="100px;" alt="Pyredrid"/><br /><sub><b>Pyredrid</b></sub></a><br /><a href="#userTesting-Pyredrid" title="User Testing">📓</a> <a href="#maintenance-Pyredrid" title="Maintenance">🚧</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pyredrid"><img src="https://avatars.githubusercontent.com/u/8324784?v=4?s=100" width="100px;" alt="Pyredrid"/><br /><sub><b>Pyredrid</b></sub></a><br /><a href="#userTesting-Pyredrid" title="User Testing">📓</a> <a href="#maintenance-Pyredrid" title="Maintenance">🚧</a> <a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Pyredrid" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/mvit"><img src="https://avatars.githubusercontent.com/u/128863?v=4?s=100" width="100px;" alt="mv"/><br /><sub><b>mv</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=mvit" title="Code">💻</a> <a href="#design-mvit" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mother-Of-Dragons"><img src="https://avatars.githubusercontent.com/u/31101124?v=4?s=100" width="100px;" alt="Avara"/><br /><sub><b>Avara</b></sub></a><br /><a href="#data-Mother-Of-Dragons" title="Data">🔣</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Doesnty"><img src="https://avatars.githubusercontent.com/u/6163136?v=4?s=100" width="100px;" alt="Doesnty"/><br /><sub><b>Doesnty</b></sub></a><br /><a href="#design-Doesnty" title="Design">🎨</a></td>
@@ -78,6 +68,36 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/cawtds"><img src="https://avatars.githubusercontent.com/u/38510667?v=4?s=100" width="100px;" alt="cawtds"/><br /><sub><b>cawtds</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=cawtds" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fdeblasio"><img src="https://avatars.githubusercontent.com/u/35279583?v=4?s=100" width="100px;" alt="Frank DeBlasio"/><br /><sub><b>Frank DeBlasio</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=fdeblasio" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://vriska.dev"><img src="https://avatars.githubusercontent.com/u/8355305?v=4?s=100" width="100px;" alt="leo60228"/><br /><sub><b>leo60228</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=leo60228" title="Documentation">📖</a> <a href="#data-leo60228" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/shachar700"><img src="https://avatars.githubusercontent.com/u/48739719?v=4?s=100" width="100px;" alt="shachar700"/><br /><sub><b>shachar700</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=shachar700" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://purrfectdoodle.com"><img src="https://avatars.githubusercontent.com/u/105788407?v=4?s=100" width="100px;" alt="Eva"/><br /><sub><b>Eva</b></sub></a><br /><a href="#design-purrfectdoodle" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/amiosi"><img src="https://avatars.githubusercontent.com/u/44352097?v=4?s=100" width="100px;" alt="amiosi"/><br /><sub><b>amiosi</b></sub></a><br /><a href="#data-amiosi" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/mrdollsteak"><img src="https://avatars.githubusercontent.com/u/5975698?v=4?s=100" width="100px;" alt="mrdollsteak"/><br /><sub><b>mrdollsteak</b></sub></a><br /><a href="#data-mrdollsteak" title="Data">🔣</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/TheXaman"><img src="https://avatars.githubusercontent.com/u/48356183?v=4?s=100" width="100px;" alt="TheXaman"/><br /><sub><b>TheXaman</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=TheXaman" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ZnogyroP"><img src="https://avatars.githubusercontent.com/u/20970593?v=4?s=100" width="100px;" alt="ZnogyroP"/><br /><sub><b>ZnogyroP</b></sub></a><br /><a href="#design-ZnogyroP" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/luckytyphlosion"><img src="https://avatars.githubusercontent.com/u/10688458?v=4?s=100" width="100px;" alt="luckytyphlosion"/><br /><sub><b>luckytyphlosion</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=luckytyphlosion" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ShinyDragonHunter"><img src="https://avatars.githubusercontent.com/u/32826900?v=4?s=100" width="100px;" alt="Josh"/><br /><sub><b>Josh</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ShinyDragonHunter" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gamer2020"><img src="https://avatars.githubusercontent.com/u/6243575?v=4?s=100" width="100px;" alt="Gamer2020"/><br /><sub><b>Gamer2020</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Gamer2020" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SonikkuA-DatH"><img src="https://avatars.githubusercontent.com/u/58025603?v=4?s=100" width="100px;" alt="SonikkuA-DatH"/><br /><sub><b>SonikkuA-DatH</b></sub></a><br /><a href="#design-SonikkuA-DatH" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://jaizu.moe"><img src="https://avatars.githubusercontent.com/u/18596778?v=4?s=100" width="100px;" alt="Jaizu"/><br /><sub><b>Jaizu</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Jaizu" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/izrofid"><img src="https://avatars.githubusercontent.com/u/206095739?v=4?s=100" width="100px;" alt="Kildemal"/><br /><sub><b>Kildemal</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=izrofid" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Skeli789"><img src="https://avatars.githubusercontent.com/u/17243618?v=4?s=100" width="100px;" alt="Skeli"/><br /><sub><b>Skeli</b></sub></a><br /><a href="#design-Skeli789" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://hufford.io"><img src="https://avatars.githubusercontent.com/u/8021794?v=4?s=100" width="100px;" alt="Josh Hufford"/><br /><sub><b>Josh Hufford</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ostomachion" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Kasenn"><img src="https://avatars.githubusercontent.com/u/115586266?v=4?s=100" width="100px;" alt="Kasenn"/><br /><sub><b>Kasenn</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=Kasenn" title="Code">💻</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/SabataLunar"><img src="https://avatars.githubusercontent.com/u/26584469?v=4?s=100" width="100px;" alt="SabataLunar"/><br /><sub><b>SabataLunar</b></sub></a><br /><a href="#design-SabataLunar" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/PacFire"><img src="https://avatars.githubusercontent.com/u/108960850?v=4?s=100" width="100px;" alt="PacFire"/><br /><sub><b>PacFire</b></sub></a><br /><a href="#design-PacFire" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ChrispyChris27"><img src="https://avatars.githubusercontent.com/u/173648816?v=4?s=100" width="100px;" alt="ChrispyChris27"/><br /><sub><b>ChrispyChris27</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=ChrispyChris27" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/LogicalLlama"><img src="https://avatars.githubusercontent.com/u/248230900?v=4?s=100" width="100px;" alt="LogicalLlama"/><br /><sub><b>LogicalLlama</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/issues?q=author%3ALogicalLlama" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/KnightGallade"><img src="https://avatars.githubusercontent.com/u/189022270?v=4?s=100" width="100px;" alt="KnightGallade"/><br /><sub><b>KnightGallade</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/issues?q=author%3AKnightGallade" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/luuma"><img src="https://avatars.githubusercontent.com/u/31407427?v=4?s=100" width="100px;" alt="luuma"/><br /><sub><b>luuma</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/commits?author=luuma" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/DragonScaledEmma"><img src="https://avatars.githubusercontent.com/u/220702264?v=4?s=100" width="100px;" alt="Emma"/><br /><sub><b>Emma</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/issues?q=author%3ADragonScaledEmma" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Gammel2013"><img src="https://avatars.githubusercontent.com/u/160730477?v=4?s=100" width="100px;" alt="gammel2013"/><br /><sub><b>gammel2013</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/issues?q=author%3Agammel2013" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BluSunrize"><img src="https://avatars.githubusercontent.com/u/4106382?v=4?s=100" width="100px;" alt="blusunrize"/><br /><sub><b>blusunrize</b></sub></a><br /><a href="https://github.com/rh-hideout/pokeemerald-expansion/issues?q=author%3Ablusunrize" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
   <tfoot>

INSTALL.md

@@ -140,7 +140,7 @@ git remote add RHH https://github.com/rh-hideout/pokeemerald-expansion
 2. Pull your desired branch
 There are three different options to pull from.
 ```console
-git pull RHH master # if you've chosen to use the upcoming branch, replace the word master with upcoming. 
+git pull RHH master # if you've chosen to use the upcoming branch, replace the word master with upcoming.
 # If you've chosen the latest patch, replace the word master with expansion
 # If you've chosen Latest Patch, replace the word master with expansion/1.11.0 where 1.11.0 is replaced with whatever the latest released version is.
 ```
@@ -173,7 +173,7 @@ For example, if your version is 1.7.0, you should update to 1.7.4.
 git pull RHH expansion/X.Y.Z # Replace X, Y and Z with the target version, such as `1.9.3`, `master`, or `upcoming`.
 ```
 
-You may have merge conflicts that you need to resolve. 
+You may have merge conflicts that you need to resolve.
 
 If you targeted a specific version that is not the latest version listed on the [tags](https://github.com/rh-hideout/pokeemerald-expansion/tags) page, you should repeat steps 3 and 4 until you are.
 

Makefile

@@ -37,6 +37,8 @@ TEST         ?= 0
 ANALYZE      ?= 0
 # Count unused warnings as errors. Used by RH-Hideout's repo
 UNUSED_ERROR ?= 0
+# Count deprecated warnings as errors. Used by RH-Hideout's repo
+DEPRECATED_ERROR ?= 0
 # Adds -Og and -g flags, which optimize the build for debugging and include debug info respectively
 DEBUG        ?= 0
 # Adds -flto flag, which increases link time but results in a more efficient binary (especially in audio processing)
@@ -183,6 +185,13 @@ ifeq ($(UNUSED_ERROR),0)
     override CFLAGS += -Wno-error=unused-variable -Wno-error=unused-const-variable -Wno-error=unused-parameter -Wno-error=unused-function -Wno-error=unused-but-set-parameter -Wno-error=unused-but-set-variable -Wno-error=unused-value -Wno-error=unused-local-typedefs
   endif
 endif
+
+ifeq ($(DEPRECATED_ERROR),0)
+  ifneq ($(GITHUB_REPOSITORY_OWNER),rh-hideout)
+    override CFLAGS += -Wno-error=deprecated-declarations
+  endif
+endif
+
 LIBPATH := -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libgcc.a))" -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libnosys.a))" -L "$(dir $(shell $(PATH_ARMCC) -mthumb -print-file-name=libc.a))"
 LIB := $(LIBPATH) -lc -lnosys -lgcc -L../../libagbsyscall -lagbsyscall
 # Enable debug info if set
@@ -231,7 +240,9 @@ endif
 LEARNSET_HELPERS_DIR := $(TOOLS_DIR)/learnset_helpers
 LEARNSET_HELPERS_DATA_DIR := $(LEARNSET_HELPERS_DIR)/porymoves_files
 LEARNSET_HELPERS_BUILD_DIR := $(LEARNSET_HELPERS_DIR)/build
-ALL_LEARNABLES_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_learnables.json
+ALL_LEARNABLES_JSON := $(DATA_SRC_SUBDIR)/pokemon/all_learnables.json
+ALL_TUTORS_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_tutors.json
+ALL_TEACHING_TYPES_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_teaching_types.json
 
 # wild_encounters.h is generated by a Python script
 WILD_ENCOUNTERS_TOOL_DIR := $(TOOLS_DIR)/wild_encounters
@@ -246,10 +257,6 @@ $(DATA_SRC_SUBDIR)/wild_encounters.h: $(DATA_SRC_SUBDIR)/wild_encounters.json $(
 $(INCLUDE_DIRS)/constants/script_commands.h: $(MISC_TOOL_DIR)/make_scr_cmd_constants.py $(DATA_ASM_SUBDIR)/script_cmd_table.inc
 	python3  $(MISC_TOOL_DIR)/make_scr_cmd_constants.py
 
-$(C_BUILDDIR)/wild_encounter.o: c_dep += $(DATA_SRC_SUBDIR)/wild_encounters.h
-$(C_BUILDDIR)/trainer_see.o: c_dep += $(INCLUDE_DIRS)/constants/script_commands.h
-$(C_BUILDDIR)/vs_seeker.o: c_dep += $(INCLUDE_DIRS)/constants/script_commands.h
-
 PERL := perl
 SHA1 := $(shell { command -v sha1sum || command -v shasum; } 2>/dev/null) -c
 
@@ -262,7 +269,7 @@ MAKEFLAGS += --no-print-directory
 # Delete files that weren't built properly
 .DELETE_ON_ERROR:
 
-RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck tidyrelease generated clean-generated
+RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck tidyrelease generated clean-generated clean-teachables clean-teachables_intermediates
 .PHONY: all rom agbcc modern compare check debug release
 .PHONY: $(RULES_NO_SCAN)
 
@@ -379,6 +386,7 @@ clean-assets:
 	rm -f $(MID_SUBDIR)/*.s
 	rm -f $(DATA_ASM_SUBDIR)/layouts/layouts.inc $(DATA_ASM_SUBDIR)/layouts/layouts_table.inc
 	rm -f $(DATA_ASM_SUBDIR)/maps/connections.inc $(DATA_ASM_SUBDIR)/maps/events.inc $(DATA_ASM_SUBDIR)/maps/groups.inc $(DATA_ASM_SUBDIR)/maps/headers.inc $(DATA_SRC_SUBDIR)/map_group_count.h
+	rm -f .map_version
 	find sound -iname '*.bin' -exec rm {} +
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.smol' -o -iname '*.fastSmol' -o -iname '*.smolTM' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 	find $(DATA_ASM_SUBDIR)/maps \( -iname 'connections.inc' -o -iname 'events.inc' -o -iname 'header.inc' \) -exec rm {} +
@@ -386,7 +394,7 @@ clean-assets:
 tidy: tidymodern tidycheck tidydebug tidyrelease
 
 tidymodern:
-	rm -f $(ROM_NAME) $(ELF_NAME) $(MAP_NAME)
+	rm -f poke*.gba poke*.elf poke*.map
 	rm -rf $(OBJ_DIR_NAME)
 
 tidycheck:
@@ -434,11 +442,19 @@ generated: $(AUTO_GEN_TARGETS)
 %.smol:     %      ; $(SMOL) -w $< $@
 %.rl:       %      ; $(GFX) $< $@
 
-clean-generated:
+clean-teachables_intermediates:
+	rm -f $(DATA_SRC_SUBDIR)/tutor_moves.h
+	rm -f $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h
+	@rm -Rf $(LEARNSET_HELPERS_BUILD_DIR)
+	@echo "rm -Rf <LEARNSET_HELPERS_BUILD_DIR>"
+
+clean-generated: clean-teachables_intermediates
 	@rm -f $(AUTO_GEN_TARGETS)
 	@echo "rm -f <AUTO_GEN_TARGETS>"
-	@rm -f $(ALL_LEARNABLES_JSON)
-	@echo "rm -f <ALL_LEARNABLES_JSON>"
+
+clean-teachables: clean-teachables_intermediates
+	rm -f $(ALL_LEARNABLES_JSON)
+	@touch $(C_SUBDIR)/pokemon.c
 
 $(C_BUILDDIR)/librfu_intr.o: CFLAGS := -mthumb-interwork -O2 -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -fno-toplevel-reorder -Wno-pointer-to-int-cast
 $(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
@@ -454,6 +470,8 @@ $(TEST_BUILDDIR)/%.o: CFLAGS := -mthumb -mthumb-interwork -O2 -mabi=apcs-gnu -mt
 
 # Dependency rules (for the *.c & *.s sources to .o files)
 # Have to be explicit or else missing files won't be reported.
+$(C_BUILDDIR)/move_relearner.o: $(C_SUBDIR)/move_relearner.c $(DATA_SRC_SUBDIR)/tutor_moves.h
+$(C_BUILDDIR)/pokemon.o: $(C_SUBDIR)/pokemon.c $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h
 
 # 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 (Icedude_907: there is soon).
@@ -473,6 +491,7 @@ $(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.c
 	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I tools/agbcc/include $<
 
 ifneq ($(NODEP),1)
+-include $(ALL_TUTORS_JSON), $(ALL_TEACHING_TYPES_JSON),
 -include $(addprefix $(OBJ_DIR)/,$(C_SRCS:.c=.d))
 endif
 
@@ -510,7 +529,7 @@ ifneq ($(NODEP),1)
 endif
 
 $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
-	$(PREPROC) $< charmap.txt | $(CPP) $(CPPFLAGS) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
+	$(PREPROC) -s $< charmap.txt | $(CPP) $(CPPFLAGS) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
 
 $(DATA_ASM_BUILDDIR)/%.d: $(DATA_ASM_SUBDIR)/%.s
 	$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I "" $<
@@ -528,16 +547,25 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
 $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
 	$(RAMSCRGEN) ewram_data $< ENGLISH > $@
 
-TEACHABLE_DEPS := $(ALL_LEARNABLES_JSON) $(shell find data/ -type f -name '*.inc') $(INCLUDE_DIRS)/constants/tms_hms.h $(INCLUDE_DIRS)/config/pokemon.h $(C_SUBDIR)/pokemon.c
+TEACHABLE_DEPS := $(ALL_LEARNABLES_JSON) $(INCLUDE_DIRS)/constants/tms_hms.h $(INCLUDE_DIRS)/config/pokemon.h $(DATA_SRC_SUBDIR)/pokemon/special_movesets.json $(INCLUDE_DIRS)/config/pokedex_plus_hgss.h $(LEARNSET_HELPERS_DIR)/make_teachables.py
 
 $(LEARNSET_HELPERS_BUILD_DIR):
 	@mkdir -p $@
 
-$(ALL_LEARNABLES_JSON): $(wildcard $(LEARNSET_HELPERS_DATA_DIR)/*.json) | $(LEARNSET_HELPERS_BUILD_DIR)
+$(ALL_LEARNABLES_JSON):  | $(wildcard $(LEARNSET_HELPERS_DATA_DIR)/*.json)
 	python3 $(LEARNSET_HELPERS_DIR)/make_learnables.py $(LEARNSET_HELPERS_DATA_DIR) $@
 
-$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(TEACHABLE_DEPS)
-	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py $<
+$(ALL_TUTORS_JSON): $(shell find data/ -type f -name '*.inc')  $(LEARNSET_HELPERS_DIR)/make_tutors.py | $(LEARNSET_HELPERS_BUILD_DIR)
+	python3 $(LEARNSET_HELPERS_DIR)/make_tutors.py $@
+
+$(ALL_TEACHING_TYPES_JSON): $(wildcard $(DATA_SRC_SUBDIR)/pokemon/species_info/*_families.h)  $(LEARNSET_HELPERS_DIR)/make_teaching_types.py | $(LEARNSET_HELPERS_BUILD_DIR)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teaching_types.py $@
+
+$(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(TEACHABLE_DEPS) | $(ALL_TUTORS_JSON) $(ALL_TEACHING_TYPES_JSON)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py $(LEARNSET_HELPERS_BUILD_DIR)
+
+$(DATA_SRC_SUBDIR)/tutor_moves.h: $(DATA_SRC_SUBDIR)/pokemon/special_movesets.json | $(ALL_TUTORS_JSON)
+	python3 $(LEARNSET_HELPERS_DIR)/make_teachables.py  --tutors $(LEARNSET_HELPERS_BUILD_DIR)
 
 # Linker script
 LD_SCRIPT := ld_script_modern.ld

README.md

@@ -4,7 +4,7 @@
 
 <!-- If you want to re-record or change these gifs, here are some notes that I used: https://files.catbox.moe/05001g.md -->
 
-**`pokeemerald-expansion`** is a GBA ROM hack base that equips developers with a comprehensive toolkit for creating Pokémon ROM hacks. **`pokeemerald-expansion`** is built on top of [pret's `pokeemerald`](https://github.com/pret/pokeemerald) decompilation project. **It is not a playable Pokémon game on its own.** 
+**`pokeemerald-expansion`** is a GBA ROM hack base that equips developers with a comprehensive toolkit for creating Pokémon ROM hacks. **`pokeemerald-expansion`** is built on top of [pret's `pokeemerald`](https://github.com/pret/pokeemerald) decompilation project. **It is not a playable Pokémon game on its own.**
 
 # [Features](FEATURES.md)
 
@@ -17,7 +17,7 @@
 If you use **`pokeemerald-expansion`**, please credit **RHH (Rom Hacking Hideout)**. Optionally, include the version number for clarity.
 
 ```
-Based off RHH's pokeemerald-expansion 1.14.1 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion 1.15.0 https://github.com/rh-hideout/pokeemerald-expansion/
 ```
 
 Please consider [crediting all contributors](CREDITS.md) involved in the project!
@@ -30,7 +30,7 @@ Please consider [crediting all contributors](CREDITS.md) involved in the project
 
 # [Getting Started](INSTALL.md)
 
-❗❗ **Important**: Do not use GitHub's "Download Zip" option as it will not include commit history. This is necessary if you want to update or merge other feature branches. 
+❗❗ **Important**: Do not use GitHub's "Download Zip" option as it will not include commit history. This is necessary if you want to update or merge other feature branches.
 
 If you're new to git and GitHub, [Team Aqua's Asset Repo](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/) has a [guide to forking and cloning the repository](https://github.com/Pawkkie/Team-Aquas-Asset-Repo/wiki/The-Basics-of-GitHub). Then you can follow one of the following guides:
 

asm/macros.inc

@@ -4,6 +4,7 @@
 	.include "asm/macros/map.inc"
 	.include "asm/macros/field_effect_script.inc"
 	.include "asm/macros/trainer_hill.inc"
+	.include "asm/macros/trainer_tower.inc"
 	.include "asm/macros/battle_tent.inc"
 	.include "asm/macros/battle_frontier/apprentice.inc"
 	.include "asm/macros/battle_frontier/battle_arena.inc"

asm/macros/battle_anim_script.inc

@@ -10,7 +10,7 @@
 	.2byte \tag
 	.endm
 
-.macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg
+	.macro createsprite template:req, anim_battler:req, subpriority_offset:req, argv:vararg
 	.byte 0x02
 	.4byte \template
 	.if \anim_battler == ANIM_TARGET
@@ -288,7 +288,7 @@
 	.byte 0x31
 	.4byte \template
 	.if \anim_battler == ANIM_TARGET
-	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
 	.else
 	.byte (\subpriority_offset & 0x7F)
 	.endif
@@ -304,7 +304,7 @@
 	.byte 0x32
 	.4byte \template
 	.if \anim_battler == ANIM_TARGET
-	.byte 0x80 | (\subpriority_offset & 0x7F)
+	.byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
 	.else
 	.byte (\subpriority_offset & 0x7F)
 	.endif
@@ -351,3 +351,304 @@
 	createvisualtask AnimTask_IsDoubleBattle, 0
 	jumprettrue \ptr
 	.endm
+
+@ createsprite wrappers
+@ The arguments are based on the CMD_ARGS of the callback associated with the template.
+
+	.macro simple_palette_blend unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, selector:req, delay:req, initial_blend_y:req, target_blend_y:req, color:req
+	createsprite gSimplePaletteBlendSpriteTemplate, \unused_anim_battler, \unused_subpriority_offset, \selector, \delay, \initial_blend_y, \target_blend_y, \color
+	.endm
+
+	.macro complex_palette_blend unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, selector:req, delay:req, num_blends:req, color1:req, blend_y1:req, color2:req, blend_y2:req
+	createsprite gComplexPaletteBlendSpriteTemplate, \unused_anim_battler, \unused_subpriority_offset, \selector, \delay, \num_blends, \color1, \blend_y1, \color2, \blend_y2
+	.endm
+
+	.macro shake_mon_or_platform unused_anim_battler=ANIM_ATTACKER, unused_subpriority_offset=2, velocity:req, shake_timer:req, shake_duration:req, type:req, battler_selector
+	.if \type == SHAKE_MON_X || \type == SHAKE_MON_Y
+	.ifb \battler_selector
+	.error "battler_selector required for SHAKE_MON_X or SHAKE_MON_Y"
+	.endif
+	.else
+	.ifnb \battler_selector
+	.warning "unused battler_selector in shake_mon_or_platform"
+	.endif
+	.endif
+	.ifb \battler_selector
+	createsprite gShakeMonOrPlatformSpriteTemplate, \unused_anim_battler, \unused_subpriority_offset, \velocity, \shake_timer, \shake_duration, \type
+	.else
+	createsprite gShakeMonOrPlatformSpriteTemplate, \unused_anim_battler, \unused_subpriority_offset, \velocity, \shake_timer, \shake_duration, \type, \battler_selector
+	.endif
+	.endm
+
+	.macro create_megahorn_horn_sprite anim_battler:req, subpriority_offset:req, x1:req, y1:req, x2:req, y2:req, duration:req
+	createsprite gMegahornHornSpriteTemplate, \anim_battler, \subpriority_offset, \x1, \y1, \x2, \y2, \duration
+	.endm
+
+	.macro create_leech_life_needle_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req
+	createsprite gLeechLifeNeedleSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration
+	.endm
+
+	.macro create_web_thread_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, unk2:req, amplitude:req, targets_both:req
+	createsprite gWebThreadSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \unk2, \amplitude, \targets_both
+	.endm
+
+	.macro create_string_wrap_sprite anim_battler:req, subpriority_offset:req, x:req, y:req
+	createsprite gStringWrapSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y
+	.endm
+
+	.macro create_linear_stinger_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req
+	createsprite gLinearStingerSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration
+	.endm
+
+	.macro create_pin_missile_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req, wave_amplitude:req
+	createsprite gPinMissileSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration, \wave_amplitude
+	.endm
+
+	.macro create_tail_glow_orb_sprite anim_battler:req, subpriority_offset:req, relative_to:req
+	createsprite gTailGlowOrbSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to
+	.endm
+
+	.macro create_sharp_teeth_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, animation:req, x_velocity:req, y_velocity:req, half_duration:req
+	createsprite gSharpTeethSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \animation, 256 * \x_velocity, 256 * \y_velocity, \half_duration
+	.endm
+
+	.macro create_clamp_jaw_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, animation:req, x_velocity:req, y_velocity:req, half_duration:req
+	createsprite gClampJawSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \animation, 256 * \x_velocity, 256 * \y_velocity, \half_duration
+	.endm
+
+	.macro create_tear_drop_sprite anim_battler:req, subpriority_offset:req, relative_to:req, type:req
+	createsprite gTearDropSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, \type
+	.endm
+
+	.macro create_claw_slash_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, animation:req
+	createsprite gClawSlashSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \animation
+	.endm
+
+	.macro create_outrage_flame_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, x_velocity:req, y_velocity:req, flicker_duration:req
+	createsprite gOutrageFlameSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, 256 * \x_velocity, 256 * \y_velocity, \flicker_duration
+	.endm
+
+	.macro create_dragon_breath_fire_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req
+	createsprite gDragonBreathFireSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration
+	.endm
+
+	.macro create_dragon_rage_fire_spit_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req
+	createsprite gDragonRageFireSpitSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration
+	.endm
+
+	.macro create_dragon_rage_fire_plume_sprite anim_battler:req, subpriority_offset:req, relative_to:req, x:req, y:req
+	createsprite gDragonRageFirePlumeSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, \x, \y
+	.endm
+
+	.macro create_dragon_dance_orb_sprite anim_battler:req, subpriority_offset:req, angle:req
+	createsprite gDragonDanceOrbSpriteTemplate, \anim_battler, \subpriority_offset, 256 * \angle
+	.endm
+
+	.macro create_overheat_flame_sprite anim_battler:req, subpriority_offset:req, speed:req, unk1:req, unk2:req, duration:req, y:req
+	createsprite gOverheatFlameSpriteTemplate, \anim_battler, \subpriority_offset, \speed, \unk1, \unk2, \duration, \y
+	.endm
+
+	.macro create_sleep_powder_particle_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, y_velocity:req, wave_amplitude:req, wave_speed:req
+	createsprite gSleepPowderParticleSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, 256 * \y_velocity, \wave_amplitude, \wave_speed
+	.endm
+
+	.macro create_stun_spore_particle_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, y_velocity:req, wave_amplitude:req, wave_speed:req
+	createsprite gStunSporeParticleSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, 256 * \y_velocity, \wave_amplitude, \wave_speed
+	.endm
+
+	.macro create_poison_powder_particle_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, y_velocity:req, wave_amplitude:req, wave_speed:req
+	createsprite gPoisonPowderParticleSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, 256 * \y_velocity, \wave_amplitude, \wave_speed
+	.endm
+
+	.macro create_power_absorption_orb_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req
+	createsprite gPowerAbsorptionOrbSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration
+	.endm
+
+	.macro create_stockpile_absorption_orb_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req
+	createsprite gStockpileAbsorptionOrbSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration
+	.endm
+
+	.macro create_solar_beam_big_orb_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, duration:req, animation:req
+	createsprite gSolarBeamBigOrbSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \duration, \animation
+	.endm
+
+	.macro create_absorption_orb_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, wave_amplitude:req, wave_period:req
+	createsprite gAbsorptionOrbSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \wave_amplitude, \wave_period
+	.endm
+
+	.macro create_hyper_beam_orb_sprite anim_battler:req, subpriority_offset:req
+	createsprite gHyperBeamOrbSpriteTemplate, \anim_battler, \subpriority_offset
+	.endm
+
+	.macro createleechseedsprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req, wave_amplitude:req
+	createsprite gLeechSeedSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration, \wave_amplitude
+	.endm
+
+	.macro create_spore_particle_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, wave_offset:req, duration:req, blend:req
+	createsprite gSporeParticleSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \wave_offset, \duration, \blend
+	.endm
+
+	.macro create_petal_dance_big_flower_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_y:req, duration:req
+	createsprite gPetalDanceBigFlowerSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_y, \duration
+	.endm
+
+	.macro create_petal_dance_small_flower_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_y:req, duration:req
+	createsprite gPetalDanceSmallFlowerSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_y, \duration
+	.endm
+
+	.macro create_razor_leaf_particle_sprite anim_battler:req, subpriority_offset:req, upward_delta_x:req, upward_delta_y:req, upward_duration:req
+	createsprite gRazorLeafParticleSpriteTemplate, \anim_battler, \subpriority_offset, \upward_delta_x, \upward_delta_y, \upward_duration
+	.endm
+
+	.macro create_razor_leaf_cutter_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req, wave_amplitude:req, target_both:req
+	createsprite gRazorLeafCutterSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration, \wave_amplitude, \target_both
+	.endm
+
+	.macro create_swift_star_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, target_x:req, target_y:req, duration:req, wave_amplitude:req, target_both:req
+	createsprite gSwiftStarSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \target_x, \target_y, \duration, \wave_amplitude, \target_both
+	.endm
+
+	.macro create_twister_leaf_sprite anim_battler:req, subpriority_offset:req, duration:req, distance_y:req, wave_period:req, wave_amplitude:req, speed_up_on_frame:req
+	createsprite gTwisterLeafSpriteTemplate, \anim_battler, \subpriority_offset, \duration, \distance_y, \wave_period, \wave_amplitude, \speed_up_on_frame
+	.endm
+
+	.macro create_constrict_binding_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, affine_animation:req, squeezes:req
+	createsprite gConstrictBindingSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \affine_animation, \squeezes
+	.endm
+
+	.macro create_mimic_orb_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req
+	createsprite gMimicOrbSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y
+	.endm
+
+	.macro create_ingrain_root_sprite anim_battler:req, subpriority_offset:req, offset_x:req, offset_y:req, subpriority:req, animation:req, duration:req
+	createsprite gIngrainRootSpriteTemplate, \anim_battler, \subpriority_offset, \offset_x, \offset_y, \subpriority - 30, \animation, \duration
+	.endm
+
+	.macro create_frenzy_plant_root_sprite anim_battler:req, subpriority_offset:req, interpolate_percent:req, offset_x:req, offset_y:req, subpriority:req, animation:req, duration:req
+	createsprite gFrenzyPlantRootSpriteTemplate, \anim_battler, \subpriority_offset, \interpolate_percent, \offset_x, \offset_y, \subpriority - 30, \animation, \duration
+	.endm
+
+	.macro create_ingrain_orb_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, velocity_x:req, wave_amplitude:req, duration:req
+	createsprite gIngrainOrbSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \velocity_x, \wave_amplitude, \duration
+	.endm
+
+	.macro create_present_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, unk2:req, unk3:req, unk4:req
+	createsprite gPresentSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \unk2, \unk3, \unk4
+	.endm
+
+	.macro create_present_heal_particle_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, velocity_y:req, unused3=1
+	createsprite gPresentHealParticleSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \velocity_y, \unused3
+	.endm
+
+	.macro create_item_steal_sprite anim_battler:req, subpriority_offset:req, initial_x:req, initial_y:req, unk2, unk3, unk4
+	createsprite gItemStealSpriteTemplate, \anim_battler, \subpriority_offset, \initial_x, \initial_y, \unk2, \unk3, \unk4
+	.endm
+
+	.macro create_trick_bag_sprite anim_battler:req, subpriority_offset:req, initial_y:req, wave_offset:req
+	createsprite gTrickBagSpriteTemplate, \anim_battler, \subpriority_offset, \initial_y, \wave_offset
+	.endm
+
+	.macro create_confusion_duck_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, wave_offset:req, wave_period:req, duration:req
+	createsprite gConfusionDuckSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \wave_offset, \wave_period, \duration
+	.endm
+
+	.macro create_basic_hitsplat_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, relative_to:req, animation:req
+	createsprite gBasicHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \relative_to, \animation
+	.endm
+
+	.macro create_persist_hitsplat_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, relative_to:req, animation:req, duration:req
+	createsprite gPersistHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \relative_to, \animation, \duration
+	.endm
+
+	.macro create_handle_invert_hitsplat_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, relative_to:req, animation:req
+	createsprite gHandleInvertHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \relative_to, \animation
+	.endm
+
+	.macro create_random_pos_hitsplat_sprite anim_battler:req, subpriority_offset:req, relative_to:req, animation
+	.ifnb \animation
+	createsprite gRandomPosHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, \animation
+	.else
+	createsprite gRandomPosHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, -1
+	.endif
+	.endm
+
+	.macro create_mon_edge_hitsplat_sprite anim_battler:req, subpriority_offset:req, relative_to:req, x:req, y:req, animation:req
+	createsprite gMonEdgeHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \relative_to, \x, \y, \animation
+	.endm
+
+	.macro create_cross_impact_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, relative_to:req, duration:req
+	createsprite gCrossImpactSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \relative_to, \duration
+	.endm
+
+	.macro create_flashing_hitsplat_sprite anim_battler:req, subpriority_offset:req, x:req, y:req, relative_to:req, animation:req
+	createsprite gFlashingHitSplatSpriteTemplate, \anim_battler, \subpriority_offset, \x, \y, \relative_to, \animation
+	.endm
+
+@ createvisualtask wrappers
+@ The arguments are based on the CMD_ARGS of the task.
+
+	.macro metallic_shine priority=5, permanent:req, color
+	.ifb \color
+	createvisualtask AnimTask_MetallicShine, \priority, \permanent, FALSE, RGB_BLACK
+	.else
+	createvisualtask AnimTask_MetallicShine, \priority, \permanent, TRUE, \color
+	.endif
+	.endm
+
+	.macro set_grayscale_pal priority=5, battler:req
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, \priority, \battler, FALSE
+	.endm
+
+	.macro set_original_pal priority=5, battler:req
+	createvisualtask AnimTask_SetGrayscaleOrOriginalPal, \priority, \battler, TRUE
+	.endm
+
+	.macro attacker_fade_to_invisible priority=2, step_delay:req
+	createvisualtask AnimTask_AttackerFadeToInvisible, \priority, \step_delay
+	.endm
+
+	.macro attacker_fade_from_invisible priority=2, step_delay:req
+	createvisualtask AnimTask_AttackerFadeFromInvisible, \priority, \step_delay
+	.endm
+
+	.macro shrink_target_copy priority=5, unk0:req, unk1:req
+	createvisualtask AnimTask_ShrinkTargetCopy, \priority, \unk0, \unk1
+	.endm
+
+	.macro create_leaf_blade_task priority=5
+	createvisualtask AnimTask_LeafBlade, \priority
+	.endm
+
+	.macro blend_color_cycle priority=2, selector:req, delay:req, num_blends:req, initial_blend_y:req, target_blend_y:req, color:req
+	createvisualtask AnimTask_BlendColorCycle, \priority, \selector, \delay, \num_blends, \initial_blend_y, \target_blend_y, \color
+	.endm
+
+	.macro blend_color_cycleexclude priority=2, unk0:req, delay:req, num_blends:req, initial_blend_y:req, target_blend_y:req, color:req
+	createvisualtask AnimTask_BlendColorCycleExclude, \priority, \unk0, \delay, \num_blends, \initial_blend_y, \target_blend_y, \color
+	.endm
+
+	.macro blend_color_cyclebytag priority=2, tag:req, delay:req, num_blends:req, initial_blend_y:req, target_blend_y:req, color:req
+	createvisualtask AnimTask_BlendColorCycleByTag, \priority, \tag, \delay, \num_blends, \initial_blend_y, \target_blend_y, \color
+	.endm
+
+	.macro flash_anim_tag_with_color priority=2, tag:req, delay:req, num_blends:req, color1:req, blend_y1:req, color2:req, blend_y2:req
+	createvisualtask AnimTask_FlashAnimTagWithColor, \priority, \tag, \delay, \num_blends, \color1, \blend_y1, \color2, \blend_y2
+	.endm
+
+	@ NOTE: This function is different on expansion compared to pret
+	.macro invert_screen_color priority=2, scenery:req
+	@ NOTE: These generate 0x000 or 0x101 to match, but the code checks for '& 0x100'.
+	createvisualtask AnimTask_InvertScreenColor, \priority, \scenery
+	.endm
+
+	.macro tint_palettes priority=2, scenery:req, attacker:req, target:req, duration:req, color:req
+	createvisualtask AnimTask_TintPalettes, \priority, \scenery << 8, \attacker << 8, \target << 8, \duration, \color & 0x1F, (\color >> 5) & 0x1F, (\color >> 10) & 0x1F
+	.endm
+
+	.macro shake_battle_platforms priority=2, x_offset:req, y_offset:req, shakes:req, delay:req
+	createvisualtask AnimTask_ShakeBattlePlatforms, \priority, \x_offset, \y_offset, \shakes, \delay
+	.endm
+
+	.macro create_surf_wave priority=2, palette:req
+	createvisualtask AnimTask_CreateSurfWave, \priority, \palette
+	.endm

asm/macros/battle_frontier/battle_tower.inc

@@ -98,14 +98,13 @@
 	waitstate
 	.endm
 
-	.macro multi_do type:req, partnerId:req
+	.macro multi_do type:req
 	special ReducePlayerPartyToSelectedMons
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SET_DATA
 	setvar VAR_0x8005, FRONTIER_DATA_SELECTED_MON_ORDER
 	special CallFrontierUtilFunc @ saves the mon order, so the non-selected mons get restored afterwards
 	setvar VAR_0x8004, SPECIAL_BATTLE_MULTI
 	setvar VAR_0x8005, \type | MULTI_BATTLE_CHOOSE_MONS
-	setvar VAR_0x8006, \partnerId
 	special DoSpecialTrainerBattle
 	waitstate
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SAVE_PARTY
@@ -115,26 +114,26 @@
 
 	.macro multi_2_vs_2 trainer1Id:req, trainer1LoseText:req, trainer2Id:req, trainer2LoseText:req, partnerId:req
 	special SavePlayerParty
-	trainerbattle TRAINER_BATTLE_SET_TRAINERS_FOR_MULTI_BATTLE, OBJ_ID_NONE, \trainer1Id, NULL, \trainer1LoseText, NULL, OBJ_ID_NONE, \trainer2Id, NULL, \trainer2LoseText, NULL, NULL, NULL, FALSE, TRUE, FALSE, FALSE
-	multi_do MULTI_BATTLE_2_VS_2, \partnerId
+	setmultitrainerbattle \trainer1Id, \trainer1LoseText, \trainer2Id, \trainer2LoseText, \partnerId
+	multi_do MULTI_BATTLE_2_VS_2
 	.endm
 
 	.macro multi_2_vs_1 trainer1Id:req, trainer1LoseText:req, partnerId:req
 	special SavePlayerParty
-	trainerbattle TRAINER_BATTLE_SET_TRAINERS_FOR_MULTI_BATTLE, OBJ_ID_NONE, \trainer1Id, NULL, \trainer1LoseText, NULL, OBJ_ID_NONE, TRAINER_NONE, NULL, NULL, NULL, NULL, NULL, FALSE, TRUE, FALSE, FALSE
-	multi_do MULTI_BATTLE_2_VS_1, \partnerId
+	setmultitrainerbattle \trainer1Id, \trainer1LoseText, TRAINER_NONE, NULL, \partnerId
+	multi_do MULTI_BATTLE_2_VS_1
 	.endm
 
 	@ Wild mons need to be assigned to gEnemyParty 0 and 3 slots, other slots need to be cleared out.
 	.macro multi_wild partnerId:req
 	special SavePlayerParty
-	multi_do MULTI_BATTLE_2_VS_WILD, \partnerId
+	setmultitrainerbattle TRAINER_NONE, NULL, TRAINER_NONE, NULL, \partnerId
+	multi_do MULTI_BATTLE_2_VS_WILD
 	.endm
 
-	.macro multi_do_fixed type:req, partnerId:req
+	.macro multi_do_fixed type:req
 	setvar VAR_0x8004, SPECIAL_BATTLE_MULTI
 	setvar VAR_0x8005, \type
-	setvar VAR_0x8006, \partnerId
 	special DoSpecialTrainerBattle
 	waitstate
 	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_SAVE_PARTY
@@ -144,18 +143,19 @@
 
 	.macro multi_fixed_2_vs_2 trainer1Id:req, trainer1LoseText:req, trainer2Id:req, trainer2LoseText:req, partnerId:req
 	special SavePlayerParty
-	trainerbattle TRAINER_BATTLE_SET_TRAINERS_FOR_MULTI_BATTLE, OBJ_ID_NONE, \trainer1Id, NULL, \trainer1LoseText, NULL, OBJ_ID_NONE, \trainer2Id, NULL, \trainer2LoseText, NULL, NULL, NULL, FALSE, TRUE, FALSE, FALSE
-	multi_do_fixed MULTI_BATTLE_2_VS_2, \partnerId
+	setmultitrainerbattle \trainer1Id, \trainer1LoseText, \trainer2Id, \trainer2LoseText, \partnerId
+	multi_do_fixed MULTI_BATTLE_2_VS_2
 	.endm
 
 	.macro multi_fixed_2_vs_1 trainer1Id:req, trainer1LoseText:req, partnerId:req
 	special SavePlayerParty
-	trainerbattle TRAINER_BATTLE_SET_TRAINERS_FOR_MULTI_BATTLE, OBJ_ID_NONE, \trainer1Id, NULL, \trainer1LoseText, NULL, OBJ_ID_NONE, TRAINER_NONE, NULL, NULL, NULL, NULL, NULL, FALSE, TRUE, FALSE, FALSE
-	multi_do_fixed MULTI_BATTLE_2_VS_1, \partnerId
+	setmultitrainerbattle \trainer1Id, \trainer1LoseText, TRAINER_NONE, NULL, \partnerId
+	multi_do_fixed MULTI_BATTLE_2_VS_1
 	.endm
 
 	@ Wild mons need to be assigned to gEnemyParty 0 and 3 slots, other slots need to be cleared out.
 	.macro multi_fixed_wild partnerId:req
 	special SavePlayerParty
-	multi_do_fixed MULTI_BATTLE_2_VS_WILD, \partnerId
+	setmultitrainerbattle TRAINER_NONE, NULL, TRAINER_NONE, NULL, \partnerId
+	multi_do_fixed MULTI_BATTLE_2_VS_WILD
 	.endm

asm/macros/event.inc

@@ -58,6 +58,8 @@
 	STD_FIND_ITEM = 1
 	STD_OBTAIN_DECORATION = 7
 	STD_REGISTER_MATCH_CALL = 8
+	STD_PUT_ITEM_AWAY = 11
+	STD_RECEIVED_ITEM = 12
 
 	@ Calls the script in gStdScripts at index function.
 	.macro callstd function:req
@@ -644,6 +646,10 @@
 		.endif
 	.endm
 
+	.macro waitmovementall
+	callnative Script_waitmovementall, requests_effects=1
+	.endm
+
 	@ Attempts to despawn the specified (localId) object on the specified map.
 	@ It also sets the object's visibility flag if it has one.
 	@ If no map is specified, then the current map is used.
@@ -726,7 +732,7 @@
 	OBJ_ID_NONE = 0
 
 	@ Configures the arguments for a trainer battle, then jumps to the appropriate script in scripts/trainer_battle.inc
-	.macro trainerbattle type:req localIdA:req, trainer_a:req, intro_text_a:req, lose_text_a:req, event_script_a:req, localIdB:req, trainer_b:req, intro_text_b:req, lose_text_b:req, event_script_b:req, victory_text:req, cannot_battle:req, isDouble:req, playMusicA:req, playMusicB:req, isRematch:req
+	.macro trainerbattle type:req localIdA:req, trainer_a:req, intro_text_a:req, lose_text_a:req, event_script_a:req, localIdB:req, trainer_b:req, intro_text_b:req, lose_text_b:req, event_script_b:req, victory_text:req, cannot_battle:req, isDouble:req, playMusicA:req, playMusicB:req, isRematch:req, rival_battle_flags=0
 	.byte SCR_OP_TRAINERBATTLE
 	.set trainerbattle_flags, 0
 	.ifgt \isDouble; .set trainerbattle_flags, trainerbattle_flags | (1 << 0); .endif
@@ -747,6 +753,7 @@
 	.4byte \event_script_b      @ retAddrB
 	.4byte \victory_text        @ victoryText
 	.4byte \cannot_battle       @ cannotBattle
+	.byte \rival_battle_flags	@ rivalBattleFlags
 	.endm
 
 	NO_MUSIC = FALSE
@@ -796,6 +803,11 @@
 	trainerbattle TRAINER_BATTLE_TWO_TRAINERS_NO_INTRO, OBJ_ID_NONE, \trainer_a, NULL, \lose_text_a, NULL, OBJ_ID_NONE, \trainer_b, NULL, \lose_text_b, NULL, NULL, NULL, FALSE, TRUE, FALSE, FALSE
 	.endm
 
+	@ Starts a trainer battle with victory text if the player loses. If flags is nonzero, the player will be healed after battle (and its assumed to be the tutorial battle)
+	.macro trainerbattle_earlyrival trainer:req, flags:req, lose_text:req, victory_text:req
+	trainerbattle TRAINER_BATTLE_EARLY_RIVAL, OBJ_ID_NONE, \trainer, NULL, \lose_text, NULL, OBJ_ID_NONE, TRAINER_NONE, NULL, NULL, NULL, \victory_text, NULL, FALSE, TRUE, FALSE, FALSE, \flags
+	.endm
+
 	@ Starts a trainer battle using the battle information stored in RAM (usually by the scripts in trainer_battle.inc, which
 	@ are run by trainerbattle), and blocks script execution until the battle finishes.
 	.macro dotrainerbattle
@@ -1014,9 +1026,9 @@
 	.2byte \level
 	.ifnb \item; .set givemon_flags, givemon_flags | (1 << 0); .endif
 	.ifnb \ball; .set givemon_flags, givemon_flags | (1 << 1); .endif
-	.ifnb \nature; .set givemon_flags, givemon_flags | (1 << 2); .endif
+	.set givemon_flags, givemon_flags | (1 << 2);
 	.ifnb \abilityNum; .set givemon_flags, givemon_flags | (1 << 3); .endif
-	.ifnb \gender; .set givemon_flags, givemon_flags | (1 << 4); .endif
+	.set givemon_flags, givemon_flags | (1 << 4);
 	.ifnb \hpEv; .set givemon_flags, givemon_flags | (1 << 5); .endif
 	.ifnb \atkEv; .set givemon_flags, givemon_flags | (1 << 6); .endif
 	.ifnb \defEv; .set givemon_flags, givemon_flags | (1 << 7); .endif
@@ -1040,9 +1052,9 @@
 	.4byte givemon_flags
 	.ifnb \item; .2byte \item; .endif
 	.ifnb \ball; .2byte \ball; .endif
-	.ifnb \nature; .2byte \nature; .endif
+	.ifnb \nature; .2byte \nature; .else; .2byte NATURE_MAY_SYNCHRONIZE; .endif
 	.ifnb \abilityNum; .2byte \abilityNum; .endif
-	.ifnb \gender; .2byte \gender; .endif
+	.ifnb \gender; .2byte \gender; .else; .2byte MON_GENDER_MAY_CUTE_CHARM; .endif
 	.ifnb \hpEv; .2byte \hpEv; .endif
 	.ifnb \atkEv; .2byte \atkEv; .endif
 	.ifnb \defEv; .2byte \defEv; .endif
@@ -1906,6 +1918,12 @@
 	.2byte \id
 	.endm
 
+	@ Gets the width of the specified message in the Braille font and sets the result to VAR_0x8004.
+	.macro getbraillestringwidth msg:req
+	.byte SCR_OP_GETBRAILLESTRINGWIDTH
+	.4byte \msg
+	.endm
+
 	.macro dynmultistack left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, shouldSort:req, initialSelected:req, callbacks:req
 	_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, \shouldSort, \initialSelected, \callbacks, NULL
 	.endm
@@ -2083,6 +2101,13 @@
 	callstd STD_FIND_ITEM
 	.endm
 
+	@ Prints the message "{PLAYER} put the {ITEM} in the {POCKET}." The item name is pluralized, if applicable.
+	.macro putitemaway item:req, amount=1
+	setorcopyvar VAR_0x8000, \item
+	setorcopyvar VAR_0x8001, \amount
+	callstd STD_PUT_ITEM_AWAY
+	.endm
+
 	@ Equivalent to giveitem but for a single decoration.
 	.macro givedecoration decoration:req
 	setorcopyvar VAR_0x8000, \decoration
@@ -2125,6 +2150,11 @@
 	.4byte \func
 	.endm
 
+	.macro setdynamicswitchaifunc func:req
+	callnative ScriptSetDynamicAiSwitchFunc, requests_effects=1
+	.4byte \func
+	.endm
+
 	@ Set up a totem boost for the next battle.
 	@ 'battler' is the position of the mon you want to gain a boost. see B_POSITION_xx in include/constants/battle.h.
 	@ The rest of the arguments are the stat change values to each stat.
@@ -2274,6 +2304,12 @@
 	.2byte \slot
 	.endm
 
+	@ Sets the hp to 0 for the Pokémon in \slot.
+	.macro setko slot:req
+	callnative Script_SetKO, requests_effects=1
+	.2byte \slot
+	.endm
+
 	@ Sets VAR_RESULT to the Pokémon in \slot's Tera Type
 	.macro checkteratype slot:req
 	callnative CheckTeraType, requests_effects=1
@@ -2340,7 +2376,7 @@
 	@ ============================ @
 	@ FAKE RTC MACROS
 	@ Will only function if OW_USE_FAKE_RTC is true. If it has any additional requirements, it will be listed accordingly.
-	
+
 	@ When OW_USE_FAKE_RTC is true and OW_FLAG_PAUSE_TIME is assigned, this macro will stop the flow of time.
 	.macro pausefakertc
 	callnative Script_PauseFakeRtc, requests_effects=1
@@ -2364,26 +2400,26 @@
 	.4byte \minutes
 	.endm
 
-	@ When OW_USE_FAKE_RTC is true, adds a specified number of days to the time. 
+	@ When OW_USE_FAKE_RTC is true, adds a specified number of days to the time.
 	.macro adddays days:req
 	callnative ScrCmd_adddays, requests_effects=1
 	.4byte \days
 	.endm
 
-	@ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. 
+	@ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time.
 	.macro addhours hours:req
 	callnative ScrCmd_addhours, requests_effects=1
 	.4byte \hours
 	.endm
 
-	@ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time. 
+	@ When OW_USE_FAKE_RTC is true, adds a specified number of days, hours, and minutes to the time.
 	.macro addminutes minutes:req
 	callnative ScrCmd_addminutes, requests_effects=1
 	.4byte \minutes
 	.endm
 
-	@ Forwards the time to a specified hour and minute. 
-	@ This causes the time to go to the next day if the time has already been past. 
+	@ Forwards the time to a specified hour and minute.
+	@ This causes the time to go to the next day if the time has already been past.
 	.macro fwdtime hours:req, minutes:req
 	callnative ScrCmd_fwdtime, requests_effects=1
 	.4byte \hours
@@ -2593,6 +2629,68 @@
 	cant_see_if 5
 	.endm
 
+	.macro setmultitrainerbattle trainer_a:req, lose_text_a:req, trainer_b:req, lose_text_b:req, partnerId:req
+	callnative SetMultiTrainerBattle
+	.2byte \trainer_a
+	.4byte \lose_text_a
+	.2byte \trainer_b
+	.4byte \lose_text_b
+	.2byte \partnerId
+	.endm
+
+	@ facility version of `trainerbattle` macro. Used in Battle Pyramid and Trainer Hill
+	.macro facilitytrainerbattle facility:req
+	callnative FacilityTrainerBattle
+	.byte \facility
+	.endm
+
+	@ immediately starts a battle of the given facility
+	.macro dofacilitytrainerbattle facility:req
+	callnative DoFacilityTrainerBattle
+	.byte \facility
+	.endm
+	
+	.macro ingame_trade tradeId:req wantTradeMsg:req, declineTradeJump:req, wrongMonJump:req, tradeCompleteMsg:req
+	setvar VAR_0x8005, \tradeId
+	specialvar VAR_0x8009, GetInGameTradeSpeciesInfo
+	msgbox \wantTradeMsg, MSGBOX_YESNO
+	goto_if_eq VAR_RESULT, NO, \declineTradeJump
+	chooseboxmon SELECT_PC_MON_TRADE
+	waitstate
+	goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, \declineTradeJump
+	specialvar VAR_0x800B, GetTradeSpecies
+	goto_if_ne VAR_0x800B, VAR_0x8009, \wrongMonJump
+	special CreateInGameTradePokemon
+	special DoInGameTradeScene
+	waitstate
+	msgbox \tradeCompleteMsg, MSGBOX_DEFAULT
+	.endm
+
+	.macro move_tutor moveId:req, wantTeachingMsg:req, monSelectMsg:req, declinedJmp:req, taughtJmp:req, flagId=0
+	.if \flagId
+		goto_if_set \flagId, \taughtJmp
+	.endif
+	msgbox \wantTeachingMsg, MSGBOX_YESNO
+	goto_if_eq VAR_RESULT, NO, \declinedJmp
+	.if \flagId
+		call MoveTutor_EventScript_CanOnlyBeLearnedOnce
+		goto_if_eq VAR_RESULT, NO, \declinedJmp
+	.endif
+	msgbox \monSelectMsg, MSGBOX_DEFAULT
+	setvar VAR_0x8005, \moveId
+	call MoveTutor_EventScript_OpenBox
+	goto_if_eq VAR_RESULT, FALSE, \declinedJmp
+	.if \flagId
+		setflag \flagId
+	.endif
+	goto \taughtJmp
+	.endm
+
+	.macro chooseboxmon selectionType=SELECT_PC_MON_NORMAL
+	callnative ChooseBoxMon
+	.byte \selectionType
+	.endm
+
 @ Follower NPCs
 
 	@ Sets an existing NPC up to follow the player.
@@ -2617,7 +2715,7 @@
 		.2byte \battlePartner
 		.4byte \script
 		updatefollowingmon
-        1:
+		1:
 	.else
 		.error "setfollowernpc unavailable with FNPC_ENABLE_NPC_FOLLOWERS defined as FALSE"
 	.endif
@@ -2710,3 +2808,49 @@
 	callnative ScrCmd_istmrelearneractive, requests_effects=1
 	.4byte \destination
 	.endm
+
+	@ Sets a starting status for the next battle. Can be stacked.
+	.macro setstartingstatus status:req
+	callnative ScrCmd_setstartingstatus
+	.byte \status
+	.endm
+
+@ FRLG
+
+
+	@ Prints the provided message after playing the fanfare music (can only be MUS_LEVEL_UP or MUS_RG_OBTAIN_KEY_ITEM).
+	@ It then prints the message shown by using putitemaway.
+	.macro msgreceiveditem msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP
+	loadword 0, \msg
+	setorcopyvar VAR_0x8000, \item
+	setorcopyvar VAR_0x8001, \amount
+	setorcopyvar VAR_0x8002, \fanfare
+	callstd STD_RECEIVED_ITEM
+	.endm
+
+	@ Adds the specified item to the bag, then prints a message with fanfare. See description of msgreceiveditem.
+	.macro giveitem_msg msg:req, item:req, amount=1, fanfare=MUS_LEVEL_UP
+	additem \item, \amount
+	msgreceiveditem \msg, \item, \amount, \fanfare
+	.endm
+
+	@ Depends on the provided function. With the default argument, unlocks the specified entry in the Fame Checker.
+	.macro famechecker person:req, index:req, function=SetFlavorTextFlagFromSpecialVars
+	setvar VAR_0x8004, \person
+	setvar VAR_0x8005, \index
+	special \function
+	.endm
+
+	@ Sets the 'defeated' flag for all trainers in the specified gym.
+	.macro set_gym_trainers_frlg gym:req
+	setvar VAR_0x8008, \gym
+	call Common_EventScript_SetGymTrainers_Frlg
+	.endm
+
+	@ Prints a braille message, then waits for users input.
+	.macro braillemessage_wait text:req
+	setvar VAR_0x8006, 0
+	braillemessage \text
+	getbraillestringwidth \text
+	call EventScript_BrailleCursorWaitButton
+	.endm

asm/macros/m4a.inc

@@ -15,7 +15,7 @@
 	.macro voice_group label:req, starting_note
 	.align 2
 	.ifb \starting_note
-		.global voicegroup_\label 
+		.global voicegroup_\label
 		voicegroup_\label:
 	.else
 		.set voicegroup_\label, . - \starting_note * 0xC

asm/macros/map.inc

@@ -46,12 +46,10 @@
 	.endm
 
 	@ Defines an object event template for map data, to be used by a clone object. Mirrors the struct layout of ObjectEventTemplate in include/global.fieldmap.h
-	@ NOTE: The handling for this type of event does not exist in Emerald by default; it is exclusive to FRLG.
 	.macro clone_event index:req, gfx:req, x:req, y:req, target_local_id:req, target_map_id:req
 	.byte \index
-	.byte \gfx
+	.2byte \gfx
 	.byte OBJ_KIND_CLONE
-	.space 1  @ Padding
 	.2byte \x, \y
 	.byte \target_local_id
 	.space 3  @ Padding
@@ -91,17 +89,12 @@
 	@ Defines a generic background event for map data. Mirrors the struct layout of BgEvent in include/global.fieldmap.h
 	@ 'kind' is any BG_EVENT_* constant (see include/constants/event_bg.h).
 	@ 'arg6' and 'arg7' are used differently depending on the bg event type. See macros below
-	.macro bg_event x:req, y:req, elevation:req, kind:req, arg6:req, arg7
+	.macro bg_event x:req, y:req, elevation:req, kind:req, arg6:req
 	.2byte \x, \y
 	.byte \elevation
 	.byte \kind
 	.space 2  @ Padding
-	.if \kind != BG_EVENT_HIDDEN_ITEM
-		.4byte \arg6
-	.else
-		.2byte \arg6
-		.2byte \arg7
-	.endif
+	.4byte \arg6
 	inc _num_signs
 	.endm
 
@@ -111,8 +104,17 @@
 	.endm
 
 	@ Defines a background hidden item event for map data
-	.macro bg_hidden_item_event x:req, y:req, elevation:req, item:req, flag:req
-	bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item, ((\flag) - FLAG_HIDDEN_ITEMS_START)
+	.macro bg_hidden_item_event x:req, y:req, elevation:req, item:req, flag:req, quantity=1, underfoot=FALSE
+	.if \flag < FLAG_HIDDEN_ITEMS_START
+	.error "Hidden Item flag \flag is too small. Must be >= FLAG_HIDDEN_ITEMS_START."
+	.endif
+	.if \item >= (1 << 12)
+	.error "quantity \quantity too large"
+	.endif
+	.if \quantity >= (1 << 7)
+	.error "quantity \quantity too large"
+	.endif
+	bg_event \x, \y, \elevation, BG_EVENT_HIDDEN_ITEM, \item | (((\flag) - FLAG_HIDDEN_ITEMS_START) << 11)| (\quantity << 24) | (\underfoot << 31)
 	.endm
 
 	@ Defines a background secret base event for map data

asm/macros/trainer_tower.inc

@@ -0,0 +1,133 @@
+	@ Sets NPC gfx and the floor layout depending on current challenge and floor
+	.macro ttower_initfloor
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_INIT_FLOOR
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Buffers the opponents battle speech to gStringVar4. speech is any TRAINER_TOWER_TEXT_*.
+	.macro ttower_getspeech speech:req, trainer=0xFF
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_SPEECH
+	setvar VAR_0x8005, \speech
+	.if \trainer >= VARS_START && \trainer != 0xFF
+	copyvar VAR_0x8006, \trainer
+	.elseif \trainer != 0xFF
+	setvar VAR_0x8006, \trainer
+	.endif
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Starts a trainer tower battle. VAR_0x8005 is unused
+	.macro ttower_dobattle
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_DO_BATTLE
+	setvar VAR_0x8005, 0
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the current challenge type (CHALLENGE_TYPE_*). Mixed challenges use different types for each floor. If VAR_0x8005 is != FALSE, does nothing
+	.macro ttower_getchallengetype
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_TYPE
+	setvar VAR_0x8005, FALSE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Adds 1 to the number of floors cleared (all trainers on floor defeated)
+	.macro ttower_clearedfloor
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLEARED_FLOOR
+	special CallTrainerTowerFunc
+	.endm
+
+	@ TRUE if the trainers on this floor were already beaten, FALSE otherwise
+	.macro ttower_isfloorcleared
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_FLOOR_CLEARED
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Initializes the Trainer Tower challenge and starts the timer
+	.macro ttower_startchallenge
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_START_CHALLENGE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ 0 if not spoken to yet, 1 if spoken to but not received prize, 2 if received prize
+	.macro ttower_getownerstate
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_OWNER_STATE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Tries to give prize. 0 if given successfully, 1 if no room for prize, 2 if giving prize should be skipped
+	.macro ttower_giveprize
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GIVE_PRIZE
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Checks the final challenge time. 0 if new record, 1 if not, 2 if time has already been checked
+	.macro ttower_checkfinaltime
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_FINAL_TIME
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Resumes the challenge timer (or starts, if the timer is 0)
+	.macro ttower_resumetimer
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_RESUME_TIMER
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Sets that the player lost the challenge
+	.macro ttower_setlost
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SET_LOST
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the status of the current Trainer Tower challenge (CHALLENGE_STATUS_*)
+	.macro ttower_getchallengestatus
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_CHALLENGE_STATUS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Buffers the current challenge time (min in gStringVar1, sec in gStringVar2, fraction sec in gStringVar3)
+	.macro ttower_gettime
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_TIME
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Unused. Displays Trainer Tower results. Handled by ShowBattleRecords instead
+	.macro ttower_showresults
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOW_RESULTS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Unused. See above
+	.macro ttower_closeresults
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CLOSE_RESULTS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Returns the eligibility of the players party for a double battle (using GetMonsStateToDoubles)
+	.macro ttower_checkdoubles
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_CHECK_DOUBLES
+	special CallTrainerTowerFunc
+	.endm
+
+	@ For the unused E-Reader challenges, gets the number of floors used. Otherwise returns FALSE (all floors used)
+	.macro ttower_getnumfloors
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_NUM_FLOORS
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Dummied, always returns FALSE
+	.macro ttower_shouldexit
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_SHOULD_WARP_TO_COUNTER
+	special CallTrainerTowerFunc
+	.endm
+
+	@ Plays the encounter music for the trainer number in VAR_TEMP_1
+	.macro ttower_encountermusic
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_ENCOUNTER_MUSIC
+	special CallTrainerTowerFunc
+	.endm
+
+	@ TRUE if the player reached the Battle Tower owner, FALSE otherwise
+	.macro ttower_getbeatchallenge
+	setvar VAR_0x8004, TRAINER_TOWER_FUNC_GET_BEAT_CHALLENGE
+	special CallTrainerTowerFunc
+	.endm

audio_rules.mk

@@ -9,7 +9,7 @@ SOUND_BIN_DIR := sound
 # Needs to recompile for B_NUM_LOW_HEALTH_BEEPS in battle.h
 EXPANSION_BATTLE_CONFIG := include/config/battle.h
 
-SPECIAL_OUTDIRS := $(MID_ASM_DIR) $(CRY_BIN_DIR) 
+SPECIAL_OUTDIRS := $(MID_ASM_DIR) $(CRY_BIN_DIR)
 SPECIAL_OUTDIRS += $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/direct_sound_samples/phonemes $(SOUND_BIN_DIR)/direct_sound_samples/cries
 $(shell mkdir -p $(SPECIAL_OUTDIRS) )
 
@@ -25,11 +25,11 @@ $(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.wav
 	$(WAV2AGB) -b -c -l 1 --no-pad $< $@
 
 # Uncompressed cries
-$(CRY_BIN_DIR)/uncomp_%.bin: $(CRY_SUBDIR)/uncomp_%.aif 
+$(CRY_BIN_DIR)/uncomp_%.bin: $(CRY_SUBDIR)/uncomp_%.aif
 	$(AIF) $< $@
 
 # Uncompressed sounds
-$(SOUND_BIN_DIR)/%.bin: sound/%.wav 
+$(SOUND_BIN_DIR)/%.bin: sound/%.wav
 	$(WAV2AGB) -b $< $@
 
 # For each line in midi.cfg, we do some trickery to convert it into a make rule for the `.mid` file described on the line

charmap.txt

@@ -350,6 +350,7 @@ ARCHIE         = FD 0A
 MAXIE          = FD 0B
 KYOGRE         = FD 0C
 GROUDON        = FD 0D
+REGION         = FD 0E
 
 @ battle string placeholders
 
@@ -435,10 +436,10 @@ DYNAMIC  =   F7
 
 @ more text functions
 
-COLOR = FC 01 @ use a color listed below right after
-HIGHLIGHT = FC 02 @ same as fc 01
-SHADOW = FC 03 @ same as fc 01
-COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
+COLOR = FC 01 @ use a color listed below right after. sets base text color
+HIGHLIGHT = FC 02 @ same as fc 01. sets background and accent color
+SHADOW = FC 03 @ same as fc 01. sets shadow color
+COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 colors
 PALETTE = FC 05 @ used in credits
 FONT = FC 06 @ Given a font id, or use font constants below instead
 RESET_FONT = FC 07
@@ -460,6 +461,9 @@ ENG = FC 16
 PAUSE_MUSIC = FC 17
 RESUME_MUSIC = FC 18
 SPEAKER = FC 19
+ACCENT = FC 1A @ same as FC 01. sets accent color
+BACKGROUND = FC 1B @ same as FC 01. sets background color
+TEXT_COLORS = FC 1C @ takes 3 colors: text base color, shadow and accent
 
 @ Speaker names, the order must be matching with include/constants/speaker_names.h
 NAME_NONE = 00
@@ -479,6 +483,9 @@ FONT_SMALL_NARROWER = FC 06 0B
 FONT_SHORT_NARROW = FC 06 0C
 FONT_SHORT_NARROWER = FC 06 0D
 
+FONT_MALE = FC 06 01
+FONT_FEMALE = FC 06 01
+
 @ colors
 
 TRANSPARENT = 00

constants/constants.inc

@@ -1,3 +1,2 @@
 	.include "constants/gba_constants.inc"
 	.include "constants/global.inc"
-	.include "constants/tms_hms.inc"

constants/m4a_constants.inc

@@ -181,7 +181,7 @@
 	struct_field o_MusicPlayerTrack_ToneData_sustain, 1
 	struct_field o_MusicPlayerTrack_ToneData_release, 1
 	struct_field o_MusicPlayerTrack_gap, 10
-	struct_field o_MusicPlayerTrack_unk_3A, 2
+	struct_field o_MusicPlayerTrack_timer, 2
 	struct_field o_MusicPlayerTrack_unk_3C, 4
 	struct_field o_MusicPlayerTrack_cmdPtr, 4
 	struct_field o_MusicPlayerTrack_patternStack, 12

constants/tms_hms.inc

@@ -1,22 +0,0 @@
-#ifndef GUARD_CONSTANTS_TMS_HMS_INC
-#define GUARD_CONSTANTS_TMS_HMS_INC
-
-#include "constants/tms_hms.h"
-
-/* Expands to:
-* enum_start ITEM_TM01
-* enum ITEM_TM_FOCUS_PUNCH
-* ...
-* enum_start ITEM_HM01
-* enum ITEM_HM_CUT
-* ... */
-#define EQUIV_TM(id) enum ITEM_TM_ ## id;
-#define EQUIV_HM(id) enum ITEM_HM_ ## id;
-	enum_start ITEM_TM01
-FOREACH_TM(EQUIV_TM)
-	enum_start ITEM_HM01
-FOREACH_HM(EQUIV_HM)
-#undef EQUIV_TM
-#undef EQUIV_HM
-
-#endif @ GUARD_CONSTANTS_TMS_HMS_INC

data/battle_scripts_2.s

@@ -1,4 +1,5 @@
 #include "config/battle.h"
+#include "constants/global.h"
 #include "constants/battle.h"
 #include "constants/battle_script_commands.h"
 #include "constants/battle_anim.h"
@@ -33,6 +34,8 @@ gBattlescriptsForSafariActions::
 	.4byte BattleScript_ActionGetNear
 	.4byte BattleScript_ActionThrowPokeblock
 	.4byte BattleScript_ActionWallyThrow
+	.4byte BattleScript_ActionThrowRock
+	.4byte BattleScript_ActionThrowBait
 
 BattleScript_ItemEnd:
 	end
@@ -81,6 +84,7 @@ BattleScript_ItemRestoreHP_SendOutRevivedBattler:
 	switchinanim BS_SCRIPTING, FALSE, FALSE
 	waitstate
 	switchineffects BS_SCRIPTING
+	switchinevents
 	end
 
 BattleScript_ItemCureStatus::
@@ -147,6 +151,7 @@ BattleScript_ItemSetMist::
 
 BattleScript_ItemSetFocusEnergy::
 	call BattleScript_UseItemMessage
+	itemincreasestat
 	jumpifvolatile BS_ATTACKER, VOLATILE_DRAGON_CHEER, BattleScript_ButItFailed
 	jumpifvolatile BS_ATTACKER, VOLATILE_FOCUS_ENERGY, BattleScript_ButItFailed
 	setfocusenergy BS_ATTACKER
@@ -166,11 +171,12 @@ BattleScript_ItemRestorePP::
 
 BattleScript_ItemIncreaseAllStats::
 	call BattleScript_UseItemMessage
+	itemincreasestat
 	call BattleScript_AllStatsUp
 	end
 
 BattleScript_BallThrow::
-	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_WALLY_TUTORIAL, BattleScript_BallThrowByWally
+	jumpifword CMP_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_CATCH_TUTORIAL, BattleScript_BallThrowByWally
 	printstring STRINGID_PLAYERUSEDITEM
 	handleballthrow
 
@@ -246,8 +252,11 @@ BattleScript_RunByUsingItem::
 	finishturn
 
 BattleScript_ActionWatchesCarefully:
-	printstring STRINGID_PKMNWATCHINGCAREFULLY
+	printfromtable gSafariReactionStringIds
 	waitmessage B_WAIT_TIME_LONG
+#if IS_FRLG
+	playanimation BS_OPPONENT1, B_ANIM_SAFARI_REACTION
+#endif
 	end2
 
 BattleScript_ActionGetNear:
@@ -299,3 +308,34 @@ BattleScript_TrainerBSlideMsgRet::
 BattleScript_TrainerBSlideMsgEnd2::
 	call BattleScript_TrainerBSlideMsgRet
 	end2
+
+BattleScript_TrainerPartnerSlideMsgRet::
+	trainerslidein BS_PLAYER2
+	handletrainerslidemsg BS_SCRIPTING, PRINT_SLIDE_MESSAGE
+	waitstate
+	trainerslideout BS_PLAYER2
+	waitstate
+	handletrainerslidemsg BS_SCRIPTING, RESTORE_BATTLER_SLIDE_CONTROL
+	return
+
+BattleScript_TrainerPartnerSlideMsgEnd2::
+	call BattleScript_TrainerPartnerSlideMsgRet
+	end2
+
+BattleScript_GhostBallDodge::
+	waitmessage B_WAIT_TIME_LONG
+	printstring STRINGID_ITDODGEDBALL
+	waitmessage B_WAIT_TIME_LONG
+	finishaction
+
+BattleScript_ActionThrowRock::
+	printstring STRINGID_THREWROCK
+	waitmessage B_WAIT_TIME_LONG
+	playanimation BS_ATTACKER, B_ANIM_ROCK_THROW
+	end2
+
+BattleScript_ActionThrowBait::
+	printstring STRINGID_THREWBAIT
+	waitmessage B_WAIT_TIME_LONG
+	playanimation BS_ATTACKER, B_ANIM_POKEBLOCK_THROW
+	end2

data/event_scripts.s

@@ -13,6 +13,7 @@
 #include "constants/battle_pike.h"
 #include "constants/battle_pyramid.h"
 #include "constants/battle_setup.h"
+#include "constants/battle_special.h"
 #include "constants/battle_tent.h"
 #include "constants/battle_tower.h"
 #include "constants/berry.h"
@@ -25,6 +26,7 @@
 #include "constants/easy_chat.h"
 #include "constants/event_objects.h"
 #include "constants/event_object_movement.h"
+#include "constants/fame_checker.h"
 #include "constants/field_effects.h"
 #include "constants/field_move.h"
 #include "constants/field_poison.h"
@@ -46,12 +48,15 @@
 #include "constants/metatile_labels.h"
 #include "constants/move_relearner.h"
 #include "constants/moves.h"
+#include "constants/mystery_gift.h"
 #include "constants/party_menu.h"
+#include "constants/pokeball.h"
 #include "constants/pokedex.h"
 #include "constants/pokemon.h"
 #include "constants/rtc.h"
 #include "constants/roulette.h"
 #include "constants/script_menu.h"
+#include "constants/seagallop.h"
 #include "constants/secret_bases.h"
 #include "constants/siirtc.h"
 #include "constants/songs.h"
@@ -59,7 +64,9 @@
 #include "constants/species.h"
 #include "constants/trade.h"
 #include "constants/trainer_hill.h"
+#include "constants/trainer_tower.h"
 #include "constants/trainers.h"
+#include "constants/trainer_card.h"
 #include "constants/tv.h"
 #include "constants/union_room.h"
 #include "constants/vars.h"
@@ -74,6 +81,7 @@
 	.set ALLOCATE_SCRIPT_CMD_TABLE, 1
 	.include "data/script_cmd_table.inc"
 
+.align 2
 gSpecialVars::
 	.4byte gSpecialVar_0x8000
 	.4byte gSpecialVar_0x8001
@@ -112,8 +120,11 @@ gStdScripts::
 	.4byte Std_RegisteredInMatchCall   @ STD_REGISTER_MATCH_CALL
 	.4byte Std_MsgboxGetPoints         @ MSGBOX_GETPOINTS
 	.4byte Std_MsgboxPokenav           @ MSGBOX_POKENAV
+	.4byte Std_PutItemAway             @ STD_PUT_ITEM_AWAY
+	.4byte Std_ReceivedItem            @ STD_RECEIVED_ITEM
 gStdScripts_End::
 
+
 	.include "data/maps/PetalburgCity/scripts.inc"
 	.include "data/maps/SlateportCity/scripts.inc"
 	.include "data/maps/MauvilleCity/scripts.inc"
@@ -584,10 +595,460 @@ gStdScripts_End::
 	.include "data/maps/Route119_House/scripts.inc"
 	.include "data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc"
 
+.if IS_FRLG
+
+@ FRLG scripts
+	.include "data/maps/BattleColosseum_2P_Frlg/scripts.inc"
+	.include "data/maps/TradeCenter_Frlg/scripts.inc"
+	.include "data/maps/RecordCorner_Frlg/scripts.inc"
+	.include "data/maps/BattleColosseum_4P_Frlg/scripts.inc"
+	.include "data/maps/UnionRoom_Frlg/scripts.inc"
+	.include "data/maps/ViridianForest_Frlg/scripts.inc"
+	.include "data/maps/MtMoon_1F_Frlg/scripts.inc"
+	.include "data/maps/MtMoon_B1F_Frlg/scripts.inc"
+	.include "data/maps/MtMoon_B2F_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_Exterior_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Corridor_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Corridor_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_3F_Corridor_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Corridor_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_Deck_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_Kitchen_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_CaptainsOffice_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room1_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room2_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room3_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room4_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room5_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room7_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room1_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room2_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room3_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room4_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room5_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_2F_Room6_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room1_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room2_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room3_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room4_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_B1F_Room5_Frlg/scripts.inc"
+	.include "data/maps/SSAnne_1F_Room6_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_NorthEntrance_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_NorthSouthTunnel_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_SouthEntrance_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_WestEntrance_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_EastWestTunnel_Frlg/scripts.inc"
+	.include "data/maps/UndergroundPath_EastEntrance_Frlg/scripts.inc"
+	.include "data/maps/DiglettsCave_NorthEntrance_Frlg/scripts.inc"
+	.include "data/maps/DiglettsCave_B1F_Frlg/scripts.inc"
+	.include "data/maps/DiglettsCave_SouthEntrance_Frlg/scripts.inc"
+	.include "data/maps/VictoryRoad_1F_Frlg/scripts.inc"
+	.include "data/maps/VictoryRoad_2F_Frlg/scripts.inc"
+	.include "data/maps/VictoryRoad_3F_Frlg/scripts.inc"
+	.include "data/maps/RocketHideout_B1F_Frlg/scripts.inc"
+	.include "data/maps/RocketHideout_B2F_Frlg/scripts.inc"
+	.include "data/maps/RocketHideout_B3F_Frlg/scripts.inc"
+	.include "data/maps/RocketHideout_B4F_Frlg/scripts.inc"
+	.include "data/maps/RocketHideout_Elevator_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_1F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_2F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_3F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_4F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_5F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_6F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_7F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_8F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_9F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_10F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_11F_Frlg/scripts.inc"
+	.include "data/maps/SilphCo_Elevator_Frlg/scripts.inc"
+	.include "data/maps/PokemonMansion_1F_Frlg/scripts.inc"
+	.include "data/maps/PokemonMansion_2F_Frlg/scripts.inc"
+	.include "data/maps/PokemonMansion_3F_Frlg/scripts.inc"
+	.include "data/maps/PokemonMansion_B1F_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_Center_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_East_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_North_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_West_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_Center_RestHouse_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_East_RestHouse_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_North_RestHouse_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_West_RestHouse_Frlg/scripts.inc"
+	.include "data/maps/SafariZone_SecretHouse_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCave_1F_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCave_2F_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCave_B1F_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_LoreleisRoom_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_BrunosRoom_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_AgathasRoom_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_LancesRoom_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_ChampionsRoom_Frlg/scripts.inc"
+	.include "data/maps/PokemonLeague_HallOfFame_Frlg/scripts.inc"
+	.include "data/maps/RockTunnel_1F_Frlg/scripts.inc"
+	.include "data/maps/RockTunnel_B1F_Frlg/scripts.inc"
+	.include "data/maps/SeafoamIslands_1F_Frlg/scripts.inc"
+	.include "data/maps/SeafoamIslands_B1F_Frlg/scripts.inc"
+	.include "data/maps/SeafoamIslands_B2F_Frlg/scripts.inc"
+	.include "data/maps/SeafoamIslands_B3F_Frlg/scripts.inc"
+	.include "data/maps/SeafoamIslands_B4F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_1F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_2F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_3F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_4F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_5F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_6F_Frlg/scripts.inc"
+	.include "data/maps/PokemonTower_7F_Frlg/scripts.inc"
+	.include "data/maps/PowerPlant_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B4F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_Exterior_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_1F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_2F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_SummitPath_3F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_Summit_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B5F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_1F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B1F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B2F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B3F_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B1F_Stairs_Frlg/scripts.inc"
+	.include "data/maps/MtEmber_RubyPath_B2F_Stairs_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_BerryForest_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_Entrance_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_1F_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_B1F_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_IcefallCave_Back_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_RocketWarehouse_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_1F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B1F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B2F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B3F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_B4F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_DottedHole_SapphireRoom_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_PatternBush_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_AlteringCave_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_Exterior_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_1F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_2F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_3F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_4F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_5F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_6F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_7F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_8F_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_Roof_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_Lobby_Frlg/scripts.inc"
+	.include "data/maps/TrainerTower_Elevator_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Entrance_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room1_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room2_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room3_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room4_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room5_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room6_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room7_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room8_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room9_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room10_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room11_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room12_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room13_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_LostCave_Room14_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_MoneanChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_LiptooChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_WeepthChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_DilfordChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_ScufibChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_RixyChamber_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_ViapoisChamber_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_DunsparceTunnel_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_TanobyKey_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_1F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_Summit_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_Base_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_2F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_3F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_4F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_SummitPath_5F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B1F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B2F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B3F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B4F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B5F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B6F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B7F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B8F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B9F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B10F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_BasePath_B11F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_B1F_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_Fork_Frlg/scripts.inc"
+	.include "data/maps/BirthIsland_Exterior_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_KindleRoad_EmberSpa_Frlg/scripts.inc"
+	.include "data/maps/BirthIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/NavelRock_Harbor_Frlg/scripts.inc"
+	.include "data/maps/PalletTown_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_Frlg/scripts.inc"
+	.include "data/maps/IndigoPlateau_Exterior_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_Connection_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_Frlg/scripts.inc"
+	.include "data/maps/Route1_Frlg/scripts.inc"
+	.include "data/maps/Route2_Frlg/scripts.inc"
+	.include "data/maps/Route3_Frlg/scripts.inc"
+	.include "data/maps/Route4_Frlg/scripts.inc"
+	.include "data/maps/Route5_Frlg/scripts.inc"
+	.include "data/maps/Route6_Frlg/scripts.inc"
+	.include "data/maps/Route7_Frlg/scripts.inc"
+	.include "data/maps/Route8_Frlg/scripts.inc"
+	.include "data/maps/Route9_Frlg/scripts.inc"
+	.include "data/maps/Route10_Frlg/scripts.inc"
+	.include "data/maps/Route11_Frlg/scripts.inc"
+	.include "data/maps/Route12_Frlg/scripts.inc"
+	.include "data/maps/Route13_Frlg/scripts.inc"
+	.include "data/maps/Route14_Frlg/scripts.inc"
+	.include "data/maps/Route15_Frlg/scripts.inc"
+	.include "data/maps/Route16_Frlg/scripts.inc"
+	.include "data/maps/Route17_Frlg/scripts.inc"
+	.include "data/maps/Route18_Frlg/scripts.inc"
+	.include "data/maps/Route19_Frlg/scripts.inc"
+	.include "data/maps/Route20_Frlg/scripts.inc"
+	.include "data/maps/Route21_North_Frlg/scripts.inc"
+	.include "data/maps/Route21_South_Frlg/scripts.inc"
+	.include "data/maps/Route22_Frlg/scripts.inc"
+	.include "data/maps/Route23_Frlg/scripts.inc"
+	.include "data/maps/Route24_Frlg/scripts.inc"
+	.include "data/maps/Route25_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_KindleRoad_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_TreasureBeach_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_CapeBrink_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_BondBridge_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_Port_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_WaterLabyrinth_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_Meadow_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_MemorialPillar_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_OutcastIsland_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_GreenPath_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_RuinValley_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TrainerTower_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_Entrance_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_TanobyRuins_Frlg/scripts.inc"
+	.include "data/maps/PalletTown_PlayersHouse_1F_Frlg/scripts.inc"
+	.include "data/maps/PalletTown_PlayersHouse_2F_Frlg/scripts.inc"
+	.include "data/maps/PalletTown_RivalsHouse_Frlg/scripts.inc"
+	.include "data/maps/PalletTown_ProfessorOaksLab_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_House_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_School_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/ViridianCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_Museum_1F_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_Museum_2F_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_House1_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/PewterCity_House2_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_House1_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_House2_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_House3_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_BikeShop_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_House4_Frlg/scripts.inc"
+	.include "data/maps/CeruleanCity_House5_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_VolunteerPokemonHouse_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_House1_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_House2_Frlg/scripts.inc"
+	.include "data/maps/LavenderTown_Mart_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_House1_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_PokemonFanClub_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_House2_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/VermilionCity_House3_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_1F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_2F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_3F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_4F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_5F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_Roof_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_DepartmentStore_Elevator_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_1F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_2F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_3F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_Roof_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Condominiums_RoofRoom_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_GameCorner_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_GameCorner_PrizeRoom_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Restaurant_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_House1_Frlg/scripts.inc"
+	.include "data/maps/CeladonCity_Hotel_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_SafariZone_Entrance_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_SafariZone_Office_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_House1_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_WardensHouse_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_House2_Frlg/scripts.inc"
+	.include "data/maps/FuchsiaCity_House3_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_Gym_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Entrance_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_Lounge_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ResearchRoom_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonLab_ExperimentRoom_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/CinnabarIsland_Mart_Frlg/scripts.inc"
+	.include "data/maps/IndigoPlateau_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/IndigoPlateau_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_1F_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_CopycatsHouse_2F_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_Dojo_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_Gym_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_House_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_Mart_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_MrPsychicsHouse_Frlg/scripts.inc"
+	.include "data/maps/SaffronCity_PokemonTrainerFanClub_Frlg/scripts.inc"
+	.include "data/maps/Route2_ViridianForest_SouthEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route2_House_Frlg/scripts.inc"
+	.include "data/maps/Route2_EastBuilding_Frlg/scripts.inc"
+	.include "data/maps/Route2_ViridianForest_NorthEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route4_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/Route4_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/Route5_PokemonDayCare_Frlg/scripts.inc"
+	.include "data/maps/Route5_SouthEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route6_NorthEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route6_UnusedHouse_Frlg/scripts.inc"
+	.include "data/maps/Route7_EastEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route8_WestEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route10_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/Route10_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/Route11_EastEntrance_1F_Frlg/scripts.inc"
+	.include "data/maps/Route11_EastEntrance_2F_Frlg/scripts.inc"
+	.include "data/maps/Route12_NorthEntrance_1F_Frlg/scripts.inc"
+	.include "data/maps/Route12_NorthEntrance_2F_Frlg/scripts.inc"
+	.include "data/maps/Route12_FishingHouse_Frlg/scripts.inc"
+	.include "data/maps/Route15_WestEntrance_1F_Frlg/scripts.inc"
+	.include "data/maps/Route15_WestEntrance_2F_Frlg/scripts.inc"
+	.include "data/maps/Route16_House_Frlg/scripts.inc"
+	.include "data/maps/Route16_NorthEntrance_1F_Frlg/scripts.inc"
+	.include "data/maps/Route16_NorthEntrance_2F_Frlg/scripts.inc"
+	.include "data/maps/Route18_EastEntrance_1F_Frlg/scripts.inc"
+	.include "data/maps/Route18_EastEntrance_2F_Frlg/scripts.inc"
+	.include "data/maps/Route22_NorthEntrance_Frlg/scripts.inc"
+	.include "data/maps/Route25_SeaCottage_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_House_Room1_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_House_Room2_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_Mart_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_House1_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_House2_Frlg/scripts.inc"
+	.include "data/maps/OneIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_JoyfulGameCorner_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_House_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_House1_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_Mart_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_House2_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_House3_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_House4_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_House5_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_PokemonDayCare_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_House1_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_LoreleisHouse_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_House2_Frlg/scripts.inc"
+	.include "data/maps/FourIsland_Mart_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_House1_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_House2_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_PokemonCenter_1F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_PokemonCenter_2F_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_House_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_Mart_Frlg/scripts.inc"
+	.include "data/maps/ThreeIsland_Harbor_Frlg/scripts.inc"
+	.include "data/maps/FiveIsland_ResortGorgeous_House_Frlg/scripts.inc"
+	.include "data/maps/TwoIsland_CapeBrink_House_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath_House1_Frlg/scripts.inc"
+	.include "data/maps/SixIsland_WaterPath_House2_Frlg/scripts.inc"
+	.include "data/maps/SevenIsland_SevaultCanyon_House_Frlg/scripts.inc"
+
+	.include "data/scripts/trainer_tower.inc"
+	.include "data/scripts/fame_checker_frlg.inc"
+	.include "data/text/fame_checker_frlg.inc"
+	.include "data/scripts/item_ball_scripts_frlg.inc"
+	.include "data/scripts/silphco_doors.inc"
+	.include "data/scripts/move_tutors_frlg.inc"
+	.include "data/scripts/cable_club_frlg.inc"
+	.include "data/scripts/trainer_card_frlg.inc"
+	.include "data/text/trainer_card_frlg.inc"
+	.include "data/scripts/mystery_event_club.inc"
+	.include "data/scripts/day_care_frlg.inc"
+	.include "data/text/day_care_frlg.inc"
+	.include "data/scripts/seagallop.inc"
+	.include "data/scripts/static_pokemon.inc"
+	.include "data/scripts/aide.inc"
+	.include "data/scripts/pokemon_mansion.inc"
+	.include "data/scripts/pokemon_league.inc"
+	.include "data/scripts/route23.inc"
+	.include "data/text/new_game_intro_frlg.inc"
+	.include "data/scripts/trainers_frlg.inc"
+	.include "data/text/trainers_frlg.inc"
+	.include "data/text/ingame_trade_frlg.inc"
+	.include "data/scripts/flavor_text.inc"
+	.include "data/scripts/pkmn_center_nurse_frlg.inc"
+
+.endif
+
 	.include "data/scripts/std_msgbox.inc"
 	.include "data/scripts/trainer_battle.inc"
 	.include "data/scripts/new_game.inc"
 	.include "data/scripts/hall_of_fame.inc"
+	.include "data/scripts/hall_of_fame_frlg.inc"
 
 	.include "data/scripts/config.inc"
 	.include "data/scripts/debug.inc"
@@ -601,7 +1062,7 @@ EventScript_AfterWhiteOutHeal::
 	lockall
 	msgbox gText_FirstShouldRestoreMonsHealth
 	call EventScript_PkmnCenterNurse_TakeAndHealPkmn
-	call_if_unset FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsgPreRoxanne
+	call_if_unset FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsgPreFirstBoss
 	call_if_set FLAG_DEFEATED_RUSTBORO_GYM, EventScript_AfterWhiteOutHealMsg
 	applymovement VAR_LAST_TALKED, Movement_PkmnCenterNurse_Bow
 	waitmovement 0
@@ -609,7 +1070,7 @@ EventScript_AfterWhiteOutHeal::
 	releaseall
 	end
 
-EventScript_AfterWhiteOutHealMsgPreRoxanne::
+EventScript_AfterWhiteOutHealMsgPreFirstBoss::
 	msgbox gText_MonsHealedShouldBuyPotions
 	return
 
@@ -619,6 +1080,7 @@ EventScript_AfterWhiteOutHealMsg::
 
 EventScript_AfterWhiteOutMomHeal::
 	lockall
+	textcolor NPC_TEXT_COLOR_FEMALE
 	applymovement LOCALID_PLAYERS_HOUSE_1F_MOM, Common_Movement_WalkInPlaceFasterDown
 	waitmovement 0
 	msgbox gText_HadQuiteAnExperienceTakeRest
@@ -749,6 +1211,12 @@ Common_EventScript_BagIsFull::
 	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
 	return
 
+EventScript_BagIsFull::
+	textcolor NPC_TEXT_COLOR_NEUTRAL
+	msgbox gText_TooBadBagIsFull
+	release
+	end
+
 Common_EventScript_ShowNoRoomForDecor::
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
 	release
@@ -965,7 +1433,7 @@ gText_HadQuiteAnExperienceTakeRest::
 gText_MomExplainHPGetPotions::
 	.string "MOM: Oh, good! You and your\n"
 	.string "POKéMON are looking great.\p"
-	.string "I just heard from PROF. BIRCH.\p"
+	.string "I just heard from {STR_VAR_1}.\p"
 	.string "He said that POKéMON's energy is\n"
 	.string "measured in HP.\p"
 	.string "If your POKéMON lose their HP,\n"
@@ -1051,10 +1519,37 @@ gText_Sudowoodo_Attacked::
 gText_LegendaryFlewAway::
 	.string "The {STR_VAR_1} flew away!$"
 
+gText_WantWhichFloor::
+	.string "Which floor do you want?$"
+
 	.include "data/text/pc_transfer.inc"
 	.include "data/text/questionnaire.inc"
 	.include "data/text/abnormal_weather.inc"
 
+EventScript_GetInGameTradeSpeciesInfo::
+	copyvar VAR_0x8005, VAR_0x8008
+	specialvar VAR_0x8009, GetInGameTradeSpeciesInfo
+	return
+
+EventScript_ChooseMonForInGameTrade::
+	special ChoosePartyMon
+	waitstate
+	lock
+	faceplayer
+	return
+
+EventScript_GetInGameTradeSpecies::
+	specialvar VAR_RESULT, GetTradeSpecies
+	return
+
+EventScript_DoInGameTrade::
+	special CreateInGameTradePokemon
+	special DoInGameTradeScene
+	waitstate
+	lock
+	faceplayer
+	return
+
 EventScript_SelectWithoutRegisteredItem::
 	msgbox gText_SelectWithoutRegisteredItem, MSGBOX_SIGN
 	end
@@ -1064,6 +1559,18 @@ EventScript_SelectWithoutRegisteredItem::
 Common_EventScript_NopReturn::
 	return
 
+EventScript_SetResultTrue::
+	setvar VAR_RESULT, TRUE
+	return
+
+EventScript_SetResultFalse::
+	setvar VAR_RESULT, FALSE
+	return
+
+EventScript_GetElevatorFloor::
+	special GetElevatorFloor
+	return
+
 @ Unused
 EventScript_CableClub_SetVarResult1::
 	setvar VAR_RESULT, 1
@@ -1074,15 +1581,27 @@ EventScript_CableClub_SetVarResult0::
 	return
 
 Common_EventScript_UnionRoomAttendant::
+#if IS_FRLG
+	call CableClub_EventScript_UnionRoomAttendant_Frlg
+#else
 	call CableClub_EventScript_UnionRoomAttendant
+#endif
 	end
 
 Common_EventScript_WirelessClubAttendant::
+#if IS_FRLG
+	call CableClub_EventScript_WirelessClubAttendant_Frlg
+#else
 	call CableClub_EventScript_WirelessClubAttendant
+#endif
 	end
 
 Common_EventScript_DirectCornerAttendant::
+#if IS_FRLG
+	call CableClub_EventScript_DirectCornerAttendant_Frlg
+#else
 	call CableClub_EventScript_DirectCornerAttendant
+#endif
 	end
 
 Common_EventScript_RemoveStaticPokemon::
@@ -1108,6 +1627,62 @@ EventScript_VsSeekerChargingDone::
 	releaseall
 	end
 
+@ FRLG scripts
+
+EventScript_SetExitingCyclingRoad::
+	lockall
+	clearflag FLAG_SYS_ON_CYCLING_ROAD
+	setvar VAR_MAP_SCENE_ROUTE16, 0
+	releaseall
+	end
+
+EventScript_SetEnteringCyclingRoad::
+	lockall
+	setvar VAR_MAP_SCENE_ROUTE16, 1
+	releaseall
+	end
+
+EventScript_TryDarkenRuins::
+	goto_if_set FLAG_SYS_UNLOCKED_TANOBY_RUINS, Common_EventScript_NopReturn
+	setweather WEATHER_SHADE
+	doweather
+	return
+
+Text_MonFlewAway::
+	.string "The {STR_VAR_1} flew away!$"
+
+@ Call for legendary bird trio
+Text_Gyaoo::
+	.string "Gyaoo!$"
+
+EventScript_BrailleCursorWaitButton::
+	special BrailleCursorToggle
+	waitbuttonpress
+	closebraillemessage
+	playse SE_SELECT
+	setvar VAR_0x8006, 1
+	special BrailleCursorToggle
+	return
+
+EventScript_PalletTown_PlayersHouse_2F_ShutDownPC::
+	setvar VAR_0x8004, PC_LOCATION_PLAYER_HOUSE_FRLG
+	playse SE_PC_OFF
+	special DoPCTurnOffEffect
+	releaseall
+	end
+
+EventScript_PalletTown_PlayersHouse_2F_TurnOnPC::
+	lockall
+	setvar VAR_0x8004, PC_LOCATION_PLAYER_HOUSE_FRLG
+	special DoPCTurnOnEffect
+	playse SE_PC_ON
+	msgbox gText_PlayerHouseBootPC
+	special BedroomPC
+	waitstate
+	releaseall
+	end
+
+
 	.include "data/scripts/pc_transfer.inc"
 	.include "data/scripts/questionnaire.inc"
 	.include "data/scripts/abnormal_weather.inc"
@@ -1135,6 +1710,7 @@ EventScript_VsSeekerChargingDone::
 	.include "data/scripts/repel.inc"
 	.include "data/scripts/safari_zone.inc"
 	.include "data/scripts/roulette.inc"
+	.include "data/scripts/pokedex_rating.inc"
 	.include "data/text/pokedex_rating.inc"
 	.include "data/text/lottery_corner.inc"
 	.include "data/text/event_ticket_1.inc"
@@ -1147,7 +1723,6 @@ EventScript_VsSeekerChargingDone::
 	.include "data/text/match_call.inc"
 	.include "data/scripts/apprentice.inc"
 	.include "data/text/apprentice.inc"
-	.include "data/text/battle_dome.inc"
 	.include "data/scripts/battle_pike.inc"
 	.include "data/text/blend_master.inc"
 	.include "data/text/battle_tent.inc"

data/field_effect_scripts.s

@@ -84,6 +84,9 @@ gFieldEffectScriptPointers::
 	.4byte gFieldEffectScript_UseRockClimb              @ FLDEFF_USE_ROCK_CLIMB
 	.4byte gFieldEffectScript_RockClimbDust             @ FLDEFF_ROCK_CLIMB_DUST
 	.4byte gFieldEffectScript_ORASDowse                 @ FLDEFF_ORAS_DOWSE
+	.4byte gFldEffScript_SmileyFaceIcon    		        @ FLDEFF_SMILEY_FACE_ICON
+	.4byte gFieldEffectScript_HallOfFameRecordFrlg      @ FLDEFF_HALL_OF_FAME_RECORD_FRLG
+	.4byte gFldEffScript_PhotoFlash      		        @ FLDEFF_PHOTO_FLASH
 
 gFieldEffectScript_ExclamationMarkIcon1::
 	field_eff_callnative FldEff_ExclamationMarkIcon
@@ -385,8 +388,8 @@ gFieldEffectScript_CaveDust::
 	field_eff_end
 
 gFieldEffectScript_Defog::
-    field_eff_callnative FldEff_Defog
-    field_eff_end
+	field_eff_callnative FldEff_Defog
+	field_eff_end
 
 gFieldEffectScript_UseRockClimb:: @ 82DBC3F
 	field_eff_callnative FldEff_UseRockClimb
@@ -399,4 +402,16 @@ gFieldEffectScript_RockClimbDust:: @ 82DBB28
 gFieldEffectScript_ORASDowse::
 	field_eff_callnative FldEff_ORASDowsing
 	field_eff_end
-    
+
+gFldEffScript_SmileyFaceIcon::
+	field_eff_callnative FldEff_SmileyFaceIcon
+	field_eff_end
+
+gFieldEffectScript_HallOfFameRecordFrlg::
+	field_eff_loadfadedpal gSpritePalette_PokeballGlow
+	field_eff_loadfadedpal_callnative gSpritePalette_HofMonitor_Frlg, FldEff_HallOfFameRecord
+	field_eff_end
+
+gFldEffScript_PhotoFlash::
+	field_eff_callnative FldEff_PhotoFlash
+	field_eff_end