diff --git a/.all-contributorsrc b/.all-contributorsrc
index c8b79ba30e67..55ff294842e8 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -338,6 +338,173 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "tustin2121",
+ "name": "tustin2121",
+ "avatar_url": "https://avatars.githubusercontent.com/u/794812?v=4",
+ "profile": "https://tustin2121.github.io/",
+ "contributions": [
+ "doc",
+ "code"
+ ]
+ },
+ {
+ "login": "Ddaretrogamer",
+ "name": "Phantonomy",
+ "avatar_url": "https://avatars.githubusercontent.com/u/131238004?v=4",
+ "profile": "https://github.com/Ddaretrogamer",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "Syreldar",
+ "name": "Enrico Drago",
+ "avatar_url": "https://avatars.githubusercontent.com/u/42327659?v=4",
+ "profile": "https://metin2.dev/index.php",
+ "contributions": [
+ "doc",
+ "userTesting"
+ ]
+ },
+ {
+ "login": "Pyredrid",
+ "name": "Pyredrid",
+ "avatar_url": "https://avatars.githubusercontent.com/u/8324784?v=4",
+ "profile": "https://github.com/Pyredrid",
+ "contributions": [
+ "userTesting",
+ "maintenance"
+ ]
+ },
+ {
+ "login": "mvit",
+ "name": "mv",
+ "avatar_url": "https://avatars.githubusercontent.com/u/128863?v=4",
+ "profile": "https://github.com/mvit",
+ "contributions": [
+ "code",
+ "design"
+ ]
+ },
+ {
+ "login": "Mother-Of-Dragons",
+ "name": "Avara",
+ "avatar_url": "https://avatars.githubusercontent.com/u/31101124?v=4",
+ "profile": "https://github.com/Mother-Of-Dragons",
+ "contributions": [
+ "data"
+ ]
+ },
+ {
+ "login": "Doesnty",
+ "name": "Doesnty",
+ "avatar_url": "https://avatars.githubusercontent.com/u/6163136?v=4",
+ "profile": "https://github.com/Doesnty",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "FosterProgramming",
+ "name": "FosterProgramming",
+ "avatar_url": "https://avatars.githubusercontent.com/u/178871164?v=4",
+ "profile": "https://github.com/FosterProgramming",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "Squeetz",
+ "name": "Squeetz",
+ "avatar_url": "https://avatars.githubusercontent.com/u/21145213?v=4",
+ "profile": "https://github.com/Squeetz",
+ "contributions": [
+ "maintenance"
+ ]
+ },
+ {
+ "login": "ghostyboyy97",
+ "name": "ghostyboyy97",
+ "avatar_url": "https://avatars.githubusercontent.com/u/106448956?v=4",
+ "profile": "https://github.com/ghostyboyy97",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "HashtagMarky",
+ "name": "Marky",
+ "avatar_url": "https://avatars.githubusercontent.com/u/143505183?v=4",
+ "profile": "http://hashtagmarky.github.io",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "MandL27",
+ "name": "MandL27",
+ "avatar_url": "https://avatars.githubusercontent.com/u/10366615?v=4",
+ "profile": "https://github.com/MandL27",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "cawtds",
+ "name": "cawtds",
+ "avatar_url": "https://avatars.githubusercontent.com/u/38510667?v=4",
+ "profile": "https://github.com/cawtds",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "fdeblasio",
+ "name": "Frank DeBlasio",
+ "avatar_url": "https://avatars.githubusercontent.com/u/35279583?v=4",
+ "profile": "https://github.com/fdeblasio",
+ "contributions": [
+ "code"
+ ]
+ },
+ {
+ "login": "leo60228",
+ "name": "leo60228",
+ "avatar_url": "https://avatars.githubusercontent.com/u/8355305?v=4",
+ "profile": "https://vriska.dev",
+ "contributions": [
+ "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"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/.gitattributes b/.gitattributes
index 1f2aa0c6da14..a2dcec5e5d33 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -18,6 +18,9 @@ Makefile text eol=lf
*.md text eol=lf
*.ps1 text eol=crlf
*.yml text eol=lf
+*.party text eol=lf
+*.cfg text eol=lf
+*.ld text eol=lf
*.png binary
*.bin binary
diff --git a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
index da15109c8c0a..2f25421ea0b4 100644
--- a/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
+++ b/.github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
@@ -7,6 +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
id: description
attributes:
label: Description
@@ -42,15 +43,16 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using?
options:
- - 1.12.0 (Latest release)
+ - 1.14.1 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- - 1.11.4
- - 1.11.3
- - 1.11.2
- - 1.11.1
- - 1.11.0
- - pre-1.11.0
+ - 1.14.0
+ - 1.13.4
+ - 1.13.3
+ - 1.13.2
+ - 1.13.1
+ - 1.13.0
+ - pre-1.13.0
validations:
required: true
- type: input
diff --git a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
index 7b1a489cfb7c..b0ee16702173 100644
--- a/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
+++ b/.github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
@@ -43,15 +43,16 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using?
options:
- - 1.12.0 (Latest release)
+ - 1.14.1 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- - 1.11.4
- - 1.11.3
- - 1.11.2
- - 1.11.1
- - 1.11.0
- - pre-1.11.0
+ - 1.14.0
+ - 1.13.4
+ - 1.13.3
+ - 1.13.2
+ - 1.13.1
+ - 1.13.0
+ - pre-1.13.0
validations:
required: true
- type: input
diff --git a/.github/ISSUE_TEMPLATE/04_other_errors.yaml b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
index 197791a77620..4dcb2b309336 100644
--- a/.github/ISSUE_TEMPLATE/04_other_errors.yaml
+++ b/.github/ISSUE_TEMPLATE/04_other_errors.yaml
@@ -43,14 +43,16 @@ body:
label: Version
description: What version of pokeemerald-expansion are you using?
options:
- - 1.12.0 (Latest release)
+ - 1.14.1 (Latest release)
- master (default, unreleased bugfixes)
- upcoming (Edge)
- - 1.11.4
- - 1.11.3
- - 1.11.1
- - 1.11.0
- - pre-1.11.0
+ - 1.14.0
+ - 1.13.4
+ - 1.13.3
+ - 1.13.2
+ - 1.13.1
+ - 1.13.0
+ - pre-1.13.0
validations:
required: true
- type: input
diff --git a/.github/docs_validate/inclusive_summary.py b/.github/docs_validate/inclusive_summary.py
new file mode 100755
index 000000000000..76e0218abc41
--- /dev/null
+++ b/.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)
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dc900e224e71..21785498fb2d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -24,6 +24,7 @@
+
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 30231dbd0f5f..da1a943e8333 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,12 +31,30 @@ jobs:
env:
COMPARE: 0
run: make -j${nproc} -O all
+
+ - name: LTO
+ run: |
+ make tidy
+ make -j${nproc} LTO=1
+ # make tidy to purge previous build
- name: Test
env:
TEST: 1
run: |
make -j${nproc} check
+
+ docs_validate:
+ if: github.actor != 'allcontributors[bot]'
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout
+ uses: actions/checkout@v2
+
+ - 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
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 874ebdd5906a..09e7c78c0c00 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -17,7 +17,7 @@ jobs:
fetch-depth: 0
- name: Install latest mdbook
run: |
- tag=$(curl 'https://api.github.com/repos/rust-lang/mdbook/releases/latest' | jq -r '.tag_name')
+ 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
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 325e72950d11..3cc4ee57a785 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -3,10 +3,12 @@ name: Labels
on:
pull_request:
types: [opened, synchronize, labeled, unlabeled]
+ pull_request_review:
+ types: [submitted]
jobs:
label:
- if: github.actor != 'allcontributors[bot]'
+ if: ${{ github.actor != 'allcontributors[bot]' && github.event.review.state == 'approved' }}
runs-on: ubuntu-latest
steps:
- name: check labels
diff --git a/.gitignore b/.gitignore
index 6d9453242aa2..686677dac252 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,9 @@
*.8bpp
*.gbapal
*.lz
+*.smol
+*.fastSmol
+*.smolTM
*.rl
*.latfont
*.hwjpnfont
@@ -40,7 +43,15 @@ prefabs.json
*.js
/pokeemerald-*.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/trainers.h
+src/data/debug_trainers.h
+test/battle/trainer_control.h
+tools/compresSmol/compresSmol
+tools/compresSmol/compresSmolTilemap
*.Identifier
*.smol
*.fastSmol
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b89016fdddac..88ef358dbb20 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -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.
diff --git a/CREDITS.md b/CREDITS.md
index ab5c59624876..dfec2d747cdd 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -58,7 +58,31 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
Zatsu
π» |
poetahto
π» |
lordraindance2
π» |
- 
Pablo Pena
π» |
+
Pablo Pena
π» |
+ 
tustin2121
π π» |
+ 
Phantonomy
π¨ |
+
+
+ 
Enrico Drago
π π |
+ 
Pyredrid
π π§ |
+ 
mv
π» π¨ |
+ 
Avara
π£ |
+ 
Doesnty
π¨ |
+ 
FosterProgramming
π» |
+ 
Squeetz
π§ |
+
+
+ 
ghostyboyy97
π» |
+ 
Marky
π» |
+ 
MandL27
π» |
+ 
cawtds
π» |
+ 
Frank DeBlasio
π» |
+ 
leo60228
π π£ |
+ 
shachar700
π» |
+
+
+ 
Eva
π¨ |
+ 
amiosi
π£ |
diff --git a/INSTALL.md b/INSTALL.md
index d2e511dacee3..47f00cf78fb5 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -14,8 +14,8 @@ After completing the install instructions for your OS, proceed to [Building poke
On Windows, the project can be built using the following systems:
- WSL2, fastest
- WSL1, 7 times slower than WSL2
-- Msys2, 20 times slower than WSL2 (**NOTE**: Currently broken on pret upstream)
-- Cygwin, 30 timer slower than WSL2 (**NOTE**: Currently broken on pret upstream)
+- Msys2, 20 times slower than WSL2
+- Cygwin, 30 timer slower than WSL2
**NOTE**: Only WSL systems are recommended.
@@ -32,6 +32,7 @@ Distributions with instructions:
- [Debian](docs/install/linux/DEBIAN.md)
- [Arch Linux](docs/install/linux/ARCH_LINUX.md)
- [NixOS](docs/install/linux/NIXOS.md)
+- [Fedora](docs/install/linux/FEDORA.md)
Other distributions have to infer what to do from [general instructions](docs/install/linux/OTHERS.md).
@@ -179,6 +180,6 @@ If you targeted a specific version that is not the latest version listed on the
# Useful additional tools
* [porymap](https://github.com/huderlem/porymap) for viewing and editing maps
-* [porytiles](https://github.com/gruntlucas/porytiles) for add new metatiles for maps
+* [porytiles](https://github.com/grunt-lucas/porytiles) for add new metatiles for maps
* [poryscript](https://github.com/huderlem/poryscript) for scripting ([VS Code extension](https://marketplace.visualstudio.com/items?itemName=karathan.poryscript))
* [Tilemap Studio](https://github.com/Rangi42/tilemap-studio) for viewing and editing tilemaps
diff --git a/Makefile b/Makefile
index 9cf34b7fa82f..8160f6e1e14d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,32 @@
+GAME_VERSION ?= EMERALD
+TITLE ?= POKEMON EMER
+GAME_CODE ?= BPEE
+BUILD_NAME ?= emerald
+MAP_VERSION ?= emerald
+
+ifeq (firered,$(MAKECMDGOALS))
+ GAME_VERSION := FIRERED
+ TITLE := POKEMON FIRE
+ GAME_CODE := BPRE
+ BUILD_NAME := firered
+ MAP_VERSION := firered
+else
+ifeq (leafgreen,$(MAKECMDGOALS))
+ GAME_VERSION := LEAFGREEN
+ TITLE := POKEMON LEAF
+ GAME_CODE := BPGE
+ BUILD_NAME := leafgreen
+ MAP_VERSION := firered
+endif
+endif
+
# GBA rom header
-TITLE := POKEMON EMER
-GAME_CODE := BPEE
MAKER_CODE := 01
REVISION := 0
KEEP_TEMPS ?= 0
# `File name`.gba
-FILE_NAME := pokeemerald
+FILE_NAME := poke$(BUILD_NAME)
BUILD_DIR := build
# Compares the ROM to a checksum of the original - only makes sense using when non-modern
@@ -19,6 +39,11 @@ ANALYZE ?= 0
UNUSED_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)
+LTO ?= 0
+# Makes an optimized build for release, also enabling NDEBUG macro and disabling other debugging features
+# Enables LTO by default, but can be changed in the config.mk file
+RELEASE ?= 0
ifeq (compare,$(MAKECMDGOALS))
COMPARE := 1
@@ -29,6 +54,11 @@ endif
ifeq (debug,$(MAKECMDGOALS))
DEBUG := 1
endif
+ifneq (,$(filter release tidyrelease,$(MAKECMDGOALS)))
+ RELEASE := 1
+endif
+
+include config.mk
# Default make rule
all: rom
@@ -60,10 +90,15 @@ endif
CPP := $(PREFIX)cpp
+ifeq ($(RELEASE),1)
+ FILE_NAME := $(FILE_NAME)-release
+endif
+
ROM_NAME := $(FILE_NAME).gba
-OBJ_DIR_NAME := $(BUILD_DIR)/modern
-OBJ_DIR_NAME_TEST := $(BUILD_DIR)/modern-test
-OBJ_DIR_NAME_DEBUG := $(BUILD_DIR)/modern-debug
+OBJ_DIR_NAME := $(BUILD_DIR)/$(BUILD_NAME)
+OBJ_DIR_NAME_TEST := $(BUILD_DIR)/$(BUILD_NAME)-test
+OBJ_DIR_NAME_DEBUG := $(BUILD_DIR)/$(BUILD_NAME)-debug
+OBJ_DIR_NAME_RELEASE := $(BUILD_DIR)/$(BUILD_NAME)-release
ELF_NAME := $(ROM_NAME:.gba=.elf)
MAP_NAME := $(ROM_NAME:.gba=.map)
@@ -83,6 +118,9 @@ endif
ifeq ($(DEBUG),1)
OBJ_DIR := $(OBJ_DIR_NAME_DEBUG)
endif
+ifeq ($(RELEASE),1)
+ OBJ_DIR := $(OBJ_DIR_NAME_RELEASE)
+endif
ELF := $(ROM:.gba=.elf)
MAP := $(ROM:.gba=.map)
SYM := $(ROM:.gba=.sym)
@@ -106,7 +144,7 @@ TEST_BUILDDIR = $(OBJ_DIR)/$(TEST_SUBDIR)
SHELL := bash -o pipefail
# Set flags for tools
-ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=1
+ASFLAGS := -mcpu=arm7tdmi -march=armv4t -meabi=5 --defsym MODERN=1 --defsym $(GAME_VERSION)=1
INCLUDE_DIRS := include
INCLUDE_CPP_ARGS := $(INCLUDE_DIRS:%=-iquote %)
@@ -117,11 +155,25 @@ O_LEVEL ?= g
else
O_LEVEL ?= 2
endif
-CPPFLAGS := $(INCLUDE_CPP_ARGS) -Wno-trigraphs -DMODERN=1 -DTESTING=$(TEST) -std=gnu17
+CPPFLAGS := $(INCLUDE_CPP_ARGS) -Wno-trigraphs -DMODERN=1 -DTESTING=$(TEST) -D$(GAME_VERSION) -std=gnu17
+ifeq ($(RELEASE),1)
+ override CPPFLAGS += -DRELEASE
+ ifeq ($(USE_LTO_ON_RELEASE),1)
+ LTO := 1
+ endif
+endif
ARMCC := $(PREFIX)gcc
PATH_ARMCC := PATH="$(PATH)" $(ARMCC)
CC1 := $(shell $(PATH_ARMCC) --print-prog-name=cc1) -quiet
-override CFLAGS += -mthumb -mthumb-interwork -O$(O_LEVEL) -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init
+
+override CFLAGS += -mthumb -mthumb-interwork -O$(O_LEVEL) -mabi=apcs-gnu -mtune=arm7tdmi -march=armv4t -Wno-pointer-to-int-cast -std=gnu17 -Werror -Wall -Wno-strict-aliasing -Wno-attribute-alias -Woverride-init -Wnonnull -Wenum-conversion
+
+ifneq ($(LTO),0)
+ ifneq ($(TEST),1)
+ override CFLAGS += -flto=auto -fno-fat-lto-objects -fno-asynchronous-unwind-tables -ffunction-sections -fdata-sections
+ endif
+endif
+
ifeq ($(ANALYZE),1)
override CFLAGS += -fanalyzer
endif
@@ -151,8 +203,10 @@ endif
AUTO_GEN_TARGETS :=
include make_tools.mk
# Tool executables
+SMOLTM := $(TOOLS_DIR)/compresSmol/compresSmolTilemap$(EXE)
+SMOL := $(TOOLS_DIR)/compresSmol/compresSmol$(EXE)
GFX := $(TOOLS_DIR)/gbagfx/gbagfx$(EXE)
-AIF := $(TOOLS_DIR)/aif2pcm/aif2pcm$(EXE)
+WAV2AGB := $(TOOLS_DIR)/wav2agb/wav2agb$(EXE)
MID := $(TOOLS_DIR)/mid2agb/mid2agb$(EXE)
SCANINC := $(TOOLS_DIR)/scaninc/scaninc$(EXE)
PREPROC := $(TOOLS_DIR)/preproc/preproc$(EXE)
@@ -183,10 +237,18 @@ ALL_LEARNABLES_JSON := $(LEARNSET_HELPERS_BUILD_DIR)/all_learnables.json
WILD_ENCOUNTERS_TOOL_DIR := $(TOOLS_DIR)/wild_encounters
AUTO_GEN_TARGETS += $(DATA_SRC_SUBDIR)/wild_encounters.h
+MISC_TOOL_DIR := $(TOOLS_DIR)/misc
+AUTO_GEN_TARGETS += $(INCLUDE_DIRS)/constants/script_commands.h
+
$(DATA_SRC_SUBDIR)/wild_encounters.h: $(DATA_SRC_SUBDIR)/wild_encounters.json $(WILD_ENCOUNTERS_TOOL_DIR)/wild_encounters_to_header.py $(INCLUDE_DIRS)/config/overworld.h $(INCLUDE_DIRS)/config/dexnav.h
- python3 $(WILD_ENCOUNTERS_TOOL_DIR)/wild_encounters_to_header.py > $@
+ python3 $(WILD_ENCOUNTERS_TOOL_DIR)/wild_encounters_to_header.py
+
+$(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
@@ -200,8 +262,8 @@ MAKEFLAGS += --no-print-directory
# Delete files that weren't built properly
.DELETE_ON_ERROR:
-RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck generated clean-generated
-.PHONY: all rom agbcc modern compare check debug
+RULES_NO_SCAN += libagbsyscall clean clean-assets tidy tidymodern tidycheck tidyrelease generated clean-generated
+.PHONY: all rom agbcc modern compare check debug release
.PHONY: $(RULES_NO_SCAN)
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
@@ -228,7 +290,7 @@ ifeq ($(SETUP_PREREQS),1)
$(error Errors occurred while building tools. See error messages above for more details)
endif
# Oh and also generate mapjson sources before we use `SCANINC`.
- $(foreach line, $(shell $(MAKE) generated | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
+ $(foreach line, $(shell $(MAKE) MAP_VERSION=$(MAP_VERSION) generated | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
ifneq ($(.SHELLSTATUS),0)
$(error Errors occurred while generating map-related sources. See error messages above for more details)
endif
@@ -272,6 +334,7 @@ $(shell mkdir -p $(SUBDIRS))
modern: all
compare: all
debug: all
+release: all
# Uncomment the next line, and then comment the 4 lines after it to reenable agbcc.
#agbcc: all
agbcc:
@@ -281,14 +344,14 @@ agbcc:
LD_SCRIPT_TEST := ld_script_test.ld
-$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
+$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST)
cd $(OBJ_DIR) && sed "s#tools/#../../tools/#g" ../../$(LD_SCRIPT_TEST) > ld_script_test.ld
$(TESTELF): $(OBJ_DIR)/ld_script_test.ld $(OBJS) $(TEST_OBJS) libagbsyscall tools check-tools
@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ "
@cd $(OBJ_DIR) && $(LD) $(TESTLDFLAGS) -T ld_script_test.ld -o ../../$@ $(OBJS_REL) $(TEST_OBJS_REL) $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) -d0 --silent
- $(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS)\0"
+ $(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS:%*=%)\0"
ifeq ($(GITHUB_REPOSITORY_OWNER),rh-hideout)
TEST_SKIP_IS_FAIL := \x01
@@ -317,10 +380,10 @@ clean-assets:
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
find sound -iname '*.bin' -exec rm {} +
- find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.rl' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -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 {} +
-tidy: tidymodern tidycheck tidydebug
+tidy: tidymodern tidycheck tidydebug tidyrelease
tidymodern:
rm -f $(ROM_NAME) $(ELF_NAME) $(MAP_NAME)
@@ -333,12 +396,21 @@ tidycheck:
tidydebug:
rm -rf $(DEBUG_OBJ_DIR_NAME)
+tidyrelease:
+ifeq ($(RELEASE),1)
+ rm -f $(ROM_NAME) $(ELF_NAME) $(MAP_NAME)
+else # Manually remove the release files on clean/tidy
+ rm -f $(FILE_NAME)-release.gba $(FILE_NAME)-release.elf $(FILE_NAME)-release.map
+endif
+ rm -rf $(OBJ_DIR_NAME_RELEASE)
+
# Other rules
include graphics_file_rules.mk
include map_data_rules.mk
include spritesheet_rules.mk
include json_data_rules.mk
include audio_rules.mk
+include trainer_rules.mk
# NOTE: Tools must have been built prior (FIXME)
# so you can't really call this rule directly
@@ -349,15 +421,18 @@ generated: $(AUTO_GEN_TARGETS)
%.s: ;
%.png: ;
%.pal: ;
-%.aif: ;
-
-%.1bpp: %.png ; $(GFX) $< $@
-%.4bpp: %.png ; $(GFX) $< $@
-%.8bpp: %.png ; $(GFX) $< $@
-%.gbapal: %.pal ; $(GFX) $< $@
-%.gbapal: %.png ; $(GFX) $< $@
-%.lz: % ; $(GFX) $< $@
-%.rl: % ; $(GFX) $< $@
+%.wav: ;
+
+%.1bpp: %.png ; $(GFX) $< $@
+%.4bpp: %.png ; $(GFX) $< $@
+%.8bpp: %.png ; $(GFX) $< $@
+%.gbapal: %.pal ; $(GFX) $< $@
+%.gbapal: %.png ; $(GFX) $< $@
+%.lz: % ; $(GFX) $< $@
+%.smolTM: % ; $(SMOLTM) $< $@
+%.fastSmol: % ; $(SMOL) -w $< $@ false false false
+%.smol: % ; $(SMOL) -w $< $@
+%.rl: % ; $(GFX) $< $@
clean-generated:
@rm -f $(AUTO_GEN_TARGETS)
@@ -365,11 +440,6 @@ clean-generated:
@rm -f $(ALL_LEARNABLES_JSON)
@echo "rm -f "
-COMPETITIVE_PARTY_SYNTAX := $(shell PATH="$(PATH)"; echo 'COMPETITIVE_PARTY_SYNTAX' | $(CPP) $(CPPFLAGS) -imacros include/gba/defines.h -imacros include/config/general.h | tail -n1)
-ifeq ($(COMPETITIVE_PARTY_SYNTAX),1)
-%.h: %.party ; $(CPP) $(CPPFLAGS) -traditional-cpp - < $< | $(TRAINERPROC) -o $@ -i $< -
-endif
-
$(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
$(C_BUILDDIR)/agb_flash.o: override CFLAGS += -fno-toplevel-reorder
@@ -430,7 +500,7 @@ ifneq ($(NODEP),1)
endif
$(C_BUILDDIR)/%.o: $(C_SUBDIR)/%.s
- $(PREPROC) $< charmap.txt | $(CPP) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
+ $(PREPROC) $< charmap.txt | $(CPP) $(CPPFLAGS) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
$(C_BUILDDIR)/%.d: $(C_SUBDIR)/%.s
$(SCANINC) -M $@ $(INCLUDE_SCANINC_ARGS) -I "" $<
@@ -440,7 +510,7 @@ ifneq ($(NODEP),1)
endif
$(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s
- $(PREPROC) $< charmap.txt | $(CPP) $(INCLUDE_SCANINC_ARGS) - | $(PREPROC) -ie $< charmap.txt | $(AS) $(ASFLAGS) -o $@
+ $(PREPROC) $< 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 "" $<
@@ -471,25 +541,37 @@ $(DATA_SRC_SUBDIR)/pokemon/teachable_learnsets.h: $(TEACHABLE_DEPS)
# Linker script
LD_SCRIPT := ld_script_modern.ld
-LD_SCRIPT_DEPS :=
# Final rules
libagbsyscall:
@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=1
-# Elf from object files
-LDFLAGS = -Map ../../$(MAP)
-$(ELF): $(LD_SCRIPT) $(LD_SCRIPT_DEPS) $(OBJS) libagbsyscall
- @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ $(OBJS_REL) $(LIB) | cat
- @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< --print-memory-usage -o ../../$@ | cat"
+# Enable LTO LDFLAGS if set
+ifneq ($(LTO),0)
+LDFLAGS := -march=armv4t -mabi=apcs-gnu -mcpu=arm7tdmi -Xlinker -Map=../../$(MAP) -Xlinker --print-memory-usage -Xassembler -meabi=5 -Xassembler -march=armv4t -Xassembler -mcpu=arm7tdmi -Xlinker --gc-sections
+LDFLAGS += -Xlinker -flto=auto
+$(ELF): $(LD_SCRIPT) $(OBJS) libagbsyscall
+ @echo "cd $(OBJ_DIR) && $(ARMCC) $(LDFLAGS) -T ../../$< -o ../../$@ "
+ +@cd $(OBJ_DIR) && $(ARMCC) $(LDFLAGS) -T ../../$< -o ../../$@ $(OBJS_REL) $(LIB)
$(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
+else
+# Output .map file, memory usage readout and gc sections to clean-up unused data
+LDFLAGS = -Map ../../$(MAP) --print-memory-usage --gc-sections
+$(ELF): $(LD_SCRIPT) $(OBJS) libagbsyscall
+ @cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< -o ../../$@ $(OBJS_REL) $(LIB) | cat
+ @echo "cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ../../$< -o ../../$@ | cat"
+ $(FIX) $@ -t"$(TITLE)" -c$(GAME_CODE) -m$(MAKER_CODE) -r$(REVISION) --silent
+endif
# Builds the rom from the elf file
$(ROM): $(ELF)
$(OBJCOPY) -O binary $< $@
$(FIX) $@ -p --silent
+emerald: all
+firered: all
+leafgreen: all
# Symbol file (`make syms`)
$(SYM): $(ELF)
$(OBJDUMP) -t $< | sort -u | grep -E "^0[2389]" | $(PERL) -p -e 's/^(\w{8}) (\w).{6} \S+\t(\w{8}) (\S+)$$/\1 \2 \3 \4/g' > $@
diff --git a/README.md b/README.md
index 626eea5d7ebb..8094c29e85e5 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
# About `pokeemerald-expansion`
-  
+  
@@ -8,7 +8,7 @@
# [Features](FEATURES.md)
-**`pokeemerald-expansion`** offers hundreds of features from various [core series PokΓ©mon games](https://bulbapedia.bulbagarden.net/wiki/Core_series), along with popular quality-of-life enhancements designed to streamline development and improve the player experience. A full list of those featues can be found in [`FEATURES.md`](FEATURES.md).
+**`pokeemerald-expansion`** offers hundreds of features from various [core series PokΓ©mon games](https://bulbapedia.bulbagarden.net/wiki/Core_series), along with popular quality-of-life enhancements designed to streamline development and improve the player experience. A full list of those features can be found in [`FEATURES.md`](FEATURES.md).
# [Credits](CREDITS.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.12.0 https://github.com/rh-hideout/pokeemerald-expansion/
+Based off RHH's pokeemerald-expansion 1.14.1 https://github.com/rh-hideout/pokeemerald-expansion/
```
Please consider [crediting all contributors](CREDITS.md) involved in the project!
@@ -32,7 +32,7 @@ Please consider [crediting all contributors](CREDITS.md) involved in the project
ββ **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 on 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:
+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:
## π₯ [Installing **`pokeemerald-expansion`**](INSTALL.md)
## ποΈ [Building **`pokeemerald-expansion`**](INSTALL.md#Building-pokeemerald-expansion)
@@ -50,4 +50,4 @@ If you are looking to [report a bug](CONTRIBUTING.md#Bug-Report), [open a pull r
[](https://discord.gg/6CzjAG6GZk)
-Our community uses the [Rom Hacking Hideout (RHH) Discord server](https://discord.gg/6CzjAG6GZk) to communicate and organize. Most of our discussions take place there, and we welcome anybody to join us!
+Our community uses the [ROM Hacking Hideout (RHH) Discord server](https://discord.gg/6CzjAG6GZk) to communicate and organize. Most of our discussions take place there, and we welcome anybody to join us!
diff --git a/asm/macros/battle_anim_script.inc b/asm/macros/battle_anim_script.inc
index 1b35991809e2..3d60680da685 100644
--- a/asm/macros/battle_anim_script.inc
+++ b/asm/macros/battle_anim_script.inc
@@ -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
diff --git a/asm/macros/battle_frontier/battle_pyramid.inc b/asm/macros/battle_frontier/battle_pyramid.inc
index bb5069f18a2c..42141d993784 100644
--- a/asm/macros/battle_frontier/battle_pyramid.inc
+++ b/asm/macros/battle_frontier/battle_pyramid.inc
@@ -69,8 +69,8 @@
.endm
@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise
- .macro pyramid_inchallenge
- setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
+ .macro pyramid_getlocation
+ setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CURRENT_LOCATION
special CallBattlePyramidFunction
.endm
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc
index b524104a36f9..7eb3b9d06456 100644
--- a/asm/macros/battle_script.inc
+++ b/asm/macros/battle_script.inc
@@ -9,11 +9,11 @@
.2byte \move
.endm
- .macro attackstring
+ .macro printattackstring
.byte 0x2
.endm
- .macro ppreduce
+ .macro unused_0x3
.byte 0x3
.endm
@@ -45,14 +45,16 @@
.byte 0xa
.endm
- .macro healthbarupdate battler:req
+ .macro healthbarupdate battler:req updateState:req
.byte 0xb
.byte \battler
+ .byte \updateState
.endm
- .macro datahpupdate battler:req
+ .macro datahpupdate battler:req updateState:req
.byte 0xc
.byte \battler
+ .byte \updateState
.endm
.macro critmessage
@@ -102,26 +104,28 @@
jumpifhalfword CMP_EQUAL, sMOVE_EFFECT, MOVE_EFFECT_CONTINUE, 1b
.endm
- .macro seteffectprimary moveEffect=0
+ .macro seteffectprimary battler:req, effectBattler:req, moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.byte 0x16
+ .byte \battler
+ .byte \effectBattler
.endm
- .macro seteffectsecondary moveEffect=0
+ .macro seteffectsecondary battler:req, effectBattler:req, moveEffect=0
.if \moveEffect != 0
setmoveeffect \moveEffect
.endif
.byte 0x17
+ .byte \battler
+ .byte \effectBattler
.endm
- .macro clearstatusfromeffect battler:req, moveEffect=0
- .if \moveEffect != 0
- setmoveeffect \moveEffect
- .endif
+ .macro clearvolatile battler:req, volatile:req
.byte 0x18
.byte \battler
+ .byte \volatile
.endm
.macro tryfaintmon battler:req
@@ -155,10 +159,10 @@
.4byte \jumpInstr
.endm
- .macro jumpifstatus2 battler:req, flags:req, jumpInstr:req
+ .macro jumpifvolatile battler:req, volatile:req, jumpInstr:req
.byte 0x1d
.byte \battler
- .4byte \flags
+ .byte \volatile
.4byte \jumpInstr
.endm
@@ -185,11 +189,12 @@
.4byte \jumpInstr
.endm
- .macro jumpifstatus3condition battler:req, flags:req, jumpIfTrue:req, jumpInstr:req
+ .macro jumpifstatignorecontrary battler:req, comparison:req, stat:req, value:req, jumpInstr:req
.byte 0x21
.byte \battler
- .4byte \flags
- .byte \jumpIfTrue
+ .byte \comparison
+ .byte \stat
+ .byte \value
.4byte \jumpInstr
.endm
@@ -352,13 +357,16 @@
.2byte \frames
.endm
+ .macro setchargingturn
+ .byte 0x40
+ .endm
+
.macro waitstate
.byte 0x3a
.endm
- .macro absorbhealthbarupdate battler:req
+ .macro isdmgblockedbydisguise
.byte 0x3b
- .byte \battler
.endm
.macro return
@@ -410,15 +418,15 @@
.4byte \argPtr
.endm
- .macro setgraphicalstatchangevalues
+ .macro jumpfifsemiinvulnerable battler:req, state:req, jumpInstr:req
.byte 0x47
+ .byte \battler
+ .byte \state
+ .4byte \jumpInstr
.endm
- .macro playstatchangeanimation battler:req, stats:req, flags:req
+ .macro unused_0x48
.byte 0x48
- .byte \battler
- .byte \stats
- .byte \flags
.endm
.macro moveend endMode:req, endState:req
@@ -593,22 +601,15 @@
.byte \notChosenMove
.endm
- .macro statusanimation battler:req
+ .macro statusanimation battler:req, status=0, isVolatile=FALSE
.byte 0x64
.byte \battler
+ .4byte \status
+ .byte \isVolatile
.endm
- .macro status2animation battler:req, status2:req
- .byte 0x65
- .byte \battler
- .4byte \status2
- .endm
-
- .macro chosenstatusanimation battler:req, isStatus2:req, status:req
- .byte 0x66
- .byte \battler
- .byte \isStatus2
- .4byte \status
+ .macro volatileanimation battler:req, volatile:req
+ statusanimation \battler, \volatile, TRUE
.endm
.macro yesnobox
@@ -678,10 +679,8 @@
.byte 0x75
.endm
- .macro various battler:req, id:req
+ .macro unused_0x78
.byte 0x76
- .byte \battler
- .byte \id
.endm
.macro setprotectlike
@@ -701,10 +700,10 @@
.4byte \jumpInstr
.endm
- .macro tryhealhalfhealth failInstr:req, battler:req
+ .macro tryhealhalfhealth battler:req, failInstr:req
.byte 0x7b
- .4byte \failInstr
.byte \battler
+ .4byte \failInstr
.endm
.macro trymirrormove
@@ -729,19 +728,16 @@
.byte \mode
.endm
- .macro trysetrest failInstr:req
+ .macro trysetrest
.byte 0x81
- .4byte \failInstr
.endm
- .macro jumpifnotfirstturn jumpInstr:req
+ .macro unused_0x82
.byte 0x82
- .4byte \jumpInstr
.endm
- .macro setmiracleeye failInstr:req
+ .macro unused_0x83
.byte 0x83
- .4byte \failInstr
.endm
.macro jumpifuproarwakes jumpInstr:req
@@ -754,9 +750,8 @@
.byte \id
.endm
- .macro stockpiletobasedamage failInstr:req
+ .macro stockpiletobasedamage
.byte 0x86
- .4byte \failInstr
.endm
.macro stockpiletohpheal failInstr:req
@@ -768,14 +763,16 @@
callnative BS_RemoveStockpileCounters
.endm
- .macro setdrainedhp
+ .macro unused_0x88
.byte 0x88
.endm
- .macro statbuffchange flags:req, failInstr:req
+ .macro statbuffchange battler:req, flags:req, failInstr:req, stats=0
.byte 0x89
+ .byte \battler
.2byte \flags
.4byte \failInstr
+ .byte \stats
.endm
.macro normalisebuffs
@@ -834,16 +831,19 @@
.4byte \failInstr
.endm
- .macro unused_0x94
+ .macro checknonvolatiletrigger nonVolatile:req, failInstr:req
.byte 0x94
+ .2byte \nonVolatile
+ .4byte \failInstr
.endm
.macro copybidedmg
.byte 0x95
.endm
- .macro unused_96
+ .macro animatewildpokemonafterfailedpokeball battler:req
.byte 0x96
+ .byte \battler
.endm
.macro tryinfatuating failInstr:req
@@ -878,7 +878,7 @@
.4byte \failInstr
.endm
- .macro metronome
+ .macro setcalledmove
.byte 0x9e
.endm
@@ -939,7 +939,7 @@
.4byte \failInstr
.endm
- .macro trysetdestinybondtohappen
+ .macro unused_0xab
.byte 0xab
.endm
@@ -967,8 +967,11 @@
.4byte \failInstr
.endm
- .macro setforesight
+ .macro setvolatile battler:req, volatile:req, value=TRUE
.byte 0xb1
+ .byte \battler
+ .byte \volatile
+ .byte \value
.endm
.macro trysetperishsong failInstr:req
@@ -1012,8 +1015,10 @@
.4byte \jumpInstr
.endm
- .macro tryrestorehpberry
+ .macro tryactivateitem battler:req, flag:req
.byte 0xbb
+ .byte \battler
+ .byte \flag
.endm
.macro halvehp failInstr:req
@@ -1021,19 +1026,14 @@
.4byte \failInstr
.endm
- .macro copyfoestats unused:req
+ .macro copyfoestats
.byte 0xbd
- .4byte \unused
.endm
.macro rapidspinfree
.byte 0xbe
.endm
- .macro setdefensecurlbit
- .byte 0xbf
- .endm
-
.macro recoverbasedonsunlight failInstr:req
.byte 0xc0
.4byte \failInstr
@@ -1048,12 +1048,11 @@
.byte 0xc2
.endm
- .macro trysetfutureattack failInstr:req
+ .macro setfutureattack
.byte 0xc3
- .4byte \failInstr
.endm
- .macro trydobeatup endInstr, failInstr
+ .macro trydobeatup endInstr:req, failInstr:req
.byte 0xc4
.4byte \endInstr
.4byte \failInstr
@@ -1083,7 +1082,7 @@
tryfiretwoturnmovenowbyeffect \battler, FALSE, \jumpInstr
.endm
- .macro setminimize
+ .macro unused_0xC7
.byte 0xc7
.endm
@@ -1100,7 +1099,7 @@
.byte 0xca
.endm
- .macro setcharge battler:req
+ .macro unused_0xcb battler:req
.byte 0xcb
.byte \battler
.endm
@@ -1189,9 +1188,10 @@
.4byte \failInstr
.endm
- .macro setuserstatus3 flags:req, failInstr:req
+ .macro trysetvolatile battler:req, _volatile:req, failInstr:req
.byte 0xdd
- .4byte \flags
+ .byte \battler
+ .byte \_volatile
.4byte \failInstr
.endm
@@ -1226,10 +1226,8 @@
.4byte \jumpInstr
.endm
- .macro jumpifnotcurrentmoveargtype battler:req, failInstr:req
+ .macro unused_0xE4
.byte 0xe4
- .byte \battler
- .4byte \failInstr
.endm
.macro pickup
@@ -1299,7 +1297,7 @@
.byte 0xf3
.endm
- .macro subattackerhpbydmg
+ .macro unused_0xf4
.byte 0xf4
.endm
@@ -1340,11 +1338,12 @@
.4byte \jumpInstr
.endm
- .macro setnonvolatilestatus
+ .macro setnonvolatilestatus trigger:req
.byte 0xfd
+ .byte \trigger
.endm
- .macro tryworryseed failInstr:req
+ .macro tryoverwriteability failInstr:req
.byte 0xfe
.4byte \failInstr
.endm
@@ -1379,21 +1378,6 @@
.4byte \failInstr
.endm
- .macro jumpifcantfling battler:req, jumpInstr:req
- callnative BS_JumpIfCantFling
- .byte \battler
- .4byte \jumpInstr
- .endm
-
- .macro itemstatchangeeffects battler:req
- callnative BS_RunStatChangeItems
- .byte \battler
- .endm
-
- .macro tryintimidateejectpack
- callnative BS_TryIntimidateEjectPack
- .endm
-
.macro allyswitchswapbattlers
callnative BS_AllySwitchSwapBattler
.endm
@@ -1421,9 +1405,10 @@
.4byte \restoreBattlerInstr
.endm
- .macro itemcurestatus jumpInstr:req
+ .macro itemcurestatus jumpInstr:req, restoreBattlerInstr:req
callnative BS_ItemCureStatus
.4byte \jumpInstr
+ .4byte \restoreBattlerInstr
.endm
.macro itemincreasestat
@@ -1438,36 +1423,22 @@
callnative BS_TryRevertWeatherForm
.endm
- .macro trysetoctolock battler:req, failInstr:req
+ .macro trysetoctolock failInstr:req
callnative BS_TrySetOctolock
- .byte \battler
.4byte \failInstr
.endm
- .macro setglaiverush
- callnative BS_SetGlaiveRush
- .endm
-
- .macro tryrelicsong
- callnative BS_TryRelicSong
- .endm
-
.macro setpledge jumpInstr:req
callnative BS_SetPledge
.4byte \jumpInstr
.endm
- .macro setpledgestatus battler:req sidestatus:req
+ .macro setpledgestatus battler:req, sidestatus:req
callnative BS_SetPledgeStatus
.byte \battler
.4byte \sidestatus
.endm
- .macro trycopycat failInstr:req
- callnative BS_TryCopycat
- .4byte \failInstr
- .endm
-
.macro setzeffect
callnative BS_SetZEffect
.endm
@@ -1527,14 +1498,8 @@
.4byte \jumpInstr
.endm
- .macro jumpifmovepropertyargument argument:req, jumpInstr:req
- callnative BS_JumpIfMovePropertyArgument
- .byte \argument
- .4byte \jumpInstr
- .endm
-
- .macro setremoveterrain failInstr:req
- callnative BS_SetRemoveTerrain
+ .macro setterrain failInstr:req
+ callnative BS_SetTerrain
.4byte \failInstr
.endm
@@ -1656,14 +1621,6 @@
.4byte \failInstr
.endm
- .macro tryupdaterecoiltracker
- callnative BS_TryUpdateRecoilTracker
- .endm
-
- .macro tryupdateleaderscresttracker
- callnative BS_TryUpdateLeadersCrestTracker
- .endm
-
.macro trytidyup clear:req, jumpInstr:req
callnative BS_TryTidyUp
.byte \clear
@@ -1697,10 +1654,6 @@
callnative BS_ApplyTerastallization
.endm
- .macro damagetoquartertargethp
- callnative BS_DamageToQuarterTargetHP
- .endm
-
.macro jumpifsleepclause jumpInstr:req
callnative BS_JumpIfSleepClause
.4byte \jumpInstr
@@ -1742,6 +1695,10 @@
.byte \battler
.endm
+ .macro resetterrainabilityflags
+ callnative BS_ResetTerrainAbilityFlags
+ .endm
+
@ Stores Healing Wish effect.
.macro storehealingwish battler:req
callnative BS_StoreHealingWish
@@ -1776,10 +1733,6 @@
callnative BS_WaitFanfare
.endm
- .macro setbeakblast
- callnative BS_SetBeakBlast
- .endm
-
.macro cantarshotwork failInstr:req
callnative BS_CanTarShotWork
.4byte \failInstr
@@ -1803,6 +1756,10 @@
.2byte \flags
.endm
+ .macro clearspecialstatuses
+ callnative BS_ClearSpecialStatuses
+ .endm
+
.macro clearmoveresultflags flags:req
callnative BS_ClearMoveResultFlags
.2byte \flags
@@ -1814,8 +1771,8 @@
.4byte \failInstr
.endm
- .macro jumpifcriticalhit failInstr:req
- callnative BS_JumpIfCriticalHit
+ .macro jumpifnotcriticalhit failInstr:req
+ callnative BS_JumpIfNotCriticalHit
.4byte \failInstr
.endm
@@ -1825,650 +1782,611 @@
.4byte \jumpInstr
.endm
-@ various command changed to more readable macros
- .macro cancelmultiturnmoves battler:req
- various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
- .endm
-
- .macro getifcantrunfrombattle battler:req
- various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE
+ .macro tryflingholdeffect
+ callnative BS_TryFlingHoldEffect
.endm
- .macro getmovetarget battler:req
- various \battler, VARIOUS_GET_MOVE_TARGET
- .endm
-
- .macro getbattlerfainted battler:req
- various \battler, VARIOUS_GET_BATTLER_FAINTED
- .endm
-
- .macro resetswitchinabilitybits battler:req
- various \battler, VARIOUS_RESET_SWITCH_IN_ABILITY_BITS
- .endm
-
- .macro updatechoicemoveonlvlup battler:req
- various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
- .endm
-
- .macro resetplayerfainted
- various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
- .endm
-
- .macro palaceflavortext battler:req
- various \battler, VARIOUS_PALACE_FLAVOR_TEXT
- .endm
-
- .macro arenajudgmentwindow
- various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW
+ .macro swapsidestatuses
+ callnative BS_CourtChangeSwapSideStatuses
.endm
- .macro arenaopponentmonlost
- various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST
+ .macro swapstats stat:req
+ callnative BS_SwapStats
+ .byte \stat
.endm
- .macro arenaplayermonlost
- various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST
+ .macro restoresavedmove
+ callnative BS_RestoreSavedMove
.endm
- .macro arenabothmonlost
- various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST
+@ helpful macros
+ .macro setstatchanger stat:req, stages:req, down:req
+ setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7
.endm
- .macro forfeityesnobox battler:req
- various \battler, VARIOUS_EMIT_YESNOBOX
+ .macro setmoveeffect effect:req
+ sethword sMOVE_EFFECT, \effect
.endm
- .macro arenadrawreftextbox
- various BS_ATTACKER, VARIOUS_DRAW_ARENA_REF_TEXT_BOX
+ .macro sethword dst:req, value:req
+ setbyte \dst, (\value) & 0xFF
+ setbyte \dst + 1, ((\value) >> 8) & 0xFF
.endm
- .macro arenaerasereftextbox
- various BS_ATTACKER, VARIOUS_ERASE_ARENA_REF_TEXT_BOX
+ .macro setword dst:req, value:req
+ setbyte \dst, (\value) & 0xFF
+ setbyte \dst + 1, ((\value) >> 8) & 0xFF
+ setbyte \dst + 2, ((\value) >> 16) & 0xFF
+ setbyte \dst + 3, ((\value) >> 24) & 0xFF
.endm
- .macro arenajudgmentstring id:req
- various \id, VARIOUS_ARENA_JUDGMENT_STRING
+ .macro copybyte dst:req, src:req
+ copyarray \dst, \src, 0x1
.endm
- .macro arenawaitmessage id:req
- various \id, VARIOUS_ARENA_WAIT_STRING
+ .macro copyhword dst:req, src:req
+ copyarray \dst, \src, 0x2
.endm
- .macro waitcry battler:req
- various \battler, VARIOUS_WAIT_CRY
+ .macro copyword dst:req, src:req
+ copyarray \dst, \src, 0x4
.endm
- .macro returnopponentmon1toball battler:req
- various \battler, VARIOUS_RETURN_OPPONENT_MON1
+ .macro jumpifbytenotequal byte1:req, byte2:req, jumpInstr:req
+ jumpifarraynotequal \byte1, \byte2, 0x1, \jumpInstr
.endm
- .macro returnopponentmon2toball battler:req
- various \battler, VARIOUS_RETURN_OPPONENT_MON2
+ .macro jumpifbyteequal byte1:req, byte2:req, jumpInstr:req
+ jumpifarrayequal \byte1, \byte2, 0x1, \jumpInstr
.endm
- .macro volumedown
- various BS_ATTACKER, VARIOUS_VOLUME_DOWN
+ .macro jumpifmove move:req, jumpInstr:req
+ jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpInstr
.endm
- .macro volumeup
- various BS_ATTACKER, VARIOUS_VOLUME_UP
+ .macro jumpifnotmove move:req, jumpInstr:req
+ jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpInstr
.endm
- .macro setalreadystatusedmoveattempt battler:req
- various \battler, VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT
+ .macro jumpifnotchosenmove move:req, jumpInstr:req
+ jumpifhalfword CMP_NOT_EQUAL, gChosenMove, \move, \jumpInstr
.endm
- .macro palacetryescapestatus battler:req
- various \battler, VARIOUS_PALACE_TRY_ESCAPE_STATUS
+ .macro jumpifmovehadnoeffect jumpInstr:req
+ jumpifmoveresultflags MOVE_RESULT_NO_EFFECT, \jumpInstr
.endm
- .macro setoutcomeonteleport battler:req
- various \battler, VARIOUS_SET_TELEPORT_OUTCOME
+ .macro jumpifside battler:req, side:req, equalJumpInstr:req
+ getbattlerside \battler
+ jumpifbyte CMP_EQUAL, gBattleCommunication, \side, \equalJumpInstr
.endm
- .macro playtrainerdefeatbgm battler:req
- various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
+ .macro jumpifbattletype flags:req, jumpInstr:req
+ jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpInstr
.endm
- .macro stattextbuffer battler:req
- various \battler, VARIOUS_STAT_TEXT_BUFFER
+ .macro jumpifnotbattletype flags:req, jumpInstr:req
+ jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpInstr
.endm
- .macro switchinabilities battler:req
- various \battler, VARIOUS_SWITCHIN_ABILITIES
+ .macro dmg_1_8_targethp
+ manipulatedamage DMG_1_8_TARGET_HP
.endm
- .macro instanthpdrop battler:req
- various \battler, VARIOUS_INSTANT_HP_DROP
+ .macro dmgtomaxattackerhp
+ manipulatedamage DMG_FULL_ATTACKER_HP
.endm
- .macro clearstatus battler:req
- various \battler, VARIOUS_CLEAR_STATUS
+ .macro jumpifflowerveil jumpInstr:req
+ jumpifnottype BS_TARGET, TYPE_GRASS, 1f
+ jumpifability BS_TARGET_SIDE, ABILITY_FLOWER_VEIL, \jumpInstr
+ 1:
.endm
- .macro restorepp battler:req
- various \battler, VARIOUS_RESTORE_PP
+ .macro jumpifflowerveilattacker jumpInstr:req
+ jumpifnottype BS_ATTACKER, TYPE_GRASS, 1f
+ jumpifability BS_ATTACKER_SIDE, ABILITY_FLOWER_VEIL, \jumpInstr
+ 1:
.endm
- .macro tryactivatereceiver battler:req
- various \battler, VARIOUS_TRY_ACTIVATE_RECEIVER
+ .macro jumpifabilitycantbereactivated battler:req, jumpInstr:req
+ callnative BS_JumpIfAbilityCantBeReactivated
+ .byte \battler
+ .4byte \jumpInstr
.endm
- .macro tryactivatesoulheart
- various BS_ATTACKER, VARIOUS_TRY_ACTIVATE_SOULHEART
+ .macro tryactivateabilityshield battler:req
+ callnative BS_TryActivateAbilityShield
+ .byte \battler
.endm
- .macro playmoveanimation battler:req, move:req
- various \battler, VARIOUS_PLAY_MOVE_ANIMATION
- .2byte \move
+ .macro trysynchronoise jumpInstr:req
+ callnative BS_TrySynchronoise
+ .4byte \jumpInstr
.endm
- .macro setluckychant battler:req, failInstr:req
- various \battler VARIOUS_SET_LUCKY_CHANT
- .4byte \failInstr
+ .macro jumpifroarfails jumpInstr:req
+ callnative BS_JumpIfRoarFails
+ .4byte \jumpInstr
.endm
- .macro suckerpunchcheck failInstr:req
- various BS_ATTACKER, VARIOUS_SUCKER_PUNCH_CHECK
- .4byte \failInstr
+ .macro jumpifabsent battler:req, jumpInstr:req
+ callnative BS_JumpIfAbsent
+ .byte \battler
+ .4byte \jumpInstr
.endm
- .macro setabilitysimple battler:req, failInstr:req
- various \battler VARIOUS_SET_SIMPLE_BEAM
- .4byte \failInstr
+ .macro jumpifnoholdeffect battler:req, holdEffect:req, jumpInstr:req
+ jumpifholdeffect \battler, \holdEffect, \jumpInstr, FALSE
.endm
- .macro tryentrainment failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_ENTRAINMENT
- .4byte \failInstr
+ .macro jumpifholdeffect battler:req, holdEffect:req, jumpInstr:req, equal:req
+ callnative BS_JumpIfHoldEffect
+ .byte \battler
+ .byte \holdEffect
+ .4byte \jumpInstr
+ .byte \equal
.endm
- .macro setlastusedability battler:req
- various \battler, VARIOUS_SET_LAST_USED_ABILITY
+ .macro jumpifnoally battler:req, jumpInstr:req
+ callnative BS_JumpIfNoAlly
+ .byte \battler
+ .4byte \jumpInstr
.endm
- .macro tryafteryou failInstr:req
- various BS_ATTACKER, VARIOUS_AFTER_YOU
- .4byte \failInstr
+ .macro setlastuseditem battler:req
+ callnative BS_SetLastUsedItem
+ .byte \battler
.endm
- .macro trybestow failInstr:req
- various BS_ATTACKER, VARIOUS_BESTOW
+ .macro trysetfairylock failInstr:req
+ callnative BS_TrySetFairyLock
.4byte \failInstr
.endm
- .macro invertstatstages battler:req
- various \battler, VARIOUS_INVERT_STAT_STAGES
- .endm
-
- .macro trymefirst failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_ME_FIRST
- .4byte \failInstr
+ .macro getstatvalue stat:req
+ callnative BS_GetStatValue
+ .byte \stat
.endm
- .macro jumpifbattleend jumpInstr:req
- various BS_ATTACKER, VARIOUS_JUMP_IF_BATTLE_END
+ .macro jumpiffullhp battler:req, jumpInstr:req
+ callnative BS_JumpIfFullHp
+ .byte \battler
.4byte \jumpInstr
.endm
- .macro tryelectrify failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_ELECTRIFY
- .4byte \failInstr
+ .macro tryfriskmessage
+ callnative BS_TryFriskMessage
.endm
- .macro trysoak failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_SOAK
- .4byte \failInstr
+ .macro settracedability battler:req
+ callnative BS_SetTracedAbility
+ .byte \battler
.endm
- .macro handleformchange battler:req, case:req
- various \battler, VARIOUS_HANDLE_FORM_CHANGE
- .byte \case
+ .macro tryillusionoff battler:req
+ callnative BS_TryIllusionOff
+ .byte \battler
.endm
- .macro jumpifcantuselastresort battler:req, jumpInstr:req
- various \battler, VARIOUS_TRY_LAST_RESORT
- .4byte \jumpInstr
+ .macro setspriteignore0hp ignore0HP:req
+ callnative BS_SetSpriteIgnore0Hp
+ .byte \ignore0HP
.endm
- .macro tryautotomize battler:req, failInstr:req
- various \battler, VARIOUS_TRY_AUTOTOMIZE
- .4byte \failInstr
+ .macro updatenick
+ callnative BS_UpdateNick
.endm
- .macro jumpifcantusesynchronoise jumpInstr:req
- various BS_ATTACKER, VARIOUS_TRY_SYNCHRONOISE
+ .macro jumpifnotberry battler:req, jumpInstr:req
+ callnative BS_JumpIfNotBerry
+ .byte \battler
.4byte \jumpInstr
.endm
- .macro showabilitypopup battler:req
- various \battler, VARIOUS_ABILITY_POPUP
+ .macro gravityonairbornemons
+ callnative BS_GravityOnAirborneMons
.endm
- .macro updateabilitypopup battler:req
- various \battler, VARIOUS_UPDATE_ABILITY_POPUP
- .endm
-
- .macro jumpiftargetally jumpInstr:req
- various BS_ATTACKER, VARIOUS_JUMP_IF_TARGET_ALLY
- .4byte \jumpInstr
- .endm
-
- .macro trypsychoshift failInstr:req sleepClauseFailInstr:req
- various BS_ATTACKER, VARIOUS_PSYCHO_SHIFT
+ .macro tryacupressure failInstr:req
+ callnative BS_TryAcupressure
.4byte \failInstr
- .4byte \sleepClauseFailInstr
- .endm
-
- .macro curestatus battler:req
- various \battler, VARIOUS_CURE_STATUS
.endm
- .macro powertrick battler:req
- various \battler, VARIOUS_POWER_TRICK
+ .macro cancelmultiturnmoves
+ callnative BS_CancelMultiTurnMoves
.endm
- .macro jumpifnotgrounded battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_NOT_GROUNDED
- .4byte \jumpInstr
+ .macro isrunningimpossible
+ callnative BS_IsRunningImpossible
.endm
- .macro handletrainerslidemsg battler:req, case:req
- various \battler, VARIOUS_HANDLE_TRAINER_SLIDE_MSG
- .byte \case
+ .macro getmovetarget
+ callnative BS_GetMoveTarget
.endm
- .macro trytrainerslidefirstdownmsg battler:req
- various \battler, VARIOUS_TRY_TRAINER_SLIDE_MSG_FIRST_OFF
+ @ Will jump to script pointer if the specified battler has or has not fainted.
+ .macro jumpiffainted battler:req, value:req, ptr:req
+ getbattlerfainted \battler
+ jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
.endm
- .macro trytrainerslidelastonmsg battler:req
- various \battler, VARIOUS_TRY_TRAINER_SLIDE_MSG_LAST_ON
+ .macro getbattlerfainted battler:req
+ callnative BS_GetBattlerFainted
+ .byte \battler
.endm
- .macro setauroraveil battler:req
- various \battler, VARIOUS_SET_AURORA_VEIL
+ .macro resetswitchinabilitybits
+ callnative BS_ResetSwitchInAbilityBits
.endm
- .macro trysetthirdtype battler:req, failInstr:req
- various \battler, VARIOUS_TRY_THIRD_TYPE
- .4byte \failInstr
+ .macro updatechoicemoveonlvlup
+ callnative BS_UpdateChoiceMoveOnLvlUp
.endm
- .macro tryaccupressure battler:req, failInstr:req
- various \battler, VARIOUS_ACUPRESSURE
- .4byte \failInstr
+ .macro resetplayerfainted
+ callnative BS_ResetPlayerFainted
.endm
- .macro setpowder battler:req
- various \battler, VARIOUS_SET_POWDER
+ .macro palaceflavortext
+ callnative BS_PalaceFlavorText
.endm
- .macro bringdownairbornebattler battler:req
- various \battler, VARIOUS_GRAVITY_ON_AIRBORNE_MONS
+ .macro arenajudgmentwindow
+ callnative BS_ArenaJudgmentWindow
.endm
- .macro checkgrassyterrainheal battler:req, failInstr:req
- various \battler, VARIOUS_CHECK_IF_GRASSY_TERRAIN_HEALS
- .4byte \failInstr
+ .macro arenaopponentmonlost
+ callnative BS_ArenaOpponentMonLost
.endm
- .macro jumpifnotberry battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_NOT_BERRY
- .4byte \jumpInstr
+ .macro arenaplayermonlost
+ callnative BS_ArenaPlayerMonLost
.endm
- .macro jumpifroarfails jumpInstr:req
- various BS_ATTACKER, VARIOUS_JUMP_IF_ROAR_FAILS
- .4byte \jumpInstr
+ .macro arenabothmonslost
+ callnative BS_ArenaBothMonsLost
.endm
- .macro tryinstruct failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_INSTRUCT
- .4byte \failInstr
+ .macro forfeityesnobox
+ callnative BS_ForfeitYesNoBox
.endm
- .macro settracedability battler:req
- various \battler, VARIOUS_TRACE_ABILITY
+ .macro drawarenareftextbox
+ callnative BS_DrawArenaRefTextBox
.endm
- .macro updatenick battler:req
- various \battler, VARIOUS_UPDATE_NICK
+ .macro erasearenareftextbox
+ callnative BS_EraseArenaRefTextBox
.endm
- .macro tryillusionoff battler:req
- various \battler, VARIOUS_TRY_ILLUSION_OFF
+ .macro arenajudgmentstring id:req
+ callnative BS_ArenaJudgmentString
+ .byte \id
.endm
- .macro spriteignore0hp value:req
- various BS_ATTACKER, VARIOUS_SET_SPRITEIGNORE0HP
- .byte \value
+ .macro arenawaitmessage
+ callnative BS_ArenaWaitMessage
.endm
- .macro getstatvalue battler:req, stat:req
- various \battler, VARIOUS_GET_STAT_VALUE
- .byte \stat
+ .macro waitcry
+ callnative BS_WaitCry
.endm
- .macro jumpiffullhp battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_FULL_HP
- .4byte \jumpInstr
+ .macro returnopponentmon1toball
+ callnative BS_ReturnOpponentMon1ToBall
.endm
- .macro losetype battler:req, type:req
- various \battler, VARIOUS_LOSE_TYPE
- .byte \type
+ .macro returnopponentmon2toball
+ callnative BS_ReturnOpponentMon2ToBall
.endm
- .macro tryfriskmsg battler:req
- various \battler, VARIOUS_TRY_FRISK
+ .macro volumedown
+ callnative BS_VolumeDown
.endm
- .macro jumpifshieldsdown battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_SHIELDS_DOWN_PROTECTED
- .4byte \jumpInstr
+ .macro volumeup
+ callnative BS_VolumeUp
.endm
- .macro trysetfairylock failInstr:req
- various BS_ATTACKER, VARIOUS_TRY_FAIRY_LOCK
- .4byte \failInstr
+ .macro setalreadystatusedmoveattempt
+ callnative BS_SetAlreadyStatusedMoveAttempt
.endm
- .macro jumpifnoally battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_NO_ALLY
- .4byte \jumpInstr
+ .macro palacetryescapestatus
+ callnative BS_PalaceTryEscapeStatus
.endm
- .macro jumpifholdeffect battler:req, holdEffect:req, jumpInstr:req, equal=TRUE
- various \battler, VARIOUS_JUMP_IF_HOLD_EFFECT
- .byte \holdEffect
- .4byte \jumpInstr
- .byte \equal
+ .macro setteleportoutcome battler:req
+ callnative BS_SetTeleportOutcome
+ .byte \battler
.endm
- .macro jumpifnoholdeffect battler:req, holdEffect:req, jumpInstr:req
- jumpifholdeffect \battler, \holdEffect, \jumpInstr, FALSE
+ .macro playtrainerdefeatedmusic
+ callnative BS_PlayTrainerDefeatedMusic
.endm
- .macro infatuatewithbattler battler:req, infatuateWith:req
- various \battler, VARIOUS_INFATUATE_WITH_BATTLER
- .byte \infatuateWith
+ .macro stattextbuffer
+ callnative BS_StatTextBuffer
.endm
- .macro setlastuseditem battler:req
- various \battler, VARIOUS_SET_LAST_USED_ITEM
+ .macro switchinabilities battler:req
+ callnative BS_SwitchinAbilities
+ .byte \battler
.endm
- .macro jumpifabsent battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_ABSENT
- .4byte \jumpInstr
+ .macro instanthpdrop
+ callnative BS_InstantHpDrop
.endm
- .macro destroyabilitypopup
- various BS_ABILITY_BATTLER, VARIOUS_DESTROY_ABILITY_POPUP
+ .macro clearstatus
+ callnative BS_ClearStatus
.endm
- .macro gettotemboost jumpInstr:req
- various BS_ATTACKER, VARIOUS_TOTEM_BOOST
- .4byte \jumpInstr
+ .macro restoremovepp
+ callnative BS_RestoreMovePp
.endm
- .macro consumeberry battler:req, fromBattler:req
- various \battler, VARIOUS_CONSUME_BERRY
- .byte \fromBattler
+ .macro tryactivatereceiver battler:req
+ callnative BS_TryActivateReceiver
+ .byte \battler
.endm
- .macro activateitemeffects battler:req
- various \battler, VARIOUS_MOVEEND_ITEM_EFFECTS
+ .macro tryactivatesoulheart
+ callnative BS_TryActivateSoulheart
.endm
- .macro pickpocketsteal
- various 0, VARIOUS_PICKPOCKET
+ .macro playmoveanimation move:req
+ callnative BS_PlayMoveAnimation
+ .2byte \move
.endm
- .macro doterrainseed battler:req, failInstr:req
- various \battler, VARIOUS_TERRAIN_SEED
+ .macro setluckychant failInstr:req
+ callnative BS_SetLuckyChant
.4byte \failInstr
.endm
- .macro makeinvisible battler:req
- various \battler, VARIOUS_MAKE_INVISIBLE
- .endm
-
- .macro tryroomservice battler:req, failInstr:req
- various \battler, VARIOUS_ROOM_SERVICE
+ .macro tryentrainment failInstr:req
+ callnative BS_TryEntrainment
.4byte \failInstr
.endm
- .macro jumpifpranksterblocked battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_PRANKSTER_BLOCKED
- .4byte \jumpInstr
+ .macro setlastusedability
+ callnative BS_SetLastUsedAbility
.endm
- .macro jumpifteamhealthy battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_TEAM_HEALTHY
- .4byte \jumpInstr
+ .macro invertstatstages
+ callnative BS_InvertStatStages
.endm
- .macro tryhealquarterhealth battler:req, failInstr:req
- various \battler, VARIOUS_TRY_HEAL_QUARTER_HP
+ .macro tryelectrify failInstr:req
+ callnative BS_TryElectrify
.4byte \failInstr
.endm
- .macro trytoclearprimalweather
- various BS_ATTACKER, VARIOUS_TRY_TO_CLEAR_PRIMAL_WEATHER
+ .macro trysoak failInstr:req
+ callnative BS_TrySoak
+ .4byte \failInstr
.endm
- .macro setattackertostickywebuser
- various BS_TARGET, VARIOUS_SET_ATTACKER_STICKY_WEB_USER
+ .macro handleformchange battler:req, case_:req
+ callnative BS_HandleFormChange
+ .byte \battler
+ .byte \case_
.endm
- .macro getrototillertargets failInstr:req
- various BS_ATTACKER, VARIOUS_GET_ROTOTILLER_TARGETS
+ .macro tryautotomize failInstr:req
+ callnative BS_TryAutotomize
.4byte \failInstr
.endm
- .macro jumpifnotrototilleraffected battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_NOT_ROTOTILLER_AFFECTED
- .4byte \jumpInstr
+ .macro tryinstruct failInstr:req
+ callnative BS_TryInstruct
+ .4byte \failInstr
.endm
- .macro jumpifcantreverttoprimal jumpInstr:req
- various BS_ATTACKER, VARIOUS_JUMP_IF_CANT_REVERT_TO_PRIMAL
- .4byte \jumpInstr
+ .macro showabilitypopup
+ callnative BS_ShowAbilityPopup
.endm
- .macro jumpifweatheraffected battler:req, flags:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_WEATHER_AFFECTED
- .4byte \flags
- .4byte \jumpInstr
+ .macro updateabilitypopup
+ callnative BS_UpdateAbilityPopup
.endm
- .macro jumpifspecies battler:req, species:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_SPECIES
- .2byte \species
+ .macro jumpiftargetally jumpInstr:req
+ callnative BS_JumpIfTargetAlly
.4byte \jumpInstr
.endm
- .macro tryendneutralizinggas battler:req
- various \battler, VARIOUS_TRY_END_NEUTRALIZING_GAS
- .endm
-
- .macro trynoretreat battler:req, failInstr:req
- various \battler, VARIOUS_TRY_NO_RETREAT
+ .macro trypsychoshift failInstr:req sleepClauseFailInstr:req
+ callnative BS_TryPsychoShift
.4byte \failInstr
+ .4byte \sleepClauseFailInstr
.endm
- .macro checkpoltergeist battler:req, failInstr:req
- various \battler, VARIOUS_CHECK_POLTERGEIST
- .4byte \failInstr
+ .macro curestatus battler:req
+ callnative BS_CureStatus
+ .byte \battler
.endm
- .macro cutonethirdhpraisestats failInstr:req
- various BS_ATTACKER, VARIOUS_CUT_1_3_HP_RAISE_STATS
- .4byte \failInstr
+ .macro powertrick
+ callnative BS_PowerTrick
.endm
- .macro curecertainstatuses battler:req
- various \battler, VARIOUS_CURE_CERTAIN_STATUSES
+ .macro tryafteryou failInstr:req
+ callnative BS_TryAfterYou
+ .4byte \failInstr
.endm
- .macro tryresetnegativestatstages battler:req
- various \battler, VARIOUS_TRY_RESET_NEGATIVE_STAT_STAGES
+ .macro trybestow failInstr:req
+ callnative BS_TryBestow
+ .4byte \failInstr
.endm
- .macro jumpiflastuseditemberry jumpInstr:req
- various BS_ATTACKER, VARIOUS_JUMP_IF_LAST_USED_ITEM_BERRY
- .4byte \jumpInstr
+ .macro handletrainerslidemsg battler:req, case_:req
+ callnative BS_HandleTrainerSlideMsg
+ .byte \battler
+ .byte \case_
.endm
- .macro jumpiflastuseditemholdeffect holdEffect:req, secondaryId:req, jumpInstr:req
- callnative BS_JumpIfLastUsedItemHoldEffect
- .byte \holdEffect
- .2byte \secondaryId
- .4byte \jumpInstr
+ .macro trytrainerslidemsgfirstoff battler:req
+ callnative BS_TryTrainerSlideMsgFirstOff
+ .byte \battler
.endm
- .macro savebattleritem battler:req
- various \battler, VARIOUS_SAVE_BATTLER_ITEM
+ .macro trytrainerslidemsglaston battler:req
+ callnative BS_TryTrainerSlideMsgLastOn
+ .byte \battler
.endm
- .macro restorebattleritem battler:req
- various \battler, VARIOUS_RESTORE_BATTLER_ITEM
+ .macro setauroraveil
+ callnative BS_SetAuroraVeil
.endm
- .macro battleritemtolastuseditem battler:req
- various \battler, VARIOUS_BATTLER_ITEM_TO_LAST_USED_ITEM
+ .macro trythirdtype failInstr:req
+ callnative BS_TryThirdType
+ .4byte \failInstr
.endm
- .macro swapsidestatuses
- callnative BS_CourtChangeSwapSideStatuses
+ .macro destroyabilitypopup
+ callnative BS_DestroyAbilityPopup
.endm
- .macro swapstats stat:req
- callnative BS_SwapStats
- .byte \stat
+ .macro gettotemboost jumpInstr:req
+ callnative BS_GetTotemBoost
+ .4byte \jumpInstr
.endm
- .macro restoresavedmove
- callnative BS_RestoreSavedMove
+ .macro activateitemeffects
+ callnative BS_ActivateItemEffects
.endm
-@ helpful macros
- .macro setstatchanger stat:req, stages:req, down:req
- setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7
+ .macro tryroomservice battler:req, failInstr:req
+ callnative BS_TryRoomService
+ .byte \battler
+ .4byte \failInstr
.endm
- .macro setmoveeffect effect:req
- sethword sMOVE_EFFECT, \effect
- sethword sSAVED_MOVE_EFFECT, \effect
+ .macro tryterrainseed battler:req, failInstr:req
+ callnative BS_TryTerrainSeed
+ .byte \battler
+ .4byte \failInstr
.endm
- .macro chosenstatus1animation battler:req, status:req
- chosenstatusanimation \battler, 0x0, \status
+ .macro makeinvisible battler:req
+ callnative BS_MakeInvisible
+ .byte \battler
.endm
- .macro chosenstatus2animation battler:req, status:req
- chosenstatusanimation \battler, 0x1, \status
+ .macro jumpifteamhealthy jumpInstr:req
+ callnative BS_JumpIfTeamHealthy
+ .4byte \jumpInstr
.endm
- .macro sethword dst:req, value:req
- setbyte \dst, (\value) & 0xFF
- setbyte \dst + 1, ((\value) >> 8) & 0xFF
+ .macro tryhealquarterhealth battler:req, failInstr:req
+ callnative BS_TryHealQuarterHealth
+ .byte \battler
+ .4byte \failInstr
.endm
- .macro setword dst:req, value:req
- setbyte \dst, (\value) & 0xFF
- setbyte \dst + 1, ((\value) >> 8) & 0xFF
- setbyte \dst + 2, ((\value) >> 16) & 0xFF
- setbyte \dst + 3, ((\value) >> 24) & 0xFF
+ .macro jumpifunder200 jumpInstr:req
+ callnative BS_JumpIfUnder200
+ .4byte \jumpInstr
.endm
- .macro copybyte dst:req, src:req
- copyarray \dst, \src, 0x1
+ .macro setskydrop
+ callnative BS_SetSkyDrop
.endm
- .macro copyhword dst:req, src:req
- copyarray \dst, \src, 0x2
+ .macro clearskydrop failInstr:req
+ callnative BS_ClearSkyDrop
+ .4byte \failInstr
.endm
- .macro copyword dst:req, src:req
- copyarray \dst, \src, 0x4
+ .macro skydropyawn
+ callnative BS_SkyDropYawn
.endm
- .macro jumpifbytenotequal byte1:req, byte2:req, jumpInstr:req
- jumpifarraynotequal \byte1, \byte2, 0x1, \jumpInstr
+ .macro jumpifpranksterblocked jumpInstr:req
+ callnative BS_JumpIfPranksterBlocked
+ .4byte \jumpInstr
.endm
- .macro jumpifbyteequal byte1:req, byte2:req, jumpInstr:req
- jumpifarrayequal \byte1, \byte2, 0x1, \jumpInstr
+ .macro trytoclearprimalweather
+ callnative BS_TryToClearPrimalWeather
.endm
- .macro jumpifmove move:req, jumpInstr:req
- jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpInstr
+ .macro tryendneutralizinggas
+ callnative BS_TryEndNeutralizingGas
.endm
- .macro jumpifnotmove move:req, jumpInstr:req
- jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpInstr
+ .macro getrototillertargets failInstr:req
+ callnative BS_GetRototillerTargets
+ .4byte \failInstr
.endm
- .macro jumpifnotchosenmove move:req, jumpInstr:req
- jumpifhalfword CMP_NOT_EQUAL, gChosenMove, \move, \jumpInstr
+ .macro jumpifnotrototilleraffected jumpInstr:req
+ callnative BS_JumpIfNotRototillerAffected
+ .4byte \jumpInstr
.endm
- .macro jumpifstatus3 battler:req, flags:req, jumpInstr:req
- jumpifstatus3condition \battler, \flags, FALSE, \jumpInstr
+ .macro consumeberry battler:req, fromBattler:req
+ callnative BS_ConsumeBerry
+ .byte \battler
+ .byte \fromBattler
.endm
- .macro jumpifnostatus3 battler:req, flags:req, jumpInstr:req
- jumpifstatus3condition \battler, \flags, TRUE, \jumpInstr
+ .macro jumpifweatheraffected flags:req, jumpInstr:req
+ callnative BS_JumpIfWeatherAffected
+ .2byte \flags
+ .4byte \jumpInstr
.endm
- .macro jumpifmovehadnoeffect jumpInstr:req
- jumpifmoveresultflags MOVE_RESULT_NO_EFFECT, \jumpInstr
+ .macro jumpifspecies species:req, jumpInstr:req
+ callnative BS_JumpIfSpecies
+ .2byte \species
+ .4byte \jumpInstr
.endm
- .macro jumpifside battler:req, side:req, equalJumpInstr:req
- getbattlerside \battler
- jumpifbyte CMP_EQUAL, gBattleCommunication, \side, \equalJumpInstr
+ .macro jumpifabilitypreventsrest battler:req, jumpInstr:req
+ callnative BS_JumpIfAbilityPreventsRest
+ .byte \battler
+ .4byte \jumpInstr
.endm
- .macro jumpifbattletype flags:req, jumpInstr:req
- jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpInstr
+ .macro setattackertostickywebuser
+ callnative BS_SetAttackerToStickyWebUser
.endm
- .macro jumpifnotbattletype flags:req, jumpInstr:req
- jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpInstr
+ .macro cutonethirdhpandraisestats failInstr:req
+ callnative BS_CutOneThirdHpAndRaiseStats
+ .4byte \failInstr
.endm
- .macro dmg_1_8_targethp
- manipulatedamage DMG_1_8_TARGET_HP
+ .macro setpoltergeistmessage failInstr:req
+ callnative BS_SetPoltergeistMessage
+ .4byte \failInstr
.endm
- .macro dmgtomaxattackerhp
- manipulatedamage DMG_FULL_ATTACKER_HP
+ .macro tryresetnegativestatstages
+ callnative BS_TryResetNegativeStatStages
.endm
- .macro dmgtocurrattackerhp
- manipulatedamage DMG_CURR_ATTACKER_HP
+ .macro jumpiflastuseditemberry jumpInstr:req
+ callnative BS_JumpIfLastUsedItemBerry
+ .4byte \jumpInstr
.endm
- .macro jumpifflowerveil jumpInstr:req
- jumpifnottype BS_TARGET, TYPE_GRASS, 1f
- jumpifability BS_TARGET_SIDE, ABILITY_FLOWER_VEIL, \jumpInstr
- 1:
+ .macro savebattleritem
+ callnative BS_SaveBattlerItem
.endm
- .macro jumpifflowerveilattacker jumpInstr:req
- jumpifnottype BS_ATTACKER, TYPE_GRASS, 1f
- jumpifability BS_ATTACKER_SIDE, ABILITY_FLOWER_VEIL, \jumpInstr
- 1:
+ .macro restorebattleritem
+ callnative BS_RestoreBattlerItem
.endm
- .macro jumpifabilitycantbesuppressed battler:req, jumpInstr:req
- callnative BS_JumpIfAbilityCantBeSuppressed
- .byte \battler
- .4byte \jumpInstr
+ .macro battleritemtolastuseditem
+ callnative BS_BattlerItemToLastUsedItem
.endm
.macro setallytonexttarget jumpInstr:req
@@ -2489,40 +2407,12 @@
goto \jumpInstr
.endm
- .macro jumpifleafguardprotected battler:req, jumpInstr:req
- various \battler, VARIOUS_JUMP_IF_LEAF_GUARD_PROTECTED
- .4byte \jumpInstr
- .endm
-
.macro jumpifsafeguard jumpInstr:req
jumpifability BS_ATTACKER, ABILITY_INFILTRATOR, 1f
jumpifsideaffecting BS_TARGET, SIDE_STATUS_SAFEGUARD, \jumpInstr
1:
.endm
- @ Will jump to script pointer if the target weighs less than 200 kg, or 441 lbs.
- .macro jumpifunder200 battler:req, failInstr:req
- various \battler, VARIOUS_JUMP_IF_UNDER_200
- .4byte \failInstr
- .endm
-
- @ Sets the sky drop status and does all other necessary operations
- .macro setskydrop
- various 0, VARIOUS_SET_SKY_DROP
- .endm
-
- @ Clears the sky drop status and does all other necessary operations.
- @ If the target fainted in before this script is called, it goes to the given script.
- .macro clearskydrop failInstr:req
- various 0, VARIOUS_CLEAR_SKY_DROP
- .4byte \failInstr
- .endm
-
- @ Accounts for if the target of Sky Drop was in confuse_lock when the attacker falls asleep due to Yawn.
- .macro skydropyawn
- various 0, VARIOUS_SKY_DROP_YAWN
- .endm
-
@ Tries to increase or decrease a battler's stat's stat stage by a specified amount. If impossible, jumps to \script.
.macro modifybattlerstatstage battler:req, stat:req, mode:req, amount:req, script:req, animation:req, customString
@@ -2535,11 +2425,10 @@
ANIM_ON = TRUE
setstatchanger \stat, \amount, \mode
- statbuffchange STAT_CHANGE_ALLOW_PTR, \script
- setgraphicalstatchangevalues
- .if \animation == TRUE
- playanimation \battler, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ .if \animation == FALSE
+ setbyte sSTAT_ANIM_PLAYED, TRUE
.endif
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, \script
.ifnb \customString
printstring \customString
.else
@@ -2554,12 +2443,6 @@
waitmessage B_WAIT_TIME_LONG
.endm
- @ Will jump to script pointer if the specified battler has or has not fainted.
- .macro jumpiffainted battler:req, value:req, ptr:req
- getbattlerfainted \battler
- jumpifbyte CMP_EQUAL, gBattleCommunication, \value, \ptr
- .endm
-
.macro flushtextbox
printstring STRINGID_EMPTYSTRING3
waitmessage 1
@@ -2569,3 +2452,15 @@
callnative BS_JumpIfNoWhiteOut
.4byte \jumpInstr
.endm
+
+ .macro tryboosterenergy onFieldStatus:req
+ callnative BS_TryBoosterEnergy
+ .byte \onFieldStatus
+ .endm
+
+ .macro jumpifgenconfiglowerthan tag:req, gen:req, jumpInstr:req
+ callnative BS_JumpIfGenConfigLowerThan
+ .2byte \tag
+ .byte \gen
+ .4byte \jumpInstr
+ .endm
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 1cf9c7fca76c..6abaeff2652e 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -169,7 +169,10 @@
.endm
@ Copies the value of source into destination.
- .macro copyvar destination:req, source:req
+ .macro copyvar destination:req, source:req, warn=TRUE
+ .if \warn && !((\source >= VARS_START && \source <= VARS_END) || (\source >= SPECIAL_VARS_START && \source <= SPECIAL_VARS_END))
+ .warning "copyvar with a value that is not a VAR_ constant; did you mean setvar instead?"
+ .endif
.byte SCR_OP_COPYVAR
.2byte \destination
.2byte \source
@@ -684,6 +687,14 @@
map \map
.endm
+ @ Set the player object's invisibility to FALSE.
+ .macro showplayer
+ .byte SCR_OP_SHOWOBJECTAT
+ .2byte LOCALID_PLAYER
+ .byte 0 @ map group
+ .byte 0 @ map num
+ .endm
+
@ Sets the specified object's invisibility to TRUE.
.macro hideobjectat localId:req, map:req
.byte SCR_OP_HIDEOBJECTAT
@@ -691,6 +702,14 @@
map \map
.endm
+ @ Set the player object's invisibility to TRUE.
+ .macro hideplayer
+ .byte SCR_OP_HIDEOBJECTAT
+ .2byte LOCALID_PLAYER
+ .byte 0 @ map group
+ .byte 0 @ map num
+ .endm
+
@ Turns the currently selected object (if there is one) to face the player.
.macro faceplayer
.byte SCR_OP_FACEPLAYER
@@ -986,7 +1005,7 @@
@ Gives the player a PokΓ©mon of the specified species and level, and allows to customize extra parameters.
@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
- .macro givemon species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, isShiny, gmaxFactor, teraType, dmaxLevel
+ .macro givemon species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, shinyMode, gmaxFactor, teraType, dmaxLevel
callnative ScrCmd_createmon, requests_effects=1
.byte 0
.byte PARTY_SIZE @ assign to first empty slot
@@ -1014,7 +1033,7 @@
.ifnb \move2; .set givemon_flags, givemon_flags | (1 << 18); .endif
.ifnb \move3; .set givemon_flags, givemon_flags | (1 << 19); .endif
.ifnb \move4; .set givemon_flags, givemon_flags | (1 << 20); .endif
- .ifnb \isShiny; .set givemon_flags, givemon_flags | (1 << 21); .endif
+ .ifnb \shinyMode; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \gmaxFactor; .set givemon_flags, givemon_flags | (1 << 22); .endif
.ifnb \teraType; .set givemon_flags, givemon_flags | (1 << 23); .endif
.ifnb \dmaxLevel; .set givemon_flags, givemon_flags | (1 << 24); .endif
@@ -1040,7 +1059,7 @@
.ifnb \move2; .2byte \move2; .endif
.ifnb \move3; .2byte \move3; .endif
.ifnb \move4; .2byte \move4; .endif
- .ifnb \isShiny; .2byte \isShiny; .endif
+ .ifnb \shinyMode; .2byte \shinyMode; .endif
.ifnb \gmaxFactor; .2byte \gmaxFactor; .endif
.ifnb \teraType; .2byte \teraType; .endif
.ifnb \dmaxLevel; .2byte \dmaxLevel; .endif
@@ -1048,7 +1067,7 @@
@ creates a mon for a given party and slot
@ otherwise
- .macro createmon side:req, slot:req, species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, isShiny, gmaxFactor, teraType, dmaxLevel
+ .macro createmon side:req, slot:req, species:req, level:req, item, ball, nature, abilityNum, gender, hpEv, atkEv, defEv, speedEv, spAtkEv, spDefEv, hpIv, atkIv, defIv, speedIv, spAtkIv, spDefIv, move1, move2, move3, move4, shinyMode, gmaxFactor, teraType, dmaxLevel
callnative ScrCmd_createmon, requests_effects=1
.byte \side @ 0 - player, 1 - opponent
.byte \slot @ 0-5
@@ -1076,7 +1095,7 @@
.ifnb \move2; .set givemon_flags, givemon_flags | (1 << 18); .endif
.ifnb \move3; .set givemon_flags, givemon_flags | (1 << 19); .endif
.ifnb \move4; .set givemon_flags, givemon_flags | (1 << 20); .endif
- .ifnb \isShiny; .set givemon_flags, givemon_flags | (1 << 21); .endif
+ .ifnb \shinyMode; .set givemon_flags, givemon_flags | (1 << 21); .endif
.ifnb \gmaxFactor; .set givemon_flags, givemon_flags | (1 << 22); .endif
.ifnb \teraType; .set givemon_flags, givemon_flags | (1 << 23); .endif
.ifnb \dmaxLevel; .set givemon_flags, givemon_flags | (1 << 24); .endif
@@ -1102,7 +1121,7 @@
.ifnb \move2; .2byte \move2; .endif
.ifnb \move3; .2byte \move3; .endif
.ifnb \move4; .2byte \move4; .endif
- .ifnb \isShiny; .2byte \isShiny; .endif
+ .ifnb \shinyMode; .2byte \shinyMode; .endif
.ifnb \gmaxFactor; .2byte \gmaxFactor; .endif
.ifnb \teraType; .2byte \teraType; .endif
.ifnb \dmaxLevel; .2byte \dmaxLevel; .endif
@@ -1125,12 +1144,13 @@
.2byte \move
.endm
- @ Checks if at least one Pokemon in the player's party knows the specified move. If so, VAR_RESULT is set to the
+ @ Checks if at least one Pokemon in the player's party knows the specified field move and if the field move is unlocked. If so, VAR_RESULT is set to the
@ (zero-indexed) slot number of the first Pokemon that knows the move. If not, VAR_RESULT is set to PARTY_SIZE.
@ VAR_0x8004 is also set to this Pokemon's species.
- .macro checkpartymove move:req
- .byte SCR_OP_CHECKPARTYMOVE
- .2byte \move
+ .macro checkfieldmove fieldMove:req, checkUnlocked=FALSE
+ .byte SCR_OP_CHECKFIELDMOVE
+ .byte \fieldMove
+ .byte \checkUnlocked
.endm
@ Converts STR_VAR_1, STR_VAR_2, or STR_VAR_3 to its corresponding index into sScriptStringVars (0, 1, or 2).
@@ -1875,6 +1895,7 @@
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are provided in argv.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
+ @ For a simple menu supply DYN_MULTICHOICE_CB_NONE in callbacks.
.macro dynmultichoice left:req, top:req, ignoreBPress:req, maxBeforeScroll:req, initialSelected:req, callbacks:req argv:vararg
_dynmultichoice \left, \top, \ignoreBPress, \maxBeforeScroll, FALSE, \initialSelected, \callbacks, \argv
.endm
@@ -2174,7 +2195,7 @@
setvar VAR_0x8000, \evoMethod
setvar VAR_0x8001, \canStopEvo
setvar VAR_0x8002, \tryMultiple
- special TrySpecialOverworldEvo
+ special TrySpecialScriptEvolution
.endm
.macro ai_vs_ai_battle trainer1:req, trainer2:req
@@ -2311,6 +2332,11 @@
callnative ScriptSetDoubleBattleFlag, requests_effects=1
.endm
+ @ Stop using the ORAS dowsing machine.
+ .macro stoporasdowsing
+ callnative EndORASDowsing
+ .endm
+
@ ============================ @
@ FAKE RTC MACROS
@ Will only function if OW_USE_FAKE_RTC is true. If it has any additional requirements, it will be listed accordingly.
@@ -2480,7 +2506,7 @@
@ Hides any follower PokΓ©mon if present, putting them into their PokΓ© Ball; by default waits for their movement to finish.
.macro hidefollower wait=1
- callnative ScrFunc_hidefollower
+ .byte SCR_OP_HIDEFOLLOWER
.2byte \wait
.endm
@@ -2569,7 +2595,7 @@
@ Follower NPCs
- @ Sets an NPC up to follow the player.
+ @ Sets an existing NPC up to follow the player.
@ Follower flags are defined in include/constants/follower_npc.h
@ If you want to specify a battle partner without specifying a custom script, you can set the script parameter to 0.
.macro setfollowernpc localId:req, flags:req, script=0, battlePartner=0
@@ -2597,6 +2623,19 @@
.endif
.endm
+ @ Creates a new follower NPC with the specified graphics id.
+ .macro createfollowernpc gfx:req, flags:req, script=0, battlePartner=0
+ .if FNPC_ENABLE_NPC_FOLLOWERS
+ callnative ScriptCreateFollowerNPC
+ .2byte \gfx
+ .2byte \flags
+ .4byte \script
+ .2byte \battlePartner
+ .else
+ .error "createfollowernpc unavailable with FNPC_ENABLE_NPC_FOLLOWERS defined as FALSE"
+ .endif
+ .endm
+
@ Remove the follower NPC (assumes there will only ever be one).
.macro destroyfollowernpc
.if FNPC_ENABLE_NPC_FOLLOWERS
@@ -2639,3 +2678,35 @@
callnative ScriptChangeFollowerNPCBattlePartner
.2byte \battlePartner
.endm
+
+ @ Manually buffer a string as the speaker's name for namebox.
+ @ The next shown message/msgbox will include a namebox, if the provided string is not NULL.
+ @ An SP_NAME_* constant can also be used, it'll take the name from gSpeakerNamesTable instead.
+ .macro setspeaker name:req
+ callnative SetSpeaker
+ .4byte \name
+ .endm
+
+@ VS Seeker
+ .macro vsseeker_rematchid rematchId:req
+ callnative NativeVsSeekerRematchId, requests_effects=1
+ .2byte \rematchId
+ .endm
+
+ @ Sets the move relearner state
+ .macro setmoverelearnerstate state:req
+ callnative ScrCmd_setmoverelearnerstate, requests_effects=1
+ .2byte \state
+ .endm
+
+ @ Retrieves the move relearner state and stores it in the specified var
+ .macro getmoverelearnerstate varId:req
+ callnative ScrCmd_getmoverelearnerstate, requests_effects=1
+ .4byte \varId
+ .endm
+
+ @ Execute script if bag has TMs and/or HMs
+ .macro istmrelearneractive destination:req
+ callnative ScrCmd_istmrelearneractive, requests_effects=1
+ .4byte \destination
+ .endm
diff --git a/asm/macros/m4a.inc b/asm/macros/m4a.inc
index b22da3d63470..0169a3c033c8 100644
--- a/asm/macros/m4a.inc
+++ b/asm/macros/m4a.inc
@@ -11,3 +11,41 @@
.space 1 @ Padding
.2byte \unknown
.endm
+
+ .macro voice_group label:req, starting_note
+ .align 2
+ .ifb \starting_note
+ .global voicegroup_\label
+ voicegroup_\label:
+ .else
+ .set voicegroup_\label, . - \starting_note * 0xC
+ .endif
+ .endm
+
+ .macro keysplit label:req, starting_note
+ .ifb \starting_note
+ .global keysplit_\label
+ keysplit_\label:
+ .set _last_note, 0
+ .else
+ .set keysplit_\label, . - \starting_note
+ .set _last_note, \starting_note
+ .endif
+ .set _last_split, 0
+ .endm
+
+ .macro split index:req, ending_note:req
+ .if \ending_note < _last_note
+ .if _last_split == 0
+ .error "split's ending_note earlier than previous keysplit's starting_note"
+ .else
+ .error "split's ending_note earlier than previous split's ending_note"
+ .endif
+ .else
+ .rept \ending_note - _last_note
+ .byte \index
+ .endr
+ .endif
+ .set _last_note, \ending_note
+ .set _last_split, 1
+ .endm
diff --git a/asm/macros/map.inc b/asm/macros/map.inc
index 74d2b5ff4214..56d738723809 100644
--- a/asm/macros/map.inc
+++ b/asm/macros/map.inc
@@ -2,8 +2,12 @@
@ Takes a MAP constant and outputs the map group and map number as separate bytes
.macro map map_id:req
+ .ifdef \map_id
.byte \map_id >> 8 @ map group
.byte \map_id & 0xFF @ map num
+ .else
+ .error "undefined map (check for typos)"
+ .endif
.endm
@ Defines a map script. 'type' is any MAP_SCRIPT_* constant (see include/constants/map_scripts.h)
diff --git a/audio_rules.mk b/audio_rules.mk
index 3fce08ed3add..70d44664094c 100644
--- a/audio_rules.mk
+++ b/audio_rules.mk
@@ -20,16 +20,17 @@ $(MID_BUILDDIR)/%.o: $(MID_ASM_DIR)/%.s
$(AS) $(ASFLAGS) -I sound -o $@ $<
# Compressed cries
-$(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.aif
- $(AIF) $< $@ --compress
+$(CRY_BIN_DIR)/%.bin: $(CRY_SUBDIR)/%.wav
+# NOTE: If using ipatix's High Quality Audio Mixer, remove "--no-pad" below.
+ $(WAV2AGB) -b -c -l 1 --no-pad $< $@
# Uncompressed cries
$(CRY_BIN_DIR)/uncomp_%.bin: $(CRY_SUBDIR)/uncomp_%.aif
$(AIF) $< $@
# Uncompressed sounds
-$(SOUND_BIN_DIR)/%.bin: sound/%.aif
- $(AIF) $< $@
+$(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
# Data following the colon in said file corresponds to arguments passed into mid2agb
diff --git a/charmap.txt b/charmap.txt
index 34fb683d0c98..dd2123f8f93b 100644
--- a/charmap.txt
+++ b/charmap.txt
@@ -379,7 +379,7 @@ B_LAST_ITEM = FD 16
B_LAST_ABILITY = FD 17
B_ATK_ABILITY = FD 18
B_DEF_ABILITY = FD 19
-B_SCR_ACTIVE_ABILITY = FD 1A
+B_SCR_ABILITY = FD 1A
B_EFF_ABILITY = FD 1B
B_TRAINER1_CLASS = FD 1C
B_TRAINER1_NAME = FD 1D
@@ -424,8 +424,8 @@ B_TRAINER1_NAME_WITH_CLASS = FD 42
B_TRAINER2_NAME_WITH_CLASS = FD 43
B_PARTNER_NAME_WITH_CLASS = FD 44
B_ATK_TRAINER_NAME_WITH_CLASS = FD 45
-B_SCR_TEAM1 = FD 46
-B_SCR_TEAM2 = FD 47
+B_EFF_TEAM1 = FD 46
+B_EFF_TEAM2 = FD 47
@ indicates the end of a town/city name (before " TOWN" or " CITY")
NAME_END = FC 00
@@ -459,6 +459,13 @@ JPN = FC 15
ENG = FC 16
PAUSE_MUSIC = FC 17
RESUME_MUSIC = FC 18
+SPEAKER = FC 19
+
+@ Speaker names, the order must be matching with include/constants/speaker_names.h
+NAME_NONE = 00
+NAME_MOM = 01
+NAME_PLAYER = 02
+NAME_COUNT = 03
@ fonts
diff --git a/config.mk b/config.mk
new file mode 100644
index 000000000000..7360c158efe2
--- /dev/null
+++ b/config.mk
@@ -0,0 +1,2 @@
+# Enable LTO when making a release build. Disable by setting to 0.
+USE_LTO_ON_RELEASE ?= 1
diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s
index 50a9b51dc763..56236540488c 100644
--- a/data/battle_anim_scripts.s
+++ b/data/battle_anim_scripts.s
@@ -100,26 +100,16 @@ gBattleAnimMove_WakeUpSlap::
end
gBattleAnimMove_HammerArm::
- loadspritegfx ANIM_TAG_IMPACT
- loadspritegfx ANIM_TAG_ROCKS
- loadspritegfx ANIM_TAG_SLAM_HIT
- monbg ANIM_TARGET
- setalpha 12, 8
- playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER
- createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 3, 0, 4
- delay 1
- createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
- delay 3
- setarg 7, 0
- createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, ANIM_TARGET, 1
- playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
- createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4
- createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2
- createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 28, 2, 3
- createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 30, 4, 3
- createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 2, 0, 0, 5
- clearmonbg ANIM_TARGET
+ loadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST @punch
+ loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice
+ loadspritegfx ANIM_TAG_ECLIPSING_ORB @gray color
+ loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke
+ playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
+ createsprite gIceHammerPunchStompTemplate, ANIM_TARGET, 3, 0, -32, 15
+ delay 19
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_SquishTarget, 2
+ waitforvisualfinish
blendoff
end
@@ -181,7 +171,7 @@ gBattleAnimMove_Brine::
playsewithpan SE_M_DIVE, -64
waitforvisualfinish
delay 16
- createvisualtask AnimTask_WaterSpoutRain, 5
+ createvisualtask AnimTask_BrineRain, 5
playsewithpan SE_M_SURF, +63
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -200,7 +190,7 @@ gBattleAnimMove_NaturalGift::
createvisualtask AnimTask_DragonDanceWaver, 5
playsewithpan SE_M_TELEPORT, -64
delay 8
- createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, 19456, 14, 0, 3
+ createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 43
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 85
@@ -265,23 +255,23 @@ gBattleAnimMove_Tailwind::
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 4, 4
createvisualtask AnimTask_TraceMonBlended, 2, 0, 4, 7, 10
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 90, 2048, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 90, 2048, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 50, 2560, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 50, 2560, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 20, 2304, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 20, 2304, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 70, 1984, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 70, 1984, 96, 1
delay 12
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0, 2816, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0, 2816, 96, 1
delay 10
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1
waitforvisualfinish
stopsound
call UnsetHighSpeedBg
@@ -295,23 +285,23 @@ gBattleAnimGeneral_Tailwind::
playsewithpan SE_M_GUST, SOUND_PAN_ATTACKER
call SetHighSpeedBg
setalpha 12, 8
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 10, 2304, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 90, 2048, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 90, 2048, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 50, 2560, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 50, 2560, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 20, 2304, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 20, 2304, 96, 1
delay 12
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 70, 1984, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 70, 1984, 96, 1
delay 12
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0, 2816, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0, 2816, 96, 1
delay 10
- createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 0
+ createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 60, 2560, 96, 1
waitforvisualfinish
stopsound
call UnsetHighSpeedBg
@@ -322,6 +312,7 @@ gBattleAnimGeneral_Tailwind::
gBattleAnimMove_Acupressure::
loadspritegfx ANIM_TAG_ACUPRESSURE
loadspritegfx ANIM_TAG_SPARK_2
+ playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
createsprite gAcupressureSpriteTemplate, ANIM_ATTACKER, 40, 0, -40, 40
waitforvisualfinish
call ElectricityEffect
@@ -375,33 +366,82 @@ gBattleAnimMove_UTurn::
gBattleAnimMove_CloseCombat::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_HANDS_AND_FEET
+ monbg ANIM_DEF_PARTNER
call SetHighSpeedBg
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_COMET_PUNCH, +63
- delay 10
+ delay 2
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_VITAL_THROW2, +63
- delay 10
+ delay 2
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_MEGA_KICK2, +63
- delay 10
+ delay 2
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_COMET_PUNCH, +63
- delay 10
+ delay 2
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_VITAL_THROW2, +63
- delay 10
+ delay 2
createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
- createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 7, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
playsewithpan SE_M_MEGA_KICK2, +63
- delay 10
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_COMET_PUNCH, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_VITAL_THROW2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_MEGA_KICK2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_COMET_PUNCH, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_VITAL_THROW2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_MEGA_KICK2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_COMET_PUNCH, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_VITAL_THROW2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_MEGA_KICK2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_COMET_PUNCH, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_VITAL_THROW2, +63
+ delay 2
+ createsprite gFistFootRandomPosSpriteTemplate, ANIM_TARGET, 3, 1, 10, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 2, 0, 7, 1
+ playsewithpan SE_M_MEGA_KICK2, +63
+ delay 1
call UnsetHighSpeedBg
- clearmonbg ANIM_TARGET
+ clearmonbg ANIM_DEF_PARTNER
blendoff
delay 1
setarg 7, 0x1000
@@ -617,9 +657,9 @@ gBattleAnimMove_PowerTrick::
loopsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET 0xa 0x3
createvisualtask AnimTask_UproarDistortion 0x2, 0x0
createsprite gPowerTrickSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 0, SOUND_PAN_TARGET, 0
- delay 0x10
+ delay 16
createvisualtask AnimTask_UproarDistortion 0x2, 0x0
- delay 0x10
+ delay 16
createvisualtask AnimTask_UproarDistortion 0x2, 0x0
waitforvisualfinish
end
@@ -687,7 +727,7 @@ gBattleAnimMove_MeFirst::
loadspritegfx ANIM_TAG_ORBS
loadspritegfx ANIM_TAG_FINGER
loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 12, 12, 0x7FAF
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 12, 12, RGB(15, 29, 31)
setalpha 11, 5
monbg_static ANIM_DEF_PARTNER
splitbgprio_all
@@ -848,7 +888,7 @@ gBattleAnimMove_LastResort::
waitbgfadein
loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 2, 4, 2, RGB_WHITE, 10, 0, 0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
waitforvisualfinish
delay 10
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
@@ -930,6 +970,7 @@ gBattleAnimMove_HeartSwap::
loadspritegfx ANIM_TAG_RED_HEART
loadspritegfx ANIM_TAG_PINKVIO_ORB
loadspritegfx ANIM_TAG_SPARKLE_2
+ monbg ANIM_TARGET
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 8, RGB(31, 24, 26)
createvisualtask AnimTask_HeartSwap, 3, ANIM_TARGET
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_TARGET, RGB_WHITE, 12, 3, 1
@@ -962,7 +1003,6 @@ gBattleAnimMove_HeartSwap::
createsprite gRedHeartCharmSpriteTemplate, ANIM_ATTACKER, 3, 20, 20
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
waitforvisualfinish
- clearmonbg ANIM_ATTACKER
clearmonbg ANIM_TARGET
blendoff
end
@@ -1118,7 +1158,7 @@ gBattleAnimMove_FlareBlitz::
createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -224, -32, 40
createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40
playsewithpan SE_M_COMET_PUNCH, +63
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 0, RGB_BLACK
playsewithpan SE_M_COMET_PUNCH, +63
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 9
@@ -1179,7 +1219,7 @@ gBattleAnimMove_RockPolish::
setalpha 12, 8
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 3, 0, 12, RGB_BLACK
waitforvisualfinish
- loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 10, 7
+ loopsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER, 10, 7
createsprite gRockPolishStreakSpriteTemplate, ANIM_ATTACKER, 2, -10, 3
delay 1
createsprite gRockPolishStreakSpriteTemplate, ANIM_ATTACKER, 2, 24, -19
@@ -1217,7 +1257,7 @@ gBattleAnimMove_RockPolish::
createsprite gRockPolishStreakSpriteTemplate, ANIM_ATTACKER, 2, -21, -16
delay 2
waitforvisualfinish
- playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
createsprite gRockPolishSparkleSpriteTemplate, ANIM_ATTACKER, 2, -20, 9
createsprite gRockPolishSparkleSpriteTemplate, ANIM_ATTACKER, 2, -10, -15
createsprite gRockPolishSparkleSpriteTemplate, ANIM_ATTACKER, 2, 1, 17
@@ -1295,32 +1335,39 @@ gBattleAnimMove_PoisonJab::
end
gBattleAnimMove_DarkPulse::
- loadspritegfx ANIM_TAG_THIN_RING
+ loadspritegfx ANIM_TAG_PURPLE_RING
monbg ANIM_TARGET
fadetobg BG_DARK
waitbgfadein
- delay 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- createvisualtask AnimTask_SpiteTargetShadow, 2
loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
- delay 8
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1D09, 12
+ createvisualtask AnimTask_SwayMon, ANIM_TARGET, 0, 6, 0x0800, 8, ANIM_TARGET
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 4, 0, 12, RGB(30, 10, 13)
+ call DarkPulseParticle
+ call DarkPulseParticle
+ call DarkPulseParticle
waitforvisualfinish
+ blendoff
clearmonbg ANIM_TARGET
- delay 1
restorebg
waitbgfadein
end
+DarkPulseParticle:
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gDarkPulseSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ return
gBattleAnimMove_NightSlash::
loadspritegfx ANIM_TAG_SLASH
@@ -1381,7 +1428,7 @@ gBattleAnimMove_AquaTail::
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
createsprite gAquaTailKnockOffSpriteTemplate, ANIM_ATTACKER, 2, -16, -16
delay 8
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 5, 1, RGB_WHITE, 10, RGB_BLACK, 0
createsprite gAquaTailHitSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -12, 10, 0, 3
@@ -1469,7 +1516,7 @@ gBattleAnimMove_XScissor::
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_BLACK, 10, 0, 0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 1, RGB_BLACK, 10, RGB_BLACK, 0
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -1482,19 +1529,19 @@ gBattleAnimMove_BugBuzz::
monbg ANIM_DEF_PARTNER
call SetBugBg
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0
@@ -1546,7 +1593,7 @@ gBattleAnimMove_DragonRush::
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
createsprite gDragonRushSpriteTemplate, ANIM_ATTACKER, 3, -16, -16
delay 8
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 5, 1, RGB_WHITE, 10, 0, 0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 5, 1, RGB_WHITE, 10, RGB_BLACK, 0
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 1
waitforvisualfinish
@@ -1561,7 +1608,6 @@ gBattleAnimMove_DragonRush::
createsprite gRockFragmentSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -30, -18, 8, 2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1
waitforvisualfinish
- clearmonbg ANIM_DEF_PARTNER
blendoff
end
@@ -1628,7 +1674,7 @@ gBattleAnimMove_VacuumWave::
setalpha 12, 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, -8, ANIM_TARGET, 2
createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 8, 0, 8, 1, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0, 0x7FFF, 3
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 0, RGB_WHITE, 3
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
@@ -1683,7 +1729,7 @@ gBattleAnimMove_BraveBird::
loadspritegfx ANIM_TAG_BIRD
call SetSkyBg
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 0, 16, RGB_WHITE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 0, 16, RGB_WHITE
delay 4
createvisualtask AnimTask_AttackerFadeToInvisible, 5, 0
waitforvisualfinish
@@ -1695,7 +1741,7 @@ gBattleAnimMove_BraveBird::
delay 20
createvisualtask AnimTask_AttackerFadeFromInvisible, 5, 1
delay 2
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 2, 0, 15, 0, RGB_WHITE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 15, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_ATTACKER
call UnsetSkyBg
@@ -1706,7 +1752,11 @@ gBattleAnimMove_EarthPower::
loadspritegfx ANIM_TAG_FIRE_PLUME
createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50
playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET
- delay 40
+ delay 32
+ fadetobg BG_FISSURE
+ waitbgfadeout
+ createvisualtask AnimTask_PositionFissureBgOnBattler, 5, ANIM_TARGET, 5, -1
+ waitbgfadein
loopsewithpan 145, SOUND_PAN_TARGET 11, 3
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0
@@ -1727,6 +1777,10 @@ gBattleAnimMove_EarthPower::
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0, 0, 4
waitforvisualfinish
+ restorebg
+ waitbgfadeout
+ setarg 7, -1
+ waitbgfadein
end
gBattleAnimMove_Switcheroo::
@@ -1925,40 +1979,30 @@ SnowSlide1:
delay 2
return
+@Credits to Skeli
gBattleAnimMove_IceShard::
monbg ANIM_TARGET
splitbgprio ANIM_TARGET
setalpha 12, 8
loadspritegfx ANIM_TAG_ICE_CRYSTALS
- fadetobg BG_ICE
- waitbgfadein
- createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_BUBBLE_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 4, 4, 0, 10
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, -20, 70, 0, 42, 35
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, -20, 58, 0, 30, 35
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, -20, -12, 0, 22, 40
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, -20, 0, 0, 10, 40
- delay 5
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, -10, -30, 10, -12, 45
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, -10, -42, 10, -24, 45
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, -10, -20, 10, -36, 45
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, -10, -32, 10, -24, 45
- delay 5
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, 20, 22, 45
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0, -2, 20, 10, 45
- createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 20, -2, 30
- createsprite gIceBeamInnerCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0, 8, 20, 10, 30
+ loadspritegfx ANIM_TAG_IMPACT
+ createsprite gIceShardSpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
delay 1
+ createsprite gIceShardSpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gIceShardSpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gIceShardSpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gIceShardSpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 4
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_TARGET, -31, 0, 7, RGB(0, 20, 31)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1
- waitforvisualfinish
- delay 20
call IceCrystalEffectShort
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_TARGET, 5, 7, 0, RGB(0, 20, 31)
waitforvisualfinish
- restorebg
- waitbgfadein
- clearmonbg ANIM_TARGET
blendoff
+ clearmonbg ANIM_TARGET
end
gBattleAnimMove_ShadowClaw::
@@ -2028,7 +2072,7 @@ gBattleAnimMove_IceFang::
loadspritegfx ANIM_TAG_SHARP_TEETH
loadspritegfx ANIM_TAG_IMPACT
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 1, 0, 7, RGB_BLACK
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(12, 26, 31)
delay 20
playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET
createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0
@@ -2049,7 +2093,7 @@ gBattleAnimMove_IceFang::
delay 15
call IceCrystalEffectShort
delay 5
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 9, 0, RGB(12, 26, 31)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(12, 26, 31)
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 7, 0, RGB_BLACK
waitforvisualfinish
@@ -2064,7 +2108,7 @@ gBattleAnimMove_FireFang::
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB_RED
createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 0
createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 64
createsprite gFireSpiralInwardSpriteTemplate, ANIM_TARGET, 1, 128
@@ -2080,7 +2124,7 @@ gBattleAnimMove_FireFang::
delay 4
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 0, 9, 0, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 9, 0, RGB_RED
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -2094,7 +2138,7 @@ gBattleAnimMove_ShadowSneak::
loadspritegfx ANIM_TAG_POISON_BUBBLE @Poison
loadspritegfx ANIM_TAG_HANDS_AND_FEET
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x7, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 7, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
@@ -2102,9 +2146,9 @@ gBattleAnimMove_ShadowSneak::
waitforvisualfinish
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x30
- delay 0x30
+ delay 48
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 15, RGB_BLACK
createsprite gShadowSneakImpactSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
call ShadowSneakMovement
@@ -2116,13 +2160,13 @@ gBattleAnimMove_ShadowSneak::
call ShadowSneakMovement
waitforvisualfinish
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x7, 0x0, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 7, 0, RGB_BLACK
waitforvisualfinish
end
ShadowSneakMovement:
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
return
gBattleAnimMove_MudBomb::
@@ -2184,8 +2228,8 @@ gBattleAnimMove_PsychoCut::
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 9, 9, RGB_PURPLE
createvisualtask AnimTask_SwayMon, ANIM_ATTACKER, 0, 6, 2048, 2, ANIM_ATTACKER
createsprite gPsychoCutSpiralSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0
- createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 0, 4, RGB_BLACK
- createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 0, 10, RGB(20, 12, 23)
+ createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_BG, 2, 0, 4, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_ATTACKER, 2, 0, 10, RGB(20, 12, 23)
delay 30
clearmonbg ANIM_ATK_PARTNER
waitforvisualfinish
@@ -2197,8 +2241,8 @@ gBattleAnimMove_PsychoCut::
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20
- createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 4, 0, RGB_BLACK
- createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 10, 0, RGB(20, 12, 23)
+ createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_BG, 2, 4, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 1, F_PAL_ATTACKER, 2, 10, 0, RGB(20, 12, 23)
clearmonbg ANIM_TARGET
blendoff
waitforvisualfinish
@@ -2245,28 +2289,27 @@ gBattleAnimMove_MirrorShot::
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 10, RGB_WHITEALPHA
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(21, 21, 21)
waitforvisualfinish
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
delay 3
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 10, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
waitforvisualfinish
- clearmonbg ANIM_ATTACKER
blendoff
end
@@ -2301,7 +2344,7 @@ gBattleAnimMove_FlashCannon::
waitforvisualfinish
playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_Flash, 2
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 16, 0, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 16, 0, RGB_RED
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -2349,12 +2392,12 @@ gBattleAnimMove_Defog::
playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER
createsprite gLusterPurgeCircleSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0
delay 20
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, -1
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT, 2, 0, 16, -1
waitforvisualfinish
waitforvisualfinish
delay 16
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, -1
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
waitforvisualfinish
clearmonbg ANIM_ATTACKER
blendoff
@@ -2366,7 +2409,7 @@ gBattleAnimGeneral_TrickRoom::
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
fadetobg BG_TRICK_ROOM
waitbgfadein
- delay 0x40
+ delay 64
restorebg
waitbgfadein
blendoff
@@ -2700,62 +2743,69 @@ gBattleAnimMove_LeafStorm::
end
gBattleAnimMove_PowerWhip::
- loadspritegfx ANIM_TAG_WHIP_HIT
+ loadspritegfx ANIM_TAG_PUNISHMENT_BLADES
+ loadspritegfx ANIM_TAG_LEAF @green color
+ loadspritegfx ANIM_TAG_IMPACT
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 10
delay 6
playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
- createsprite gVineWhipSpriteTemplate, ANIM_TARGET, 2, 0, 0
- delay 6
- call SetImpactBackground
- createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+ createsprite gSpinningVineSpriteTemplate, ANIM_ATTACKER, 2, -42, -25, 0, 0, 25
+ createvisualtask AnimTask_IsTargetPlayerSide, 2
+ jumpretfalse PowerWhipOnOpponent
+ goto PowerWhipOnPlayer
+PowerWhipOnOpponent:
+ fadetobg BG_IMPACT_OPPONENT
+ goto PowerWhipContinue
+PowerWhipOnPlayer:
+ fadetobg BG_IMPACT_PLAYER
+ goto PowerWhipContinue
+PowerWhipContinue:
+ waitbgfadeout
+ delay 5
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
+ playsewithpan SE_BANG, SOUND_PAN_TARGET
+ waitforvisualfinish
+ delay 20
restorebg
waitbgfadein
+ waitforvisualfinish
end
gBattleAnimMove_RockWrecker::
- jumpargeq 7, 1, RockWrecker_1
- fadetobg BG_ROCK_WRECKER
- waitbgfadeout
- createvisualtask AnimTask_StartSlidingBg, 5, -1024, 0, 1, -1
- goto RockWrecker_2
-RockWrecker_1:
- fadetobg BG_ROCK_WRECKER
- waitbgfadeout
- createvisualtask AnimTask_StartSlidingBg, 5, -1024, 0, 0, -1
loadspritegfx ANIM_TAG_ROCKS
+ loadspritegfx ANIM_TAG_REALLY_BIG_ROCK
+ loadspritegfx ANIM_TAG_EXPLOSION
loadspritegfx ANIM_TAG_IMPACT
- createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
- delay 3
+ fadetobg BG_ROCK_WRECKER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0xF000, 0, 0, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
+ call ContinentalCrushStockpileRocks
+ createsprite gContinentalCrushGrowingRockSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
+ call ContinentalCrushStockpileRocks
+ delay 10
+ loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER, 10, 3
+ waitforvisualfinish
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- createsprite gRockBlastRockSpriteTemplate, ANIM_ATTACKER, 130, 16, 0, 0, 0, 25, (1 << 8) | 1
+ createsprite gReallyBigRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257
waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 131, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, 0, 0, 20, 24, 14, 2
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 8, 0, 40, 1
createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, 5, 0, -20, 24, 14, 1
createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, 0, 5, 20, -18, 14, 2
createsprite gRockFragmentSpriteTemplate, ANIM_TARGET, 130, -5, 0, -20, -18, 14, 2
+ call OpposingExplosion2
waitforvisualfinish
- call UnsetPsychicBg
- end
-RockWrecker_2:
- loadspritegfx ANIM_TAG_ROCKS
- loadspritegfx ANIM_TAG_IMPACT
- createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
- delay 3
- playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- createsprite gRockBlastRockSpriteTemplate, ANIM_ATTACKER, 2, 16, 0, 0, 0, 25, 257
- waitforvisualfinish
- createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
- playsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET
- createsprite gRockFragmentSpriteTemplate ANIM_TARGET, 2, 0, 0, 20, 24, 14, 2
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
- createsprite gRockFragmentSpriteTemplate ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1
- createsprite gRockFragmentSpriteTemplate ANIM_ATTACKER, 2, 0, 5, 20, -18, 14, 2
- createsprite gRockFragmentSpriteTemplate ANIM_ATTACKER, 2, -5, 0, -20, -18, 14, 2
waitforvisualfinish
+ blendoff
call UnsetPsychicBg
end
@@ -2765,7 +2815,7 @@ gBattleAnimMove_CrossPoison::
monbg ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 31, 3, 1, RGB_WHITE, 10, 0, 10
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 1, RGB_WHITE, 10, RGB_BLACK, 10
createsprite gCrossImpactSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 20
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
waitforvisualfinish
@@ -2964,10 +3014,10 @@ gBattleAnimMove_StoneEdge::
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
delay 4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
@@ -3029,19 +3079,19 @@ gBattleAnimMove_Chatter::
loadspritegfx ANIM_TAG_MUSIC_NOTES
monbg ANIM_DEF_PARTNER
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1f, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 0x1d, -12, 0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, 0xffe3, 1
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1f, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, 0xffe3, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 0xffe3, -12, 0
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 0x1f, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 0x18, 0xffe8, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 0xffe8, 0xffe8, 0
@@ -3070,10 +3120,10 @@ gBattleAnimMove_Judgment::
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_ORBS
loadspritegfx ANIM_TAG_ELECTRICITY
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUST, 0, 14, 14, 0
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HANDS_AND_FEET, 0, 10, 10, 0
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUST, 0, 14, 14, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HANDS_AND_FEET, 0, 10, 10, RGB_BLACK
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 15, 32767
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB_WHITE
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 83, 1
createsprite gJudgmentBlackChargeTemplate, ANIM_TARGET, 1, 1, ANIM_TARGET
@@ -3091,7 +3141,7 @@ gBattleAnimMove_Judgment::
call JudgmentInwardSpikes2
delay 5
call JudgmentInwardSpikes2
- delay 0x2F
+ delay 47
call JudgmentOutwardSpikes
delay 5
call JudgmentOutwardSpikes2
@@ -3112,7 +3162,7 @@ gBattleAnimMove_Judgment::
delay 5
call JudgmentOutwardSpikes2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 15, 0, 32767
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 15, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_TARGET
end
@@ -3286,16 +3336,11 @@ gBattleAnimMove_AquaJet::
loadspritegfx ANIM_TAG_ROUND_SHADOW
loadspritegfx ANIM_TAG_SPLASH
loadspritegfx ANIM_TAG_SWEAT_BEAD
- playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
- createsprite gDiveBallSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
+ createvisualtask AnimTask_AttackerStretchAndDisappear, 2
+ playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
waitforvisualfinish
- playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER
- createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0
- call DiveSetUpWaterDroplets
- call DiveSetUpWaterDroplets
- call DiveSetUpWaterDroplets
- call DiveSetUpWaterDroplets
- call DiveSetUpWaterDroplets
+ delay 1
+ createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 2
loadspritegfx ANIM_TAG_WATER_IMPACT
loadspritegfx ANIM_TAG_SMALL_BUBBLES
monbg ANIM_DEF_PARTNER
@@ -3310,9 +3355,13 @@ gBattleAnimMove_AquaJet::
delay 12
call RisingWaterHitEffect
waitforvisualfinish
+ createvisualtask AnimTask_ExtremeSpeedMonReappear, 2
+ setarg 0x7, 0x1000
+ waitforvisualfinish
visible ANIM_ATTACKER
clearmonbg ANIM_DEF_PARTNER
blendoff
+ setarg 7, 0x1000
end
gBattleAnimMove_AttackOrder::
@@ -3348,10 +3397,10 @@ gBattleAnimMove_AttackOrder::
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
delay 4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
@@ -3487,8 +3536,8 @@ gBattleAnimMove_RoarOfTime::
loadspritegfx ANIM_TAG_ORBS
loadspritegfx ANIM_TAG_EXPLOSION
loadspritegfx ANIM_TAG_WATER_GUN
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 16, 0
- delay 0x20
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
+ delay 32
monbg ANIM_ATK_PARTNER
setalpha 0xc, 0x8
loopsewithpan 133, SOUND_PAN_ATTACKER 13 3
@@ -3496,11 +3545,11 @@ gBattleAnimMove_RoarOfTime::
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
blendoff
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 16, 0, 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_BLACK
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 16, -1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_WHITEALPHA
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
- delay 0x20
+ delay 32
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
playsewithpan 170, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
@@ -3520,7 +3569,7 @@ gBattleAnimMove_RoarOfTime::
playsewithpan 170, SOUND_PAN_TARGET
createsprite gRoarOfTimeBombTemplate, ANIM_ATTACKER, 3, 0xffe8, 0x18, 1, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 16, 0, -1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_WHITEALPHA
waitforvisualfinish
end
@@ -3529,7 +3578,7 @@ gBattleAnimMove_SpacialRend::
loadspritegfx ANIM_TAG_PINK_HEART_2 @ANIM_TAG_BERRY_EATEN
monbg ANIM_ATK_PARTNER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 16, 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
loopsewithpan 133, SOUND_PAN_ATTACKER 13 2
createsprite gSpacialRendBladesTemplate, ANIM_ATTACKER, 3, 0, 0, 0x38, 0
delay 2
@@ -3553,7 +3602,7 @@ gBattleAnimMove_SpacialRend::
waitforvisualfinish
restorebg
waitbgfadein
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 0, 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_BLACK
clearmonbg ANIM_ATK_PARTNER
blendoff
end
@@ -3684,7 +3733,7 @@ gBattleAnimMove_SeedFlare::
loadspritegfx ANIM_TAG_FLYING_DIRT @heat wave animation
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 0, 12, 32767
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_WHITE
waitforvisualfinish
playsewithpan 133, SOUND_PAN_ATTACKER
createsprite gSeedFlareGreenCirclesTemplate, ANIM_ATTACKER, 2, 0x28, 0x28, 16
@@ -3755,7 +3804,7 @@ gBattleAnimMove_SeedFlare::
delay 10
createsprite gSeedFlareGreenWavesTemplate, ANIM_ATTACKER, 0x28, 0x3c, 0xa00, 0x60, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 1, 12, 0, 32767
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_ATTACKER
blendoff
@@ -3769,7 +3818,7 @@ gBattleAnimMove_OminousWind::
monbg ANIM_DEF_PARTNER
@bankBG_over_partnerBG
delay 0
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 1, 0, 0, 0, 0
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_TARGET, 0, 0, 0, RGB_BLACK
delay 0
createvisualtask AnimTask_GetAttackerSide, 2
jumpargeq 7, 1, OminousWindFadeToBg
@@ -3784,7 +3833,7 @@ OminousWindFadeToBg:
goto OminousWindHit
OminousWindHit:
delay 0
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 4, 4, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 4, 4, RGB_BLACK
waitbgfadein
createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -32, 16, 0, 6, 2, 3, 1
createsprite gSilverWindBigSparkSpriteTemplate, ANIM_TARGET, 66, -8, 18, 64, 3, 2, 2, 1
@@ -3815,7 +3864,7 @@ OminousWindHit:
delay 0
restorebg
waitbgfadeout
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 1, 0, 4, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_TARGET, 0, 4, 0, RGB_BLACK
setarg 7, -1
waitbgfadein
end
@@ -3937,7 +3986,7 @@ gBattleAnimMove_WideGuard::
createsprite gWideGuardBlueConversionTemplate, ANIM_ATTACKER, 0x2, 0x8, 0x18
delay 3
createsprite gWideGuardBlueConversionTemplate, ANIM_ATTACKER, 0x2, 0x18, 0x18
- delay 0x14
+ delay 20
playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
createvisualtask AnimTask_ConversionAlphaBlend, 5
waitforvisualfinish
@@ -3947,7 +3996,7 @@ gBattleAnimMove_WideGuard::
gBattleAnimMove_GuardSplit::
loadspritegfx ANIM_TAG_BLUEGREEN_ORB
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
loopsewithpan SE_M_LOCK_ON, SOUND_PAN_ATTACKER, 0x18, 0x3
call GuardSplitLaunch
call GuardSplitLaunch
@@ -3960,19 +4009,19 @@ gBattleAnimMove_GuardSplit::
call GuardSplitLaunch
call GuardSplitLaunch
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
end
GuardSplitLaunch:
createsprite gGuardSwapOrbs1Template, ANIM_TARGET, 2, 0xfff4, 0x0
createsprite gGuardSwapOrbs2Template, ANIM_TARGET, 0, 0x0, 0x0, 0x0, 0x0, 0x1E, 0x0
- delay 0x5
+ delay 5
return
gBattleAnimMove_PowerSplit::
loadspritegfx ANIM_TAG_RED_HEART
loadspritegfx ANIM_TAG_BLUEGREEN_ORB
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
loopsewithpan SE_M_LOCK_ON, SOUND_PAN_ATTACKER, 0x18, 0x3
call PowerSplitLaunch
call PowerSplitLaunch
@@ -3985,7 +4034,7 @@ gBattleAnimMove_PowerSplit::
call PowerSplitLaunch
call PowerSplitLaunch
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
end
PowerSplitLaunch:
@@ -4000,7 +4049,7 @@ gBattleAnimGeneral_WonderRoom::
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
fadetobg BG_WONDER_ROOM
waitbgfadein
- delay 0x40
+ delay 64
restorebg
waitbgfadein
blendoff
@@ -4120,16 +4169,16 @@ gBattleAnimMove_Autotomize::
playsewithpan SE_ELEVATOR, SOUND_PAN_ATTACKER
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x0
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x1
- delay 0xc
+ delay 12
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x2
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x3
- delay 0xc
+ delay 12
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x0
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x1
- delay 0xc
+ delay 12
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x2
createsprite gAutotomizeMetalShardsTemplate, ANIM_ATTACKER, 0x2, 0x0, 0x3
- delay 0x18
+ delay 24
waitforvisualfinish
stopsound
clearmonbg ANIM_ATK_PARTNER
@@ -4151,28 +4200,28 @@ gBattleAnimMove_RagePowder::
end
RagePowderSprinkle:
createsprite gRagePowderRedPowderTemplate, ANIM_ATTACKER, 0x2, 0x0, 0xffec, 0x55, 0x50, 0x0
- delay 0xc
+ delay 12
createsprite gRagePowderRedPowderTemplate, ANIM_ATTACKER, 0x2, 0x0, 0xfff6, 0xaa, 0x50, 0x0
- delay 0xc
+ delay 12
createsprite gRagePowderRedPowderTemplate, ANIM_ATTACKER, 0x2, 0x0, 0xfff1, 0x0, 0x50, 0x0
- delay 0xc
+ delay 12
return
gBattleAnimMove_Telekinesis::
loadspritegfx ANIM_TAG_SPARKLE_4 @detect
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0x0, 0x9, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 9, RGB_BLACK
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0x1, 0x0, 0x9, 0x7fff
- delay 0x12
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB_WHITE
+ delay 18
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 0xd, 0x14, 0xffec
waitforvisualfinish
loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 0xa, 0x3
createvisualtask AnimTask_SwayMon, 5, 1, 24, 208, 1, ANIM_TARGET
waitforvisualfinish
- delay 0xA
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0x9, 0x0, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x7fff
+ delay 10
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 9, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_WHITE
waitforvisualfinish
end
@@ -4182,7 +4231,7 @@ gBattleAnimGeneral_MagicRoom::
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET
fadetobg BG_MAGIC_ROOM
waitbgfadein
- delay 0x40
+ delay 64
restorebg
waitbgfadein
blendoff
@@ -4325,20 +4374,20 @@ gBattleAnimMove_Synchronoise::
loadspritegfx ANIM_TAG_AIR_WAVE_2 @aero particles
monbg ANIM_DEF_PARTNER
splitbgprio_foes ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0x0, 0xC, 0x0 @Darken
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK @Darken
waitforvisualfinish
panse SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createsprite gSynchronoiseVioletRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0x1
+ delay 1
createsprite gSynchronoiseBlueRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0x1
+ delay 1
createsprite gSynchronoiseYellowRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0x25
+ delay 37
panse SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createsprite gSynchronoiseBlueRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0x1
+ delay 1
createsprite gSynchronoiseVioletRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0x1
+ delay 1
createsprite gSynchronoiseYellowRingTemplate, ANIM_ATTACKER, 0x0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
waitforvisualfinish
loopsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET, 0x3, 0x5
@@ -4350,7 +4399,7 @@ gBattleAnimMove_Synchronoise::
createsprite gSynchronoiseAeroWheelTemplate, ANIM_TARGET, 1, 0x0, 0xffef, 0xff20, 0xffe0, 0x28
createsprite gSynchronoiseAeroWheelTemplate, ANIM_TARGET, 1, 0x0, 0xffef, 0x70, 0xff80, 0x28
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x1, 0xC, 0x0, 0x0 @Darken
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK @Darken
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -4363,13 +4412,13 @@ gBattleAnimMove_ElectroBall::
setalpha 12, 8
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gGrowingChargeOrb2SpriteTemplate, ANIM_ATTACKER, 2, 0
- delay 0x19
+ delay 25
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x14
+ delay 20
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xF
+ delay 15
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
loopsewithpan SE_M_CHARGE, 0xC, 0x6, 0x5
waitforvisualfinish
createsprite gElectroBallCannonBallTemplate, ANIM_TARGET, 2, 16, 16, 8
@@ -4424,24 +4473,24 @@ gBattleAnimMove_FlameCharge::
loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 0x20, 0x6
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
call FlameChargeSwirl
- delay 0x9
+ delay 9
call FlameChargeSwirl
- delay 0x9
+ delay 9
call FlameChargeSwirl
- delay 0x9
+ delay 9
call FlameChargeSwirl
- delay 0x9
+ delay 9
call FlameChargeSwirl
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 5
- delay 0x3
+ delay 3
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1
call FireSpreadEffect
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x8
+ delay 8
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x7
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -4454,14 +4503,14 @@ gBattleAnimMove_Coil::
loadspritegfx ANIM_TAG_TENDRILS
loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x4
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x10, 0x0, 0x2
- delay 0x7
+ delay 7
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x0, 0x2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x8, 0x1, 0x2
- delay 0x7
+ delay 7
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xfff8, 0x1, 0x2
- delay 0x8
+ delay 8
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x14
+ delay 20
createvisualtask AnimTask_ShakeMon2, 131, ANIM_TARGET, 4, 0, 5, 1
createvisualtask AnimTask_StretchTargetUp, 0x3
playsewithpan SE_M_BIND, SOUND_PAN_TARGET
@@ -4515,15 +4564,15 @@ gBattleAnimMove_FoulPlay::
monbg ANIM_TARGET
setalpha 12, 8
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4
- delay 0x6
+ delay 6
createsprite gFoulPlayImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 10, 0, RGB_BLACK
createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
- delay 0x8
+ delay 8
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0xa, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 10, 0, RGB_BLACK
createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -4537,12 +4586,12 @@ gBattleAnimMove_SimpleBeam::
loadspritegfx ANIM_TAG_THIN_RING @ring
setalpha 8, 8
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_BUBBLE_BEAM, SOUND_PAN_ATTACKER
call SimpleBeamsRegular
call SimpleBeamsRegular
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB_WHITE
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 4, ANIM_TARGET
call SimpleBeamWithRings
call SimpleBeamWithRings
@@ -4550,42 +4599,42 @@ gBattleAnimMove_SimpleBeam::
call SimpleBeamWithRings
call SimpleBeamWithRings
createsprite gSimpleBeamBrownRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1F, 0x8
- delay 0x2
+ delay 2
createsprite gSimpleBeamPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1F, 0x8
- delay 0x2
+ delay 2
stopsound
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x7FFF
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB_WHITE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
end
SimpleBeamsRegular:
createsprite gSimpleBeamBrownTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0xd, 0x0
- delay 0x2
+ delay 2
createsprite gSimpleBeamPinkTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0xd, 0x0
- delay 0x2
+ delay 2
return
SimpleBeamWithRings:
createsprite gSimpleBeamBrownTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0xd, 0x0
createsprite gSimpleBeamBrownRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1F, 0x8
- delay 0x2
+ delay 2
createsprite gSimpleBeamPinkTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0xd, 0x0
createsprite gSimpleBeamPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1F, 0x8
- delay 0x2
+ delay 2
return
gBattleAnimMove_Entrainment::
createvisualtask AnimTask_TeeterDanceMovement, 5
playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
playsewithpan SE_M_TEETER_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 31, 1
waitforvisualfinish
@@ -4595,11 +4644,11 @@ gBattleAnimMove_AfterYou::
loadspritegfx ANIM_TAG_ANGER @rage
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @green color
createvisualtask AnimTask_SwayMon, 5, 1, 15, 1536, 2, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gAfterYouGreenRageTemplate, ANIM_ATTACKER, 2, 0x0, 0xffec, 0xffe0
createsprite gAfterYouGreenRageTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xffe5
playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
- delay 0x14
+ delay 20
createsprite gAfterYouGreenRageTemplate, ANIM_ATTACKER, 2, 0x0, 0x14, 0xffe0
createsprite gAfterYouGreenRageTemplate, ANIM_ATTACKER, 2, 0x0, 0x23, 0xffe5
playsewithpan SE_M_SWAGGER2, SOUND_PAN_ATTACKER
@@ -4639,29 +4688,29 @@ gBattleAnimMove_EchoedVoice::
call MetalSoundPlayNote
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
- delay 0x0
+ delay 0
waitforvisualfinish
end
MetalSoundPlayNote:
panse SE_M_UPROAR, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 2, 0
createsprite gMetalSoundSpriteTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0x1e, 0x0
- delay 0x2
+ delay 2
return
gBattleAnimMove_ChipAway::
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB_WHITE
waitforvisualfinish
monbg ANIM_ATK_PARTNER
setalpha 12, 8
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
- delay 0x4
+ delay 4
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_VITAL_THROW2 SOUND_PAN_TARGET
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_WHITE
waitforvisualfinish
blendoff
end
@@ -4729,16 +4778,16 @@ gBattleAnimMove_QuickGuard::
loadspritegfx ANIM_TAG_SPARKLE_4 @sparkles
setalpha 12, 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 10, RGB_WHITE
- delay 0x10
+ delay 16
monbg ANIM_ATTACKER
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xE, 0x0, 0x8, 0x0, 0x0
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xfff2, 0x0, 0x8, 0x0, 0x0
- delay 0x1
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xE, 0x0, 0x8, 0x0, 0x0
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xfff2, 0x0, 0x8, 0x0, 0x0
- delay 0x1
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xE, 0x0, 0x8, 0x0, 0x0
- createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 0xfff2, 0x0, 0x8, 0x0, 0x0
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 14, 0, 8, ANIM_ATTACKER, 0
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, -14, 0, 8, ANIM_ATTACKER, 0
+ delay 1
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 14, 0, 8, ANIM_ATTACKER, 0
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, -14, 0, 8, ANIM_ATTACKER, 0
+ delay 1
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, 14, 0, 8, ANIM_ATTACKER, 0
+ createsprite gQuickGuardArmImpactTemplate, ANIM_TARGET, 3, -14, 0, 8, ANIM_ATTACKER, 0
waitforvisualfinish
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gSpinningSparkleSpriteTemplate, ANIM_ATTACKER, 13, 0x0, 0xffe3 @up
@@ -4814,24 +4863,25 @@ gBattleAnimMove_ShellSmash::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_ROCKS
loadspritegfx ANIM_TAG_HANDS_AND_FEET
- playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- createsprite gShellSmashRightShellSpriteTemplate, ANIM_ATTACKER, 2, 0xffd7, 0x0, 0x2, 0x333, 0x0, 10, 30
- createsprite gShellSmashLeftShellSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0x0, 0x6, 0xfccd, 0x0, 10, 30
+ playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
+ createsprite gShellSmashRightShellSpriteTemplate, ANIM_ATTACKER, 2, -41, 0, 2, 819, 0, 10, 30
+ createsprite gShellSmashLeftShellSpriteTemplate, ANIM_ATTACKER, 2, 32, 0, 6, -819, 0, 10, 30
delay 10
- createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
- createsprite gFistFootSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x8, 0x1, 0x0
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ invisible ANIM_ATTACKER
+ playsewithpan SE_M_STRENGTH, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
waitforvisualfinish
- playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x18, 0xe, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x5, 0x0, 0xffec, 0x18, 0xe, 0x1
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x5, 0x14, 0xffe8, 0xe, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0xfffb, 0x0, 0xffec, 0xffe8, 0xe, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0x1e, 0x12, 0x8, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0xffee, 0x8, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xffe2, 0x12, 0x8, 0x2
- createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xffe2, 0xffee, 0x8, 0x2
+ playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_ATTACKER
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
+ visible ANIM_ATTACKER
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 24, 14, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 5, 0, -20, 24, 14, 1
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, 5, 20, -24, 14, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, -5, 0, -20, -24, 14, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 30, 18, 8, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 30, -18, 8, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -30, 18, 8, 2
+ createsprite gShellSmashPurpleRocksSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -30, -18, 8, 2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 7, 1
waitforvisualfinish
end
@@ -4841,22 +4891,22 @@ gBattleAnimMove_HealPulse::
loadspritegfx ANIM_TAG_BLUE_STAR
loadspritegfx ANIM_TAG_THIN_RING
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 13293, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB(13, 31, 12), 8
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -16, 32, -3, 1
delay 3
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 16, 32, -3, -1
delay 3
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 13293, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB(13, 31, 12), 8
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 32, 32, -3, 1
delay 3
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -32, 32, -3, 1
delay 3
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 13293, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB(13, 31, 12), 8
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 0, 32, -3, 1
delay 3
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1
delay 3
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 13293, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB(13, 31, 12), 8
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, -8, 32, -3, 1
delay 3
createsprite gPresentHealParticleSpriteTemplate, ANIM_TARGET, 4, 24, 32, -3, 1
@@ -4870,7 +4920,7 @@ gBattleAnimMove_HealPulse::
gBattleAnimMove_Hex::
loadspritegfx ANIM_TAG_PURPLE_FLAME
loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x10, 0x4C4A @;Deep purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 16, RGB(10, 2, 19) @;Deep purple
waitforvisualfinish
monbg ANIM_TARGET
splitbgprio_all
@@ -4879,12 +4929,12 @@ gBattleAnimMove_Hex::
createvisualtask AnimTask_PurpleFlamesOnTarget, 0x3
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 2, 0, 37, 1
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
- delay 0x20
+ delay 32
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 12, RGB(10, 2, 19) @;Deep purple
createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 4
waitforvisualfinish
clearmonbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x10, 0x0, 0x4C4A @;Deep purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 16, 0, RGB(10, 2, 19) @;Deep purple
waitforvisualfinish
end
@@ -4898,7 +4948,7 @@ SkyDropSetup:
loadspritegfx ANIM_TAG_SMALL_BUBBLES @mist ball
loadspritegfx ANIM_TAG_WHITE_FEATHER
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
- delay 0x0
+ delay 0
playsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER
createsprite gSkyDropFlyBallTemplate, ANIM_TARGET, 0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0x0
waitforvisualfinish
@@ -4912,7 +4962,7 @@ SkyDropUnleash:
setalpha 12, 8
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
- delay 0x7
+ delay 7
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
@@ -4941,17 +4991,17 @@ gBattleAnimMove_CircleThrow::
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 4, 1, 2
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 0, 0, 4
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
createsprite gCircleThrowRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
- delay 0x1
+ delay 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -24, 0, 0, 4
createsprite gCircleThrowRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
waitforvisualfinish
- delay 0x3
+ delay 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x7
- delay 0xb
+ delay 11
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0xa
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
@@ -5005,7 +5055,7 @@ gBattleAnimMove_Quash::
setalpha 12, 8
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createsprite gQuashArmHitTemplate, ANIM_TARGET, 3, 0x0, 0xffe0, 0xf
- delay 0x13
+ delay 19
playsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_SquishTarget, 0x2
waitforvisualfinish
@@ -5099,29 +5149,29 @@ gBattleAnimMove_ReflectType::
setalpha 8, 8
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
createsprite gReflectTypeBlueStringTemplate, ANIM_TARGET, 2, 0x0, 0xa
- delay 0x4
+ delay 4
createsprite gReflectTypeVioletStringTemplate, ANIM_TARGET, 2, 0x0, 0xfffe
- delay 0x4
+ delay 4
createsprite gReflectTypeWhiteStringTemplate, ANIM_TARGET, 2, 0x0, 0x16
waitforvisualfinish
clearmonbg ANIM_TARGET
- delay 0x1F
+ delay 31
monbg ANIM_ATTACKER
playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
createsprite gReflectTypeWhiteRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypePinkRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypeVioletRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypeBlueRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypeWhiteRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypePinkRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypeVioletRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gReflectTypeBlueRingTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
clearmonbg ANIM_ATTACKER
@@ -5133,17 +5183,17 @@ gBattleAnimMove_Retaliate::
monbg ANIM_DEF_PARTNER
setalpha 9, 8
createvisualtask AnimTask_AttackerPunchWithTrace, 0x2, 0x7128, 0xa
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0x0
createsprite gGuillotineSpriteTemplate, ANIM_ATTACKER, 2, 0x1
- delay 0x38
+ delay 56
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x10, 0x43D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 16, RGB(29, 1, 1)
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x043D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB(29, 1, 1)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -5153,26 +5203,26 @@ gBattleAnimMove_FinalGambit::
loadspritegfx ANIM_TAG_PINK_CLOUD @yawn animation
loadspritegfx ANIM_TAG_WATER_IMPACT @blue colour
loadspritegfx ANIM_TAG_EXPLOSION @explosion animation
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0 @Darken
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK @Darken
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 8, RGB_WHITE
waitforvisualfinish
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_ATTACKER
createsprite gFinalGambitBlueYawnTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x25
- delay 0x4
+ delay 4
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
waitforvisualfinish
monbg ANIM_TARGET
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gFinalGambitExplosionTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
end
@@ -5191,14 +5241,14 @@ gBattleAnimMove_Inferno::
call SetImpactBackground
loopsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET, 40, 4
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 94, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 9, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 9, RGB_RED
call InfernoAnim
call InfernoAnim
call InfernoAnim
call InfernoAnim
call InfernoAnim
call InfernoAnim
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 9, 0, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 9, 0, RGB_RED
restorebg
waitbgfadein
waitforvisualfinish
@@ -5596,7 +5646,7 @@ gBattleAnimMove_StruggleBug::
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, 0x0a1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB(31, 16, 2)
waitforvisualfinish
createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
createsprite gMovementWavesSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 2
@@ -5607,7 +5657,7 @@ gBattleAnimMove_StruggleBug::
createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 2, FALSE, 1, 0x1e, 1, 0
createvisualtask AnimTask_ShakeTargetPartnerBasedOnMovePowerOrDmg, 2, FALSE, 1, 0x1e, 1, 0
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, 0x0a1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB(31, 16, 2)
delay 5
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 1
delay 5
@@ -5619,7 +5669,7 @@ gBattleAnimMove_StruggleBug::
gBattleAnimMove_Bulldoze::
createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 3
- delay 0x8
+ delay 8
goto gBattleAnimMove_Earthquake
gBattleAnimMove_FrostBreath::
@@ -5641,19 +5691,19 @@ gBattleAnimMove_FrostBreath::
loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 0xb, 0x3
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 66, 0x1, 0x5, 0x0
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 66, 0x1, 0xfff6, 0xfff1
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x19
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 66, 0x1, 0xf, 0x5
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 66, 0x1, 0xffe7, 0x0
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 2, 0x1, 0x1e, 0x1e
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 2, 0x1, 0xffe5, 0x19
- delay 0x1
+ delay 1
createsprite gFrostBreathBlueRageTemplate, ANIM_TARGET, 66, 0x1, 0x0, 0x8
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0x0, 0x0, 0x4
@@ -5666,23 +5716,23 @@ gBattleAnimMove_DragonTail::
loadspritegfx ANIM_TAG_SLAM_HIT
loadspritegfx ANIM_TAG_IMPACT
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_SLAM_HIT, 0x2, 0xD, 0xD, 0x5CAE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SLAM_HIT, 2, 13, 13, RGB(14, 5, 23)
waitforvisualfinish
setalpha 12, 8
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 3, 0, 4
- delay 0x1
- createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
- delay 0x3
+ delay 1
+ createsprite gSlamHitSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
+ delay 3
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -12, 10, 0, 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
call TailWhackDown
- delay 0x3
+ delay 3
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 0, 3, 6, 1
waitforvisualfinish
- delay 0x5
+ delay 5
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x6
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -5761,7 +5811,7 @@ gBattleAnimMove_WildCharge::
setalpha 12, 8
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2 @electric circle
- delay 0x1e
+ delay 30
waitforvisualfinish
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 0x1c, 0x2
call ScreenFlash
@@ -5771,9 +5821,9 @@ gBattleAnimMove_WildCharge::
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 0x6, 0x1, 0x0
waitforvisualfinish
- delay 0xb
+ delay 11
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 26, 0, 0, 5
- delay 0x6
+ delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 16, 1
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
@@ -5785,7 +5835,7 @@ gBattleAnimMove_WildCharge::
blendoff
end
ScreenFlash:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB(30, 31, 1)
return
gBattleAnimMove_DrillRun::
@@ -5798,7 +5848,7 @@ gBattleAnimMove_DrillRun::
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x2
+ delay 2
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x1
createsprite gHornHitSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0xc
waitforvisualfinish
@@ -5807,37 +5857,37 @@ gBattleAnimMove_DrillRun::
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 40, 1
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x2, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0xfffc, 0x3, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0xfff8, 0xfffb, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x4, 0xfff4, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x0, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x5, 0x12, 0x1, 0x3
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0xffef, 0xc, 0x1, 0x2
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0xffeb, 0xfff1, 0x1, 0x2
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x8, 0xffe5, 0x1, 0x2
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x20, 0x0, 0x1, 0x2
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x2
waitforvisualfinish
call UnsetPsychicBg
@@ -5852,10 +5902,10 @@ gBattleAnimMove_DualChop::
setalpha 12, 8
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4
- delay 0x6
+ delay 6
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
- createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x0, 0x0, 0x0, 0xa, 0x1, 0x3, 0x0 @left
- createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, 0x0515, 0x0, 0x0, 0x0, 0xa, 0x1, 0x3, 0x0 @right
+ createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -32, 0, 0, 0, 10, 1, 3, 0 @left
+ createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, 1301, 0, 0, 0, 10, 1, 3, 0 @right
waitforvisualfinish
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gDualChopImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
@@ -5870,7 +5920,7 @@ gBattleAnimMove_HeartStamp::
monbg ANIM_TARGET
loopsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER, 0xc, 0x3
createsprite gHeartStampSpinningHeartTemplate, ANIM_TARGET, 0, 0x0, 0x0, 0x1, 0x1e
- delay 0x1E
+ delay 30
clearmonbg ANIM_TARGET
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 131, ANIM_TARGET, 4, 0, 5, 1
@@ -5904,16 +5954,16 @@ gBattleAnimMove_SacredSword::
setalpha 12, 8
playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
- delay 0x16
- createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, 0x2715, 0x2, 0x2, 0x7ff2, 0x10, 0x0, 0x0
+ delay 22
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
waitforvisualfinish
clearmonbg ANIM_ATTACKER
- delay 0x1
+ delay 1
monbg ANIM_TARGET
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSacredSwordBladesTemplate, ANIM_TARGET, 1, 0x0, 0xa, 0x0, 0xFF00, 0xA
createsprite gSacredSwordCutTemplate, ANIM_ATTACKER, 2, 0x28, 0xffe0, 0x0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -5928,7 +5978,7 @@ gBattleAnimMove_RazorShell::
createsprite gRazorShellTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x0, 25, 0
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 1, 0x28, 0xffe0, 0x0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -5943,11 +5993,11 @@ gBattleAnimMove_HeatCrash::
setalpha 12, 8
playsewithpan SE_SUCCESS, SOUND_PAN_TARGET
createsprite gHeatCrashEruptionRockTemplate, ANIM_ATTACKER, 3, 0x0, 0xffe0, 0xf
- delay 0x13
+ delay 19
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, -8, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 9, 1
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- delay 0x5
+ delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, -8, ANIM_TARGET, 1
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 5, 1
@@ -5977,17 +6027,17 @@ gBattleAnimMove_LeafTornado::
end
LeafTornadoVortex:
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x1
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x1
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x1
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x1
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x1
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, 0x1
- delay 0x2
+ delay 2
return
gBattleAnimMove_Steamroller::
@@ -6031,26 +6081,26 @@ gBattleAnimMove_CottonGuard::
end
CottonSporesSpiralInward:
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0x28, 0xfff6, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0xffdd, 0xfff6, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0xf, 0xffd8, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xffe0, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0x19, 0xffec, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0xd
- delay 0x3
+ delay 3
createsprite gCottonGuardSporeTemplate, ANIM_ATTACKER, 2, 0x5, 0xffd8, 0xd
- delay 0x3
+ delay 3
return
gBattleAnimMove_NightDaze::
loadspritegfx ANIM_TAG_THIN_RING @uproar
loadspritegfx ANIM_TAG_PURPLE_FLAME @dark violet color
loadspritegfx ANIM_TAG_RED_ORB @circles
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_ORB, SOUND_PAN_ATTACKER
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
@@ -6062,25 +6112,25 @@ gBattleAnimMove_NightDaze::
createsprite gNightDazeVioletCirclesTemplate, ANIM_TARGET, 2, 0xa0
createsprite gNightDazeVioletCirclesTemplate, ANIM_TARGET, 2, 0x0
createsprite gNightDazeVioletCirclesTemplate, ANIM_TARGET, 2, 0xe0
- delay 0x1
+ delay 1
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0x1
+ delay 1
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0xF
+ delay 15
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0x1
+ delay 1
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0x1
+ delay 1
createsprite gNightDazeVioletRingsTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 31, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x2002
- delay 0x6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(2, 0, 8)
+ delay 6
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x2002
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(2, 0, 8)
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
end
@@ -6134,15 +6184,15 @@ gBattleAnimMove_Hurricane::
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 64, 1
call HurricaneGust
- delay 0xA
+ delay 10
call HurricaneGust
- delay 0xA
+ delay 10
call HurricaneGust
- delay 0xA
+ delay 10
call HurricaneGust
- delay 0xA
+ delay 10
call HurricaneGust
- delay 0xA
+ delay 10
call HurricaneGust
waitforvisualfinish
stopsound
@@ -6166,7 +6216,7 @@ gBattleAnimMove_HeadCharge::
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x2
+ delay 2
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x1
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 2, 0, 4, 1
@@ -6187,13 +6237,13 @@ gBattleAnimMove_GearGrind::
playsewithpan SE_ESCALATOR, SOUND_PAN_ATTACKER
createsprite gGearGrindTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe0, 0x0, 0x333, 0x333, 0xa
createsprite gGearGrindTemplate, ANIM_ATTACKER, 2, 0x20, 0x20, 0x0, 0xfccd, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
waitforvisualfinish
createsprite gGearGrindTemplate, ANIM_ATTACKER, 2, 0x20, 0xffe0, 0x0, 0xfccd, 0x333, 0xa
createsprite gGearGrindTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x20, 0x0, 0x333, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2
waitforvisualfinish
@@ -6208,64 +6258,64 @@ gBattleAnimMove_SearingShot::
loadspritegfx ANIM_TAG_ELECTRIC_ORBS @charge
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge
loadspritegfx ANIM_TAG_WARM_ROCK @eruption
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ELECTRIC_ORBS, 0x0, 0xC, 0xC, 0x0E3E @Orange
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_WARM_ROCK, 0x0, 0xB, 0xB, 0x01BE @Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 12, 12, RGB(30, 17, 3) @Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WARM_ROCK, 0, 11, 11, RGB(30, 13, 0) @Orange
monbg ANIM_ATTACKER
setalpha 8, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB_RED
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x1e
+ delay 30
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x1e
+ delay 30
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gSearingShotRedChargeTemplate, ANIM_ATTACKER, 2, 0x0
- delay 0x19
+ delay 25
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x14
+ delay 20
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
waitforvisualfinish
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0x1e, 0x19, 0xffec
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x20, 0x1e, 0x19, 0xffec
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x40, 0x1e, 0x19, 0xffec
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x60, 0x1e, 0x19, 0xffec
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x80, 0x1e, 0x19, 0xffec
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xa0, 0x1e, 0x19, 0xffec
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xa0, 0x1e, 0x19, 0xffec
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xe0, 0x1e, 0x19, 0xffec
- delay 0xF
+ delay 15
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0x1e, 0x19, 0x0
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x20, 0x1e, 0x19, 0x0
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x40, 0x1e, 0x19, 0x0
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x60, 0x1e, 0x19, 0x0
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 2, 0x1, 0x80, 0x1e, 0x19, 0x0
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xa0, 0x1e, 0x19, 0x0
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xa0, 0x1e, 0x19, 0x0
- delay 0x2
+ delay 2
createsprite gSearingShotEruptionRockTemplate, ANIM_ATTACKER, 66, 0x1, 0xe0, 0x1e, 0x19, 0x0
- delay 0x15
+ delay 21
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_RED
clearmonbg ANIM_ATTACKER
fadetobg BG_FIRE
waitbgfadeout
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xA00, 0x0, 0x1, 0xffff
waitbgfadein
- delay 0x1E
+ delay 30
monbg ANIM_ATK_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ADJACENT, 0x2, 0x0, 0x9, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ADJACENT, 2, 0, 9, RGB_RED
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 27, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 27, 1
@@ -6277,13 +6327,13 @@ gBattleAnimMove_SearingShot::
createsprite gSearingShotEruptionImpactTemplate, ANIM_TARGET, 3, 5, 10, 0x1, 0x1E, ANIM_DEF_PARTNER
createsprite gSearingShotEruptionImpactTemplate, ANIM_TARGET, 3, -5, -5, 0x1, 0x1E, ANIM_ATK_PARTNER
createsprite gSearingShotEruptionImpactTemplate, ANIM_TARGET, 3, 5, 10, 0x1, 0x1E, ANIM_ATK_PARTNER
- delay 0x1E
+ delay 30
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ADJACENT, 0x2, 0x9, 0x0, 0x1F
- delay 0x1E
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ADJACENT, 2, 9, 0, RGB_RED
+ delay 30
call UnsetPsychicBg
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_BLACK
clearmonbg ANIM_ATK_PARTNER
blendoff
end
@@ -6303,40 +6353,40 @@ TechnoBlastNormal:
loadspritegfx ANIM_TAG_GRAY_SMOKE @dispersal
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 0xE, 0x8
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteChargeTemplate, ANIM_ATTACKER, 2, 0x0
call TechnoBlastWhiteCircles
call TechnoBlastWhiteCircles
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0x10
- delay 0x2
+ delay 2
waitforvisualfinish
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gTechnoBlastWhiteBlastTemplate, ANIM_TARGET, 3, 0xa, 0x0, 0x0, 0x0, 0x1e, 0x0
@@ -6352,47 +6402,47 @@ TechnoBlastNormal:
playsewithpan SE_M_EMBER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
createsprite gTechnoBlastWhiteSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_ATTACKER
end
TechnoBlastWhiteCircles:
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x1e, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x14, 0xffe2, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffec, 0xffe2, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x14, 0x1e, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0x28, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gTechnoBlastWhiteCircleTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0x10
- delay 0x2
+ delay 2
return
TechnoBlastElectric:
@@ -6403,26 +6453,26 @@ TechnoBlastElectric:
loadspritegfx ANIM_TAG_GRAY_SMOKE @dispersal
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 0xE, 0x8
createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
waitforvisualfinish
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gTechnoBlastYellowBlastTemplate, ANIM_TARGET, 3, 0xa, 0x0, 0x0, 0x0, 0x1e, 0x0
@@ -6440,20 +6490,20 @@ TechnoBlastElectric:
createsprite gTechnoBlastYellowSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x1, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x5, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x5, 0x1
- delay 0x2
+ delay 2
createsprite gTechnoBlastYellowSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xf, 0x14, 0x5, 0x2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xfff6, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastYellowSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x19, 0x0, 0x5, 0x1
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x5, 0x2
- delay 0x2
+ delay 2
createsprite gTechnoBlastYellowSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x2, 0xfff8, 0x5, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xf, 0x5, 0x1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_ATTACKER
@@ -6461,7 +6511,7 @@ TechnoBlastElectric:
TechnoBlastCharging1:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
return
@@ -6469,7 +6519,7 @@ TechnoBlastCharging2:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
return
@@ -6482,79 +6532,79 @@ TechnoBlastWater:
loadspritegfx ANIM_TAG_BUBBLE @bubbles
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB(1, 0, 0)
waitforvisualfinish
createsprite gTechnoBlastBlueChargeTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
waitforvisualfinish
@@ -6574,20 +6624,20 @@ TechnoBlastWater:
createsprite gTechnoBlastBlueSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x1, 0x0
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x1
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x1
- delay 0x2
+ delay 2
createsprite gTechnoBlastBlueSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x1
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x1
- delay 0x2
+ delay 2
createsprite gTechnoBlastBlueSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x1
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x1
- delay 0x2
+ delay 2
createsprite gTechnoBlastBlueSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x1
createsprite gTechnoBlastBlueBubbleTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_ATTACKER
@@ -6603,10 +6653,10 @@ TechnoBlastFire:
loadspritegfx ANIM_TAG_GRAY_SMOKE @dispersal
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
createsprite gTechnoBlastRedChargeTemplate, ANIM_ATTACKER, 2, 0x0
- delay 0x5
+ delay 5
call TechnoBlastFireSpiral
call TechnoBlastFireSpiral
call TechnoBlastFireSpiral
@@ -6632,14 +6682,14 @@ TechnoBlastFire:
createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 160, 48, 40
createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, -224, -32, 40
createsprite gFireSpreadSpriteTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40
- delay 0x2
+ delay 2
createsprite gTechnoBlastRedSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastRedSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastRedSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_ATTACKER
@@ -6647,25 +6697,25 @@ TechnoBlastFire:
TechnoBlastFireSpiral:
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
return
TechnoBlastIce:
@@ -6676,22 +6726,22 @@ TechnoBlastIce:
loadspritegfx ANIM_TAG_SPARK_2 @blast particles
loadspritegfx ANIM_TAG_GRAY_SMOKE @dispersal
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
createsprite gTechnoBlastIceChargeTemplate, ANIM_ATTACKER, 2, 0x0
- delay 0x5
+ delay 5
call TechnoBlastIceChargeParticles
call TechnoBlastIceChargeParticles
call TechnoBlastIceChargeParticles
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xfff6, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xa, 0x14, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xfffb, 0xa, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0x11, 0xfff4, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
waitforvisualfinish
@@ -6710,45 +6760,45 @@ TechnoBlastIce:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
createsprite gTechnoBlastIceSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x1, 0x0
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastIceSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastIceSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xf, 0x0
- delay 0x2
+ delay 2
createsprite gTechnoBlastIceSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0x14, 0x2, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
TechnoBlastIceChargeParticles:
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xfff6, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xa, 0x14, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xfffb, 0xa, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0x11, 0xfff4, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xf, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gTechnoBlastIceCrystalsTemplate, ANIM_ATTACKER, 2, 0x14, 0x2, 0x0, 0x2
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
return
gBattleAnimMove_RelicSong::
@@ -6761,55 +6811,55 @@ gBattleAnimMove_RelicSong::
waitforvisualfinish
createvisualtask SoundTask_PlayCryWithEcho, 2, FALSE
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1d, 0xfff4, 0x0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0xffe3, 0x1
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x7, 0x0, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x6, 0x1, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xc, 0xffe3, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe3, 0xfff4, 0x0
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x2, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x2, 0x3, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x18, 0xffe8, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0xffe8, 0x0
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x3, 0x0, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x2, 0x1, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1d, 0xfff4, 0x0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0xffe3, 0x1
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x5, 0x2, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x6, 0x3, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xc, 0xffe3, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe3, 0xfff4, 0x0
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x2, 0x0, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x2, 0x1, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x18, 0xffe8, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0xffe8, 0x0
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x2, 0xc
- delay 0x5
+ delay 5
createsprite gWavyMusicNotesSpriteTemplate, ANIM_TARGET, 2, 0x5, 0x3, 0xc
- delay 0x5
+ delay 5
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1d, 0xfff4, 0x0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0xffe3, 0x1
waitforvisualfinish
@@ -6817,13 +6867,13 @@ gBattleAnimMove_RelicSong::
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
- delay 0x5
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 5
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x5
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 5
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x5
+ delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
@@ -6840,21 +6890,21 @@ gBattleAnimMove_SecretSword::
monbg ANIM_ATTACKER
setalpha 12, 8
playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 16, RGB_BLACK
createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
- delay 0x16
- createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, 0x2715, 0x2, 0x2, 0x7ff2, 0x10, 0x0, 0x0
+ delay 22
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
waitforvisualfinish
clearmonbg ANIM_ATTACKER
- delay 0x1
+ delay 1
monbg ANIM_TARGET
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSecretSwordBladesTemplate, ANIM_TARGET, 1, 0x0, 0xa, 0x0, 0xFF00, 0xA
createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0xffe0, 0x0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 16, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -6883,9 +6933,9 @@ gBattleAnimMove_Glaciate::
createsprite gGlaciateSmokeTemplate, ANIM_TARGET, 4, 0x0, 0x12, 0x50, 0x0, 0x4b
createsprite gGlaciateSmokeTemplate, ANIM_TARGET, 4, 0x0, 0x12, 0x48, 0x1, 0x4b
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 0x2, 0x0, 0xA, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 2, 0, 10, RGB_WHITE
call IceCrystalEffectLong
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 0x2, 0xA, 0x0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 2, 10, 0, RGB_WHITE
waitforvisualfinish
blendoff
clearmonbg ANIM_DEF_PARTNER
@@ -6899,38 +6949,38 @@ gBattleAnimMove_BoltStrike::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @Electric Circle
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB(30, 31, 1)
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 64, 0, 2
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
clearmonbg ANIM_ATTACKER
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 0x8
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
- delay 0xA
+ delay 10
fadetobg BG_BOLT_STRIKE
waitbgfadeout
waitforvisualfinish
monbg ANIM_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 26, 0, 0, 5
- delay 0x6
+ delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(30, 31, 1)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 32, 1
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
call ElectricityEffect
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB(30, 31, 1)
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
call ElectricityEffect
waitforvisualfinish
clearmonbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(30, 31, 1)
call UnsetPsychicBg
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_BLACK
blendoff
waitforvisualfinish
end
@@ -6938,31 +6988,31 @@ gBattleAnimMove_BoltStrike::
gBattleAnimMove_BlueFlare::
loadspritegfx ANIM_TAG_SMALL_EMBER @Fire
loadspritegfx ANIM_TAG_METAL_BITS @Blue Flare Colour
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 16, RGB_BLACK
loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 0x7, 0x9
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe0, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x16, 0xffea, 0x10
- delay 0x2
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x1, 0x0, 0x9, 0x1F
+ delay 2
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 9, RGB_RED
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x1e, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x14, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x1c, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffed, 0x13, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffe5, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffee, 0xffee, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe7, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x11, 0xffef, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x17, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameJabTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x10, 0x10, 0x10
waitforvisualfinish
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
@@ -6976,24 +7026,24 @@ gBattleAnimMove_BlueFlare::
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
call BlueFlareFlameSpreadEffect
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x0, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x1, 0x9, 0x0, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 9, 0, RGB_RED
call UnsetPsychicBg
waitforvisualfinish
end
BlueFlareFireSpin:
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x1
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x1
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x1
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x1
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x1
- delay 0x2
+ delay 2
createsprite gBlueFlareFlameSwirlTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, 0x1
- delay 0x2
+ delay 2
return
BlueFlareFlameSpreadEffect:
createsprite gBlueFlareBurnTemplate, ANIM_TARGET, 1, 0x0, 0xa, 0x0, 0xb0, 0x28
@@ -7007,11 +7057,11 @@ BlueFlareFlameSpreadEffect:
gBattleAnimMove_FieryDance::
loadspritegfx ANIM_TAG_SMALL_EMBER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xc, 0x14be
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB(30, 5, 5)
waitforvisualfinish
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 64, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x0, 0x9, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 9, RGB_RED
call FireSpinEffect
call FireSpinEffect
call FireSpinEffect
@@ -7020,8 +7070,8 @@ gBattleAnimMove_FieryDance::
call FireSpinEffect
call FireSpinEffect
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x9, 0x0, 0x1f
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xc, 0x0, 0x14be
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 9, 0, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB(30, 5, 5)
waitforvisualfinish
end
@@ -7034,15 +7084,15 @@ gBattleAnimMove_FreezeShock::
FreezeShockCharge:
createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x0, 0xf, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 15, RGB_WHITE
createsprite gFreezeShockCircleTemplate, ANIM_ATTACKER, 2 @electric circle
- delay 0x14
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0xf, 0x0, 0x7fff
+ delay 20
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 15, 0, RGB_WHITE
waitforvisualfinish
end
FreezeShockAttack:
loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 0x5, 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
monbg ANIM_TARGET
waitforvisualfinish
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER
@@ -7057,12 +7107,12 @@ FreezeShockAttack:
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0xe0, 0x28, 0x2
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
- delay 0xf
+ delay 15
waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 0x13
call ElectricityEffect
waitforvisualfinish
clearmonbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_BLACK
waitforvisualfinish
end
@@ -7075,23 +7125,23 @@ gBattleAnimMove_IceBurn::
waitforvisualfinish
end
IceBurnCharge:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
loopsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET, 0x4, 0x3
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x8, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 8, 0, RGB_BLACK
createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x0, 0xf, 0x7fff
- delay 0x14
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0xf, 0x0, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 15, RGB_WHITE
+ delay 20
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 15, 0, RGB_WHITE
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
end
IceBurnUnleash:
monbg ANIM_TARGET
fadetobg BG_ICE
waitbgfadeout
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB_WHITE
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
createsprite gIceBurnSmokeTemplate, ANIM_TARGET, 4, 0x0, 0xfff4, 0x68, 0x0, 0x4b
@@ -7108,25 +7158,25 @@ IceBurnUnleash:
createsprite gIceBurnSmokeTemplate, ANIM_TARGET, 4, 0x0, 0x12, 0x48, 0x1, 0x4b
call FireSpreadEffect
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xf, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0x14, 0x2, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB_WHITE
waitforvisualfinish
restorebg
clearmonbg ANIM_TARGET
@@ -7140,19 +7190,19 @@ gBattleAnimMove_Snarl::
fadetobg BG_DARK
waitbgfadeout
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1d, 0xfff4, 0x0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0xffe3, 0x1
- delay 0x10
+ delay 16
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xc, 0xffe3, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe3, 0xfff4, 0x0
- delay 0x10
+ delay 16
createvisualtask AnimTask_UproarDistortion, 0x2, 0x0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x18, 0xffe8, 0x1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0xffe8, 0x0
@@ -7161,13 +7211,13 @@ gBattleAnimMove_Snarl::
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
@@ -7183,17 +7233,17 @@ gBattleAnimMove_IcicleCrash::
monbg ANIM_DEF_PARTNER
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xfffb, 0x0, 0xfffb, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x6, 0x1
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0x13, 0x0, 0xa, 0x01
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xffe9, 0x0, 0xfff6, 0x1
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1
- delay 0x2
+ delay 2
call LaunchIcicleCrashSpear
call LaunchIcicleCrashSpear
waitforvisualfinish
@@ -7204,28 +7254,28 @@ gBattleAnimMove_IcicleCrash::
LaunchIcicleCrashSpear:
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0x1c, 0x0, 0xa, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xfff6, 0x0, 0xfffb, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x6, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0x18, 0x0, 0xa, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xffe0, 0x0, 0xfff6, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gIcicleCrashSpearTemplate, ANIM_TARGET, 2, 0x1e, 0x0, 0xa, 0x0
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
return
gBattleAnimMove_VCreate::
@@ -7234,13 +7284,13 @@ gBattleAnimMove_VCreate::
loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @red color
loadspritegfx ANIM_TAG_ECLIPSING_ORB @defense curl animation
monbg ANIM_ATK_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0 @Darken
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK @Darken
createsprite gVCreateRedOrbTemplate, ANIM_ATTACKER, 2, 0x0, 0x11, 0x0, 0x1
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gVCreateRedRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB_RED
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
call VCreateFlames
call VCreateFlames
@@ -7266,21 +7316,21 @@ gBattleAnimMove_VCreate::
waitbgfadein
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10
- delay 0x23
+ delay 35
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 50, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB_RED
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, 0x1, 0x1
waitforvisualfinish
@@ -7290,20 +7340,20 @@ gBattleAnimMove_VCreate::
waitforvisualfinish
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x1f
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x1f
- delay 0x2
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB_RED
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
call UnsetPsychicBg
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0xffff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_WHITEALPHA
waitforvisualfinish
end
VCreateFlames:
createsprite gVCreateFlameTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x16, 0xFFEA, 0x10 @upperright
createsprite gVCreateFlameTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0xFFEE, 0xFFEE, 0x10 @upperleft
- delay 0x3
+ delay 3
return
gBattleAnimMove_FusionFlare::
@@ -7313,30 +7363,30 @@ gBattleAnimMove_FusionFlare::
loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @flame palette
loadspritegfx ANIM_TAG_SMALL_BUBBLES @particles
loadspritegfx ANIM_TAG_THIN_RING @ring
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0x0, 0xD, 0xD, 0x015B @Reddish Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_BUBBLES, 0, 13, 13, RGB(27, 10, 0) @Reddish Orange
monbg ANIM_TARGET
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
call FusionFlareBuff
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_RED
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 0x8, 0x1, 0x0
- delay 0x8
+ delay 8
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gFusionFlareRedBallUpTemplate, ANIM_ATTACKER, 2
- delay 0x20
+ delay 32
createsprite gFusionFlareRedBallTemplate, ANIM_ATTACKER, 3, 0x0, 0xffA0, 0x2F
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x64, 0x64, 0x8, 0x1, 0x14, 0x28, 0x0
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x14, 0x64, 0x10, 0x2, 0xa, 0x23, 0x1
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0xc8, 0x50, 0x8, 0x1, 0x28, 0x14, 0x0
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x50, 0x3c, 0xa, 0x3, 0x14, 0x32, 0x0
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x8c, 0x64, 0x10, 0x1, 0x14, 0x1e, 0x1
- delay 0x29
+ delay 41
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 11, RGB_RED
- delay 0x5
+ delay 5
createsprite gFusionFlareRedRingTemplate, ANIM_ATTACKER, 3, 0x1, 0x1, 0x1, 0x1, 0x1F, 0x8
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x64, 0x64, 0x8, 0x1, 0x14, 0x28, 0x0
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x14, 0x64, 0x10, 0x2, 0xa, 0x23, 0x1
@@ -7344,23 +7394,23 @@ gBattleAnimMove_FusionFlare::
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x50, 0x3c, 0xa, 0x3, 0x14, 0x32, 0x0
createsprite gFusionFlareRedBubblesTemplate, ANIM_ATTACKER, 66, 0x8c, 0x64, 0x10, 0x1, 0x14, 0x1e, 0x1
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 2, 16
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
end
FusionFlareBuff:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -7368,16 +7418,16 @@ gBattleAnimMove_FusionBolt::
loadspritegfx ANIM_TAG_SPARK
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_ELECTRICITY
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0x0, 0xC, 0xC, 0x7960 @Blue Electricity
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0x0, 0x0, 0xE, 0x0
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0, 12, 12, RGB(0, 11, 30) @Blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 12, 12, RGB(0, 11, 30) @Blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, RGB(0, 11, 30) @Blue Electricity
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 14, RGB_BLACK
waitforvisualfinish
createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
invisible ANIM_ATTACKER
waitforvisualfinish
- delay 0x8
+ delay 8
createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x0
playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -7392,21 +7442,21 @@ gBattleAnimMove_FusionBolt::
waitforvisualfinish
createsprite gFusionBoltBallTemplate, ANIM_TARGET, 2, 0x10
playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
- delay 0x8
+ delay 8
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0xfff0, 0xfff0
- delay 0x8
+ delay 8
createvisualtask AnimTask_VoltTackleAttackerReappear, 0x5
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0, 0xfff0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0xE, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 14, 0, RGB_BLACK
waitforvisualfinish
end
@@ -7418,27 +7468,27 @@ gBattleAnimMove_FlyingPress::
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
waitforvisualfinish
- delay 0xF
+ delay 15
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
- delay 0x2
+ delay 2
createvisualtask AnimTask_SquishTarget, 0x2
- delay 0x5
+ delay 5
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0x8, 0x8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0xfff8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0x8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0xfff8, 0x8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0x8, 0x8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0xfff8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0x8, 0xfff8, 0x1, 0x0
- delay 0x2
+ delay 2
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 0, 0xfff8, 0x8, 0x1, 0x0
waitforvisualfinish
blendoff
@@ -7450,26 +7500,26 @@ gBattleAnimMove_MatBlock::
monbg ANIM_ATK_PARTNER
splitbgprio ANIM_ATTACKER
setalpha 16, 0
- delay 0x0
+ delay 0
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0x18
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0x18
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0x8
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0x8
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0xfff8
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0xfff8
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0xffe8
createsprite gMatBlockGreenConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0xffe8
- delay 0x14
+ delay 20
createvisualtask AnimTask_ConversionAlphaBlend, 0x5
waitforvisualfinish
- delay 0x1
+ delay 1
clearmonbg ANIM_ATK_PARTNER
blendoff
end
@@ -7482,23 +7532,23 @@ gBattleAnimMove_Belch::
setalpha 12, 8
playsewithpan SE_SUCCESS, SOUND_PAN_ATTACKER
createsprite gBelchBerryTemplate, ANIM_ATTACKER, 2, 0x14, 0xfff8, 0xfff8, 0xfff8, 0x14, 0xffe0
- delay 0x13
+ delay 19
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 10, 0, 20, 1
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, 0x1, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0x18, 0x1, 0x1
waitforvisualfinish
@@ -7510,7 +7560,7 @@ gBattleAnimMove_Rototiller::
loadspritegfx ANIM_TAG_MUD_SAND
loadspritegfx ANIM_TAG_DIRT_MOUND
loadspritegfx ANIM_TAG_GREEN_SPARKLE
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x112C
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB(12, 9, 4)
waitforvisualfinish
createsprite gDirtMoundSpriteTemplate, ANIM_ATTACKER, 1, 0x0, 0x0, 0xb4
createsprite gDirtMoundSpriteTemplate, ANIM_ATTACKER, 1, 0x0, 0x1, 0xb4
@@ -7521,7 +7571,7 @@ gBattleAnimMove_Rototiller::
call DigThrowDirt
call DigThrowDirt
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x112C
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB(12, 9, 4)
waitforvisualfinish
end
@@ -7738,9 +7788,9 @@ gBattleAnimMove_ParabolicCharge::
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 5, 4, 0, 16, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_TARGET, 0, 16, 16, RGB_BLACK
delay 4
- createvisualtask AnimTask_BlendBattleAnimPal, 5, 4, 0, 0, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_TARGET, 0, 0, 0, RGB_BLACK
ParabolicChargeHeal:
waitforvisualfinish
unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
@@ -7769,19 +7819,19 @@ ParabolicChargeDouble:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 18, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 6, 18, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATK_PARTNER, 0, 6, 18, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 5, 4 | 8 | 0x10, 0, 16, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_ADJACENT, 0, 16, 16, RGB_BLACK
delay 4
- createvisualtask AnimTask_BlendBattleAnimPal, 5, 4 | 8 | 0x10, 0, 0, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_ADJACENT, 0, 0, 0, RGB_BLACK
goto ParabolicChargeHeal;
gBattleAnimMove_ForestsCurse::
loadspritegfx ANIM_TAG_ROOTS @frenzy plant
loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT @curse
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x8, 0x02E3
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 8, RGB(3, 23, 0)
createsprite gForestsCurseIngrainTemplate, ANIM_ATTACKER, 66, 0x64, 0x64, 0x8, 0x1, 0x14, 0x28, 0x0
createsprite gForestsCurseIngrainTemplate, ANIM_ATTACKER, 66, 0x14, 0x64, 0x10, 0x2, 0xa, 0x23, 0x1
createsprite gForestsCurseIngrainTemplate, ANIM_ATTACKER, 66, 0xc8, 0x50, 0x8, 0x1, 0x28, 0x14, 0x0
@@ -7805,9 +7855,9 @@ gBattleAnimMove_ForestsCurse::
createsprite gCurseGhostSpriteTemplate, ANIM_TARGET, 2
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 14, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x8, 0x0, 0x02E3
- delay 0x3
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 8, 0, RGB(3, 23, 0)
+ delay 3
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
@@ -7820,23 +7870,23 @@ gBattleAnimMove_PetalBlizzard::
splitbgprio ANIM_TARGET
playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 120, 70, 5, 70, 30
- delay 0x1
+ delay 1
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 0x73, 0x37, 0x6, 0x3c, 0x19
- delay 0x1
+ delay 1
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 0x73, 0x3c, 0x7, 0x3c, 0x1e
createsprite gPetalBlizzardTwister1Template, ANIM_TARGET, 2, 0x73, 0x37, 0xA, 0x3c, 0x1e
- delay 0x3
+ delay 3
createsprite gPetalBlizzardTwister1Template, ANIM_TARGET, 2, 0x64, 0x32, 0x4, 0x32, 0x1A
- delay 0x1
+ delay 1
createsprite gPetalBlizzardTwister1Template, ANIM_TARGET, 2, 0x69, 0x19, 0x8, 0x3c, 0x14
- delay 0x1
+ delay 1
createsprite gPetalBlizzardTwister1Template, ANIM_TARGET, 2, 0x73, 0x28, 0xA, 0x30, 0x1E
- delay 0x3
+ delay 3
createsprite gPetalBlizzardTwister1Template, ANIM_TARGET, 2, 0x78, 0x1E, 0x6, 0x2d, 0x19
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 0x73, 0x23, 0xA, 0x3c, 0x1e
- delay 0x3
+ delay 3
createsprite gPetalBlizzardTwister2Template, ANIM_TARGET, 2, 0x69, 0x14, 0x8, 0x28, 0x0
- delay 0x3
+ delay 3
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 0x14, 0xff, 0xf, 0x20, 0x0
createsprite gTwisterLeafSpriteTemplate, ANIM_TARGET, 2, 0x6e, 0xA, 0x8, 0x20, 0x14
waitforvisualfinish
@@ -7845,13 +7895,13 @@ gBattleAnimMove_PetalBlizzard::
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATK_PARTNER, 3, 0, 12, 1
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
@@ -7865,7 +7915,7 @@ gBattleAnimMove_FreezeDry::
loadspritegfx ANIM_TAG_ICE_CRYSTALS
loadspritegfx ANIM_TAG_IMPACT
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 1, 0, 7, RGB_BLACK
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(12, 26, 31)
delay 20
playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET
createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0
@@ -7887,7 +7937,7 @@ gBattleAnimMove_FreezeDry::
createvisualtask AnimTask_FrozenIceCube, 2
waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 17
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 9, 0, RGB(12, 26, 31)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(12, 26, 31)
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 7, 0, RGB_BLACK
waitforvisualfinish
@@ -7897,17 +7947,17 @@ gBattleAnimMove_FreezeDry::
gBattleAnimMove_DisarmingVoice::
loadspritegfx ANIM_TAG_NOISE_LINE
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(29, 19, 27)
waitforvisualfinish
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
call RoarEffect
- delay 0xA
+ delay 10
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 26, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 26, 1
waitforvisualfinish
createvisualtask SoundTask_WaitForCry, 0x5
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(29, 19, 27)
waitforvisualfinish
end
@@ -7980,53 +8030,53 @@ gBattleAnimMove_CraftyShield::
loadspritegfx ANIM_TAG_CRAFTY_SHIELD
monbg ANIM_ATK_PARTNER
splitbgprio ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x5, 0x4DBF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 5, RGB(31, 13, 19)
setalpha 16, 0
- delay 0x0
+ delay 0
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xffe8, 0xffe8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0xffe8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0xffe8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x18, 0xffe8
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xffe8, 0xfff8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0xfff8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0xfff8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x18, 0xfff8
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xffe8, 0x8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0x8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0x8
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x18, 0x8
- delay 0x3
+ delay 3
playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xffe8, 0x18
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0xfff8, 0x18
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x8, 0x18
- delay 0x3
+ delay 3
createsprite gCraftyShieldPinkConversionTemplate, ANIM_ATTACKER, 2, 0x18, 0x18
- delay 0x14
+ delay 20
playsewithpan SE_M_BARRIER, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, 0x2722, 0x1, 0x1, 0x37ff, 0xc, 0x0, 0x0
- delay 0x6
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_CONVERSION, 1, 1, RGB(31, 31, 13), 12, 0, 0
+ delay 6
createvisualtask AnimTask_ConversionAlphaBlend, 0x5
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x5, 0x0, 0x4DBF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 5, 0, RGB(31, 13, 19)
waitforvisualfinish
- delay 0x1
+ delay 1
clearmonbg ANIM_ATK_PARTNER
blendoff
end
@@ -8035,28 +8085,28 @@ gBattleAnimMove_FlowerShield::
loadspritegfx ANIM_TAG_FLOWER
loadspritegfx ANIM_TAG_IMPACT
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(29, 19, 27)
waitforvisualfinish
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0xffe8, 0x8, 0x64
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xffe8, 0x8, 0x64
- delay 0xf
+ delay 15
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xffe8, 0x8, 0x64
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe8, 0x8, 0x64
- delay 0xf
+ delay 15
createsprite gPetalDanceBigFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0xffe8, 0x8, 0x64
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0xffe8, 0xffe8, 0x8, 0x64
- delay 0x1e
+ delay 30
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0xffe8, 0x0, 0x64
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xffe8, 0x0, 0x64
- delay 0x1e
+ delay 30
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0x14, 0xfff0, 0xe, 0x50
createsprite gPetalDanceSmallFlowerSpriteTemplate, ANIM_ATTACKER, 2, 0xffec, 0xfff2, 0x10, 0x50
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(29, 19, 27)
waitforvisualfinish
blendoff
end
@@ -8148,9 +8198,9 @@ gBattleAnimMove_Electrify::
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0x4
+ delay 4
createsprite gElectrifyRingTemplate, ANIM_ATTACKER, 2
- delay 0x4
+ delay 4
createsprite gElectrifyRingTemplate, ANIM_ATTACKER, 2
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
@@ -8165,36 +8215,36 @@ gBattleAnimMove_Electrify::
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0x60, 0x28, 0x1
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0xa0, 0x28, 0x0
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0xe0, 0x28, 0x2
- delay 0xA
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x0, 0xB, 0x039B
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x3, 0x039B
- delay 0x4
+ delay 10
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(27, 28, 0)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 3, RGB(27, 28, 0)
+ delay 4
clearmonbg ANIM_ATTACKER
- delay 0x1
+ delay 1
monbg ANIM_DEF_PARTNER
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
createsprite gElectrifyYellowRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1f, 0x8
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x5, 0x0
- delay 0x1
+ delay 1
createsprite gElectrifyYellowRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1f, 0x8
- delay 0x1
+ delay 1
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x5, 0x1
createsprite gElectrifyYellowRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x0, 0x1f, 0x8
- delay 0x1
+ delay 1
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xf, 0x14, 0x5, 0x2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xfff6, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x19, 0x0, 0x5, 0x1
- delay 0x2
+ delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x5, 0x2
- delay 0x2
+ delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x2, 0xfff8, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xf, 0x5, 0x1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0xB, 0x0, 0x039B
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x3, 0x0, 0x039B
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(27, 28, 0)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 3, 0, RGB(27, 28, 0)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -8221,7 +8271,7 @@ gBattleAnimMove_PlayRough::
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0x80, 0xfff2
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0x1a0, 0xffda
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0xff80, 0xffea
- delay 0x0
+ delay 0
call SubmissionHit
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xa0, 0xffe0
@@ -8230,14 +8280,14 @@ gBattleAnimMove_PlayRough::
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0x1a0, 0xffda
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xff80, 0xffea
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xfe80, 0xffe1
- delay 0x0
+ delay 0
call SubmissionHit
playsewithpan SE_M_DIVE, SOUND_PAN_TARGET
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0xff00, 0xffd6
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0x80, 0xfff2
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0x1a0, 0xffda
createsprite gPinkHeartSpriteTemplate, ANIM_TARGET, 3, 0xff80, 0xffea
- delay 0x0
+ delay 0
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xa0, 0xffe0
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xff00, 0xffd8
@@ -8245,10 +8295,10 @@ gBattleAnimMove_PlayRough::
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0x1a0, 0xffda
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xff80, 0xffea
createsprite gDizzyPunchDuckSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x8, 0xfe80, 0xffe1
- delay 0x0
+ delay 0
call SubmissionHit
waitforvisualfinish
- delay 0xD
+ delay 13
stopsound
clearmonbg 0x3
blendoff
@@ -8259,24 +8309,24 @@ gBattleAnimMove_FairyWind::
loadspritegfx ANIM_TAG_PINK_CLOUD
monbg ANIM_DEF_PARTNER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(29, 19, 27)
waitforvisualfinish
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createsprite gFairyWindCloudTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0x14, 0x1
- delay 0x5
+ delay 5
createsprite gFairyWindCloudTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x5, 0x16, 0xffee, 0x1
- delay 0x5
+ delay 5
createsprite gFairyWindCloudTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0xfff6, 0x16, 0xf, 0x1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 18, 1
- delay 0x5
+ delay 5
createsprite gFairyWindCloudTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0xffec, 0x1
- delay 0x5
+ delay 5
createsprite gFairyWindCloudTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0xc, 0x1
- delay 0x5
+ delay 5
waitforvisualfinish
stopsound
playsewithpan SE_M_GUST2, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(29, 19, 27)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -8360,7 +8410,7 @@ gBattleAnimMove_FairyLock::
loadspritegfx ANIM_TAG_FAIRY_LOCK_CHAINS
setalpha 8, 8
monbg ANIM_ATK_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6B1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(31, 24, 26)
waitforvisualfinish
loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 0x6, 0x9
createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x7
@@ -8371,7 +8421,7 @@ gBattleAnimMove_FairyLock::
createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x6
createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x35
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6B1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(31, 24, 26)
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
blendoff
@@ -8379,14 +8429,14 @@ gBattleAnimMove_FairyLock::
gBattleAnimMove_KingsShield::
loadspritegfx ANIM_TAG_PROTECT @protect
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0x0, 0xC, 0xC, 0x318C @Gray
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 12, 12, RGB(12, 12, 12) @Gray
goto gBattleAnimMove_Protect
gBattleAnimMove_PlayNice::
loadspritegfx ANIM_TAG_RED_HEART
loopsewithpan SE_M_SANDSTORM, SOUND_PAN_ATTACKER, 0xc, 0x3
createvisualtask AnimTask_SwayMon, 5, 0, 12, 4096, 4, ANIM_ATTACKER
- delay 0xF
+ delay 15
createsprite gRedHeartProjectileSpriteTemplate, ANIM_TARGET, 3, 0x14, 0xfff8
end
@@ -8403,50 +8453,50 @@ gBattleAnimMove_DiamondStorm::
loadspritegfx ANIM_TAG_ICE_CRYSTALS
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xF, 0x1888
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ICE_CRYSTALS, 0, 0xD, 0xD, 0x7DDE @Pink
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB(8, 4, 6)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ICE_CRYSTALS, 0, 13, 13, RGB(30, 14, 31) @Pink
waitforvisualfinish
panse SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff1, 0x0, 0xfff1, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xfffb, 0x0, 0xfffb, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff1, 0x0, 0xfff1, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
createsprite gSwirlingSnowballSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xffe7, 0x0, 0xffe7, 0x48, 0x1
createsprite gDiamondStormBlizzardTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x50, 0x0, 0x0, 0x1
- delay 0x3
+ delay 3
playsewithpan SE_M_TWISTER, SOUND_PAN_TARGET
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x78, 0x46, 0x5, 0x46, 0x1e
- delay 0x1
+ delay 1
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x73, 0x37, 0x6, 0x3c, 0x19
- delay 0x1
+ delay 1
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x73, 0x3c, 0x7, 0x3c, 0x1e
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x73, 0x37, 0xa, 0x3c, 0x1e
- delay 0x3
+ delay 3
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x64, 0x32, 0x4, 0x32, 0x1a
- delay 0x1
+ delay 1
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x69, 0x19, 0x8, 0x3c, 0x14
- delay 0x1
+ delay 1
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x73, 0x28, 0xa, 0x30, 0x1e
- delay 0x3
+ delay 3
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x78, 0x1e, 0x6, 0x2d, 0x19
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x73, 0x23, 0xa, 0x3c, 0x1e
- delay 0x3
+ delay 3
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x69, 0x14, 0x8, 0x28, 0x0
- delay 0x3
+ delay 3
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x14, 0xff, 0xf, 0x20, 0x0
createsprite gDiamondStormDiamondsTemplate, ANIM_TARGET, 2, 0x6e, 0xa, 0x8, 0x20, 0x14
waitforvisualfinish
@@ -8455,17 +8505,17 @@ gBattleAnimMove_DiamondStorm::
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_DEF_PARTNER, 3, 0, 12, 1
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x3
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 3
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xF, 0x0, 0x1888
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 15, 0, RGB(8, 4, 6)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -8473,16 +8523,16 @@ gBattleAnimMove_DiamondStorm::
gBattleAnimMove_SteamEruption::
loadspritegfx ANIM_TAG_STEAM_ERUPTION @Steam Eruption Particle
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x7, 0x043D
- delay 0x20
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 7, RGB(29, 1, 1)
+ delay 32
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
panse SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
call SteamEruptionBreath
call SteamEruptionBreath
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x0, 0x9, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 9, RGB_RED
call SteamEruptionBreath
- delay 0x2
+ delay 2
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 21, 1
call SteamEruptionBreath
call SteamEruptionBreath
@@ -8500,15 +8550,15 @@ gBattleAnimMove_SteamEruption::
call SteamEruptionBreath
call SteamEruptionBreath
call SteamEruptionBreath
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x9, 0x0, 0x1f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 9, 0, RGB_RED
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x7, 0x0, 0x043D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 7, 0, RGB(29, 1, 1)
waitforvisualfinish
end
SteamEruptionBreath:
createsprite gSteamEruptionBreathTemplate, ANIM_TARGET, 2, 0x0, 0x5, 0x0, 0x5, 0x14
- delay 0x1
+ delay 1
return
gBattleAnimMove_HyperspaceHole::
@@ -8516,27 +8566,27 @@ gBattleAnimMove_HyperspaceHole::
loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond
loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour
loadspritegfx ANIM_TAG_POISON_BUBBLE @Poison Colour
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_WHITE
waitforvisualfinish
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
waitsound
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x30
- delay 0x17
+ delay 23
createvisualtask AnimTask_IsTargetSameSide, 0x2
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
- delay 0x19
+ delay 25
visible ANIM_ATTACKER
invisible ANIM_ATTACKER
- delay 0x5
+ delay 5
createsprite gHyperspaceHoleImpactTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
call HyperspaceHoleMovement
createsprite gHyperspaceHoleImpactTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
@@ -8547,21 +8597,21 @@ gBattleAnimMove_HyperspaceHole::
call HyperspaceHoleMovement
waitforvisualfinish
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_WHITE
waitforvisualfinish
end
HyperspaceHoleMovement:
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 15, 1
- delay 0x4
+ delay 4
return
gBattleAnimMove_WaterShuriken::
@@ -8572,17 +8622,22 @@ gBattleAnimMove_WaterShuriken::
loadspritegfx ANIM_TAG_IMPACT @hydro pump hit
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
- createsoundtask SoundTask_LoopSEAdjustPanning, 0x7, 0x87, 0xffc0, SOUND_PAN_TARGET, 0x5, 0x5, 0x0, 0x5
- createsprite gWaterShurikenStarTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x27
- delay 0x8
- createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x28, 0xf
- delay 0x5
- createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x28, 0xf
- delay 0x5
- createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x28, 0xf
- delay 0xC
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gWaterShurikenStarTemplate, ANIM_TARGET, 2, 0, 0, 20
+ delay 8
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
+ playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
+ createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0, 0, 20, 15
+ delay 5
+ playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
+ createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0, 0, 20, 15
+ delay 5
+ playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
+ createsprite gWaterShurikenRingTemplate, ANIM_TARGET, 2, 0, 0, 20, 15
+ delay 12
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
- createsprite gWaterShurikenImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x2
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 4, 1
+ createsprite gWaterShurikenImpactTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 2
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -8598,19 +8653,19 @@ gBattleAnimMove_MysticalFire::
waitsound
blendoff
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0xffff, 0x0
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0x0, 0x1
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0xffff, 0xffff
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0x2, 0x1
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0x1, 0xffff
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0xffff, 0x1
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0x1, 0xfffe
- delay 0x1
+ delay 1
createsprite gLargeFlameScatterSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x1e, 0x3, 0x1
playse 0x8c
waitforvisualfinish
@@ -8624,29 +8679,29 @@ gBattleAnimMove_SpikyShield::
splitbgprio ANIM_ATTACKER
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0x0, 0x5a
- delay 0xF
+ delay 15
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x0, 0xFFE0, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x16, 0xFFEA, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x1E, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x14, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x0, 0x1C, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0xFFED, 0x13, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0xFFE5, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0xFFEE, 0xFFEE, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x0, 0xFFE7, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x11, 0xFFEF, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x17, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gNeedleArmSpikeSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1, 0x10, 0x10, 0x10
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
@@ -8655,9 +8710,9 @@ gBattleAnimMove_SpikyShield::
gBattleAnimMove_AromaticMist::
loadspritegfx ANIM_TAG_PINK_PETAL
playsewithpan SE_M_SWEET_SCENT, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6E7D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(29, 19, 27)
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x64
- delay 0x19
+ delay 25
setpan 0x0
call SweetScentEffect
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x37, 0x0
@@ -8665,7 +8720,7 @@ gBattleAnimMove_AromaticMist::
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_DEF_SIDE, 1, 5, 5, 13, RGB(31, 21, 21)
call SweetScentEffect
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6E7D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(29, 19, 27)
waitforvisualfinish
end
@@ -8678,9 +8733,9 @@ gBattleAnimMove_EerieImpulse::
loadspritegfx ANIM_TAG_GOLD_RING @psybeam ring
monbg ANIM_DEF_PARTNER
waitplaysewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET 0x13
- delay 0x4
+ delay 4
createsprite gEerieImpulseRingTemplate, ANIM_ATTACKER, 0, 0x2d, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1
- delay 0xB
+ delay 11
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 1
createsprite gZapCannonSparkSpriteTemplate, ANIM_TARGET, 4, 10, 0, 16, 30, 0, 40, 0
@@ -8698,15 +8753,15 @@ gBattleAnimMove_EerieImpulse::
createsprite gEerieImpulseImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0x1, 0x0, 0x20, 0x10
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x5, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x5, 0x1
- delay 0x7
+ delay 7
createsprite gEerieImpulseImpactTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xa, 0x1, 0x0, 0x20, 0x10
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xf, 0x14, 0x5, 0x2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xfff6, 0x5, 0x0
- delay 0x7
+ delay 7
createsprite gEerieImpulseImpactTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xfff1, 0x1, 0x0, 0x20, 0x10
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x19, 0x0, 0x5, 0x1
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x5, 0x2
- delay 0x7
+ delay 7
createsprite gEerieImpulseImpactTemplate, ANIM_ATTACKER, 2, 0xa, 0xfffb, 0x1, 0x0, 0x20, 0x10
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0x2, 0xfff8, 0x5, 0x0
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xf, 0x5, 0x1
@@ -8719,16 +8774,16 @@ gBattleAnimMove_VenomDrench::
monbg ANIM_DEF_PARTNER
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xfffb, 0x1, 0xfffb, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0x13, 0x1, 0xa, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xffe9, 0x2, 0xfff6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
call AcidDrench
call AcidDrench
waitforvisualfinish
@@ -8737,28 +8792,28 @@ gBattleAnimMove_VenomDrench::
AcidDrench:
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0x1c, 0x1, 0xa, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xfff6, 0x1, 0xfffb, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0x18, 0x1, 0xa, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xffe0, 0x2, 0xfff6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gVenomDrenchAcidTemplate, ANIM_TARGET, 2, 0x1e, 0x2, 0xa, 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
return
gBattleAnimMove_Powder::
@@ -8775,11 +8830,11 @@ gBattleAnimMove_Powder::
end
POWDER_SPORE:
createsprite gPowderBlackSporeTemplate, ANIM_ATTACKER, 2, 0x0, 0xffec, 0x55, 0x50, 0x0
- delay 0xc
+ delay 12
createsprite gPowderBlackSporeTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0xaa, 0x50, 0x0
- delay 0xc
+ delay 12
createsprite gPowderBlackSporeTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff1, 0x0, 0x50, 0x0
- delay 0xc
+ delay 12
return
gBattleAnimMove_Geomancy::
@@ -8794,19 +8849,19 @@ gBattleAnimMove_Geomancy::
choosetwoturnanim GeomancyChargeUp GeomancyUnleash
GeomancyChargeUp:
loadspritegfx ANIM_TAG_FOCUS_ENERGY @endure buff effect
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_COSMIC_POWER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 95, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x5, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 5, RGB_RED
call GeomancyRingBuff
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x5, 0x2C0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 5, RGB(0, 22, 0)
call GeomancyRingBuff
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x5, 0x7C60
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 5, RGB(0, 3, 31)
call GeomancyRingBuff
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x5, 0x0, 0x7C60
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 5, 0, RGB(0, 3, 31)
waitforvisualfinish
blendoff
clearmonbg ANIM_ATK_PARTNER
@@ -8815,69 +8870,69 @@ GeomancyRingBuff:
createsprite gGeomancyRedCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x0
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyGreenCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x0
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyBlueCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x0
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x2
+ delay 2
createsprite gGeomancyRedCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x0
- delay 0x2
+ delay 2
createsprite gGeomancyGreenCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x0
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyBlueCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, 0x0
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRedCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x0
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x2
+ delay 2
createsprite gGeomancyGreenCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x0
- delay 0x2
+ delay 2
createsprite gGeomancyBlueCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x0
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRedCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x0
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyGreenCellVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x0
- delay 0x2
+ delay 2
return
GeomancyUnleash:
loadspritegfx ANIM_TAG_FIRE_PLUME @dragon rage
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x24CF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB(15, 6, 9)
playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
- delay 0x1
+ delay 1
createsprite gGeomancyRingTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x10, 0x4D01
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 16, RGB(1, 8, 19)
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 37, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x5, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 5, RGB_RED
createsprite gGeomancyRedCellRaiseTemplate, ANIM_ATTACKER, 2, 0x14, 0x20, 0xffd0, 0x32, 0x1
createsprite gGeomancyGreenCellRaiseTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0xffda, 0x19, 0x1
createsprite gGeomancyBlueCellRaiseTemplate, ANIM_ATTACKER, 2, 0x20, 0x20, 0xffe4, 0x28, 0x1
@@ -8887,60 +8942,60 @@ GeomancyUnleash:
call GeomancyRageBuff
call GeomancyRageBuff
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x4D01
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x5, 0x0, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB(1, 8, 19)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 5, 0, RGB_RED
waitforvisualfinish
blendoff
clearmonbg ANIM_ATK_PARTNER
end
GeomancyRageBuff:
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 66, 0x0, 0x5, 0x0
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 66, 0x0, 0xfff6, 0xfff1
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x19
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 66, 0x0, 0xf, 0x5
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 66, 0x0, 0xffe7, 0x0
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 2, 0x0, 0x1e, 0x1e
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 2, 0x0, 0xffe5, 0x19
- delay 0x1
+ delay 1
createsprite gGeomancyYellowRageTemplate, ANIM_TARGET, 66, 0x0, 0x0, 0x8
- delay 0x1
+ delay 1
return
gBattleAnimMove_MagneticFlux::
loadspritegfx ANIM_TAG_THIN_RING @uproar
loadspritegfx ANIM_TAG_SPARK_2 @ElectricityEffect
loadspritegfx ANIM_TAG_SMALL_EMBER @yellow color
- createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_TARGET | F_PAL_ATK_SIDE), 2, 0, 9, 0x243B
+ createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_TARGET | F_PAL_ATK_SIDE), 2, 0, 9, RGB(27, 1, 9)
loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 0x12, 0x3
createvisualtask AnimTask_DefenseCurlDeformMon, 0x5
call MagneticFluxSparks1
- delay 0xA
+ delay 10
call MagneticFluxSparks2
- delay 0xA
+ delay 10
call MagneticFluxSparks1
- delay 0xA
+ delay 10
createsprite gMagneticFluxUproarTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
call MagneticFluxSparks2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_TARGET | F_PAL_ATK_SIDE), 2, 9, 0, 0x243B
+ createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_TARGET | F_PAL_ATK_SIDE), 2, 9, 0, RGB(27, 1, 9)
waitforvisualfinish
end
MagneticFluxSparks1:
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
return
MagneticFluxSparks2:
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
return
@@ -8949,13 +9004,13 @@ gBattleAnimMove_HappyHour::
monbg ANIM_ATTACKER
loopsewithpan SE_M_PAY_DAY, SOUND_PAN_TARGET, 0x8, 10
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xfffb, 0x0, 0xfffb, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x6, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0x13, 0x0, 0xa, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xffe9, 0x0, 0xfff6, 0x1
- delay 0x2
+ delay 2
call CoinShower
call CoinShower
waitforvisualfinish
@@ -8963,21 +9018,21 @@ gBattleAnimMove_HappyHour::
end
CoinShower:
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0x1c, 0x0, 0xa, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xfff6, 0x0, 0xfffb, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x6, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0x18, 0x0, 0xa, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xffe0, 0x0, 0xfff6, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0xffec, 0x0, 0xfff6, 0x1
- delay 0x2
+ delay 2
createsprite gHappyHourCoinShowerTemplate, ANIM_TARGET, 2, 0x1e, 0x0, 0xa, 0x1
- delay 0x2
+ delay 2
return
gBattleAnimMove_ElectricTerrain::
@@ -9019,17 +9074,34 @@ gBattleAnimMove_ElectricTerrain::
gBattleAnimMove_DazzlingGleam::
loadspritegfx ANIM_TAG_SPARKLE_2
loadspritegfx ANIM_TAG_BLUE_STAR
- createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 13, RGB_WHITE
- playsewithpan SE_M_TWISTER, SOUND_PAN_ATTACKER
- @call 0x081D56B3 -> middle of GrantingStarsEffect
+ loadspritegfx ANIM_TAG_IMPACT
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 0, 13, RGB(31, 25, 25)
+ loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 16, 3
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 12, -5, 0, 0, 32, 60
- delay 8
waitforvisualfinish
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 3, 0, 16, RGB_WHITE
- delay 0x4
- playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(31, 28, 28)
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 21, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 21, 1
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
+ delay 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
+ delay 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
+ delay 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
+ delay 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
+ delay 3
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
+ createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
waitforvisualfinish
- createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 13, 0, RGB_WHITE
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 13, 0, RGB(31, 25, 25)
waitforvisualfinish
clearmonbg 0x0
blendoff
@@ -9039,9 +9111,9 @@ gBattleAnimMove_Celebrate::
loadspritegfx ANIM_TAG_ITEM_BAG
createsprite gCelebrateBagTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
- delay 0x12
+ delay 18
playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
- delay 0x47
+ delay 71
loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER 0x16 0x3
end
@@ -9052,35 +9124,35 @@ gBattleAnimMove_HoldHands::
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 12, 6, 6, 3
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
- delay 0x8
+ delay 8
createsprite gHoldHandsHeartTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
waitforvisualfinish
createvisualtask AnimTask_HelpingHandAttackerMovement, 0x5
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0x0
createsprite gHelpingHandClapSpriteTemplate, ANIM_ATTACKER, 40, 0x1
- delay 0x13
+ delay 19
playsewithpan SE_M_ENCORE, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
- delay 0xe
+ delay 14
playsewithpan SE_M_ENCORE, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 5, 1
- delay 0x14
+ delay 20
playsewithpan SE_M_ENCORE, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 3, 0, 10, 1
createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATK_PARTNER, RGB_YELLOW, 12, 1, 1
@@ -9092,17 +9164,17 @@ gBattleAnimMove_BabyDollEyes::
loadspritegfx ANIM_TAG_OPENING_EYE @eye
setalpha 8, 8
monbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0xA, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 10, RGB_WHITE
waitforvisualfinish
createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0x0, 0x0, 0x1, 0x0
- delay 0x20
+ delay 32
playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ScaleMonAndRestore, 5, -5, -5, 10, ANIM_ATTACKER, 1
waitforvisualfinish
- delay 0xa
+ delay 10
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 9, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 9, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0xA, 0x0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 10, 0, RGB_WHITE
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -9116,10 +9188,10 @@ gBattleAnimMove_Nuzzle::
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x14
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0xffec, 0x14
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
createsprite gMagentaHeartSpriteTemplate, ANIM_ATTACKER, 3, 0x14, 0x14
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -9161,7 +9233,7 @@ gBattleAnimMove_Infestation::
loadspritegfx ANIM_TAG_SMALL_BUBBLES @circle particles
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x7320
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(0, 25, 28)
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 79, 1
loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 0x0, 0x4F
call InfestationVortex
@@ -9170,23 +9242,23 @@ gBattleAnimMove_Infestation::
call InfestationVortex
call InfestationVortex
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x7320
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(0, 25, 28)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
InfestationVortex:
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x1
- delay 0x1
+ delay 1
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x1
- delay 0x1
+ delay 1
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x1
- delay 0x1
+ delay 1
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x1
- delay 0x1
+ delay 1
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x1
- delay 0x1
+ delay 1
createsprite gInfestationBubbleTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, 0x1
- delay 0x1
+ delay 1
return
gBattleAnimMove_PowerUpPunch::
@@ -9210,14 +9282,14 @@ gBattleAnimMove_OblivionWing::
loadspritegfx ANIM_TAG_HYDRO_PUMP
loadspritegfx ANIM_TAG_ROUND_SHADOW
loadspritegfx ANIM_TAG_BLUE_STAR
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x289F @Pinkish Red
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0x0, 0xD, 0xD, 0x289F @Pinkish Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(31, 4, 10) @Pinkish Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 13, 13, RGB(31, 4, 10) @Pinkish Red
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xE, 0x0 @Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 14, RGB_BLACK @Black
waitforvisualfinish
- createsoundtask SoundTask_LoopSEAdjustPanning, 0x7, 0xf0, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5
+ createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
call OblivionWingBeam
call OblivionWingBeam
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 40, 1
@@ -9236,14 +9308,14 @@ gBattleAnimMove_OblivionWing::
visible ANIM_ATTACKER
call HealingEffect
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xE, 0x0, 0x0 @From black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 14, 0, RGB_BLACK @From black
waitforvisualfinish
end
OblivionWingBeam:
createsprite gOblivionWingBeamTemplate, ANIM_TARGET, 2, 0, -90, 0, 20, 0x15, 0x0
- delay 0x2
+ delay 2
createsprite gOblivionWingBeamTemplate, ANIM_TARGET, 2, 0, -90, 0, 20, 0x15, 0x0
- delay 0x2
+ delay 2
return
gBattleAnimMove_ThousandArrows::
@@ -9256,13 +9328,13 @@ gBattleAnimMove_ThousandArrows::
loadspritegfx ANIM_TAG_NEEDLE @sting
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
createsprite gThousandArrowsGreenChargeTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x18
+ delay 24
call ThousandArrowsHexes
call ThousandArrowsHexes
call ThousandArrowsHexes
@@ -9271,11 +9343,11 @@ gBattleAnimMove_ThousandArrows::
call ThousandArrowsHexes
call ThousandArrowsHexes
createsprite gThousandArrowsGreenDischargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenDischargeTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0, 0xfff0
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x30
+ delay 48
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 0x32
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 0x32
call ThousandArrowsDown
@@ -9283,7 +9355,7 @@ gBattleAnimMove_ThousandArrows::
call ThousandArrowsDown
call ThousandArrowsDown
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0xffff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_WHITEALPHA
waitforvisualfinish
clearmonbg ANIM_ATTACKER
blendoff
@@ -9291,45 +9363,45 @@ gBattleAnimMove_ThousandArrows::
ThousandArrowsHexes:
createsprite gThousandArrowsGreenHexTemplate, ANIM_TARGET, 2, 0x0, 0xfffc, 0xfff0
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenHexTemplate, ANIM_TARGET, 2, 0x0, 0x100D, 0xfff0
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenHexTemplate, ANIM_TARGET, 2, 0x0, 0x4, 0xfff4
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenHexTemplate, ANIM_TARGET, 2, 0x0, 0xfff0, 0xfff0
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
return
ThousandArrowsDown:
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0xdc, 0x3c
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x3c, 0x64
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x8c, 0x37
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0xb4, 0x32
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x14, 0x5a
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x5a, 0x5a
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0xa0, 0x3c
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x1e, 0x5a
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0x78, 0x3c
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gThousandArrowsGreenArrowTemplate, ANIM_TARGET, 2, 0x1, 0xc8, 0x28
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
return
@@ -9341,7 +9413,7 @@ gBattleAnimMove_ThousandWaves::
loadspritegfx ANIM_TAG_IMPACT @pound hits
monbg ANIM_ATK_PARTNER
setalpha 8, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
createsprite gThousandWavesGreenWheelTemplate, ANIM_ATTACKER, 2, 0x0
@@ -9355,110 +9427,110 @@ gBattleAnimMove_ThousandWaves::
loopsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET, 0x3, 0x15
call ThousandWavesRecover
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0xfff6, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffdd, 0x8, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffdd, 0xfff6, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0x8, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xf, 0xffd8, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xffe0, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x5, 0x27, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x19, 0xffec, 0xd
- delay 0x3
+ delay 3
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0xd
- delay 0x3
+ delay 3
createvisualtask AnimTask_AttackerStretchAndDisappear, 0x2
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x5, 0xffd8, 0xd
waitforvisualfinish
panse SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
- delay 0x4
+ delay 4
createvisualtask AnimTask_MoveHeatWaveTargets, 0x5
- delay 0xc
+ delay 12
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0xa, 0x900, 0x60, 0x1
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x5a, 0x800, 0x60, 0x1
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x32, 0xa00, 0x60, 0x1
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x14, 0x900, 0x60, 0x1
- delay 0x2
+ delay 2
call ThousandWavesRotatingImpact
call ThousandWavesRotatingImpact
waitforvisualfinish
createvisualtask AnimTask_ExtremeSpeedMonReappear, 0x2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0xffff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_WHITEALPHA
waitforvisualfinish
blendoff
clearmonbg ANIM_DEF_PARTNER
end
ThousandWavesRecover:
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x0, 0x28, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd8, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffec, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffd8, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffec, 0x1e, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x14, 0xffe2, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffec, 0xffe2, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x14, 0x1e, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0xffd8, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gThousandWavesGreenRecoverTemplate, ANIM_ATTACKER, 2, 0x28, 0x0, 0x10
- delay 0x2
+ delay 2
return
ThousandWavesRotatingImpact:
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x1c, 0x180, 0x32, 0x8, 0x32, 0x1 @1
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x46, 0x7c0, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x3
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x20, 0xf0, 0x28, 0xb, 0xffd2, 0x1 @2
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x0, 0xb00, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0x5, 0xfff4, 0x3
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x21, 0x1a0, 0x28, 0x4, 0x2a, 0x1 @3
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x3c, 0xa00, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0xfffa, 0x9, 0x3
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, 0x1 @4
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0xa, 0x900, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0xfffa, 0xfff4, 0x3
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, 0x1 @5
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x5a, 0x800, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0x5, 0x9, 0x3
createsprite gThousandWavesRotatingImpactTemplate, ANIM_TARGET, 2, 0x23, 0x21, 0x1d0, 0x32, 0xa, 0xffce, 0x1 @6
createsprite gThousandWavesGreenWaveTemplate, ANIM_ATTACKER, 40, 0x32, 0xa00, 0x60, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gThousandWavesPoundImpactTemplate, ANIM_TARGET, 2, 0x1, 0xfffa, 0x0, 0x3
return
@@ -9467,7 +9539,7 @@ gBattleAnimMove_LandsWrath::
loadspritegfx ANIM_TAG_WATER_ORB @whirl motion
loadspritegfx ANIM_TAG_SPARK_2 @yellow color
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xE, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 14, RGB_BLACK
waitforvisualfinish
call LandsWrathVortex
call LandsWrathVortex
@@ -9483,23 +9555,23 @@ gBattleAnimMove_LandsWrath::
waitbgfadein
waitforvisualfinish
call UnsetPsychicBg
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER
end
LandsWrathVortex:
playsewithpan SE_M_SACRED_FIRE2 SOUND_PAN_TARGET
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, 0x0
- delay 0x2
+ delay 2
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, 0x0
- delay 0x2
+ delay 2
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, 0x0
- delay 0x2
+ delay 2
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, 0x0
- delay 0x2
+ delay 2
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, 0x0
- delay 0x2
+ delay 2
createsprite gLandsWrathVortexTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, 0x0
- delay 0x2
+ delay 2
return
gBattleAnimMove_LightOfRuin::
@@ -9509,11 +9581,11 @@ gBattleAnimMove_LightOfRuin::
loadspritegfx ANIM_TAG_ELECTRICITY @discharge
loadspritegfx ANIM_TAG_PINK_PETAL @pink color
loadspritegfx ANIM_TAG_EXPLOSION @explosion
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 0xC, 0xC, 0x6DDE @Pink
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 12, 12, RGB(30, 14, 27) @Pink
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 20, 0, 2
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xF, 0x6B1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB(31, 24, 26)
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call LightOfRuinBeam
@@ -9543,24 +9615,24 @@ gBattleAnimMove_LightOfRuin::
call LightOfRuinBeam
call LightOfRuinBeam
call LightOfRuinBeam
- delay 0x20
+ delay 32
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gLightOfRuinPinkDischargeTemplate, ANIM_ATTACKER, 2, 0x1, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gLightOfRuinPinkDischargeTemplate, ANIM_ATTACKER, 2, 0x1, 0xfff0, 0xfff0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
createsprite gLightOfRuinPinkExplosionTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x1
- delay 0x10
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7FFF
+ delay 16
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_WHITE
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x1, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 1, 0, 0, RGB_BLACK
waitforvisualfinish
end
LightOfRuinBeam:
createsprite gLightOfRuinPinkOrbsTemplate, ANIM_TARGET, 2
createsprite gLightOfRuinPinkOrbsTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
return
gBattleAnimMove_OriginPulse::
@@ -9576,9 +9648,9 @@ gBattleAnimMove_OriginPulse::
waitbgfadein
createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
- delay 0x10
+ delay 16
createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0x10
+ delay 16
createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
playsewithpan SE_INTRO_BLAST, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -9588,12 +9660,12 @@ gBattleAnimMove_OriginPulse::
createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0x80
createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0xaa
createsprite gOriginPulseOrbTemplate, ANIM_ATTACKER, 2, 0xd5
- delay 0x35
+ delay 53
createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
- delay 0x10
+ delay 16
createsprite gOriginPulseRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
waitforvisualfinish
- delay 0x2F
+ delay 47
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xFF90, 0x10 @up
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x5F, 0xFF9D, 0x10 @upper right
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x73, 0x0, 0x10 @right
@@ -9602,7 +9674,7 @@ gBattleAnimMove_OriginPulse::
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xFFB0, 0x43, 0x10 @lower left
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xFF60, 0x0, 0x10 @left
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xFFAA, 0xFF94, 0x10 @upper left
- delay 0x5
+ delay 5
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x2D, 0xFF9D, 0x10 @between up and upper right
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xDF, 0xFF9D, 0x10 @between right and upper right
createsprite gOriginPulseOrbInwardTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x9F, 0x37, 0x10 @between right and lower right
@@ -9617,17 +9689,17 @@ gBattleAnimMove_OriginPulse::
createsprite gOriginPulseBasicSplatTemplate, ANIM_TARGET, 3, 0xffb0, 0xfff0, 0x1, 0x1
stopsound
playsewithpan SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gOriginPulseBlueImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gOriginPulseBasicSplatTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gOriginPulseBlueImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gOriginPulseBasicSplatTemplate, ANIM_TARGET, 3, 0xffc0, 0x14, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gOriginPulseBlueImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gOriginPulseBasicSplatTemplate, ANIM_TARGET, 3, 0xffe0, 0x5, 0x1, 0x1
waitsound
call UnsetPsychicBg
@@ -9638,7 +9710,7 @@ gBattleAnimMove_OriginPulse::
gBattleAnimMove_PrecipiceBlades::
loadspritegfx ANIM_TAG_LARGE_SPIKE
loadspritegfx ANIM_TAG_FIRE_PLUME
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, 0x159F @Blood orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_LARGE_SPIKE, 0, 10, 10, RGB(31, 12, 5) @Blood orange
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
setalpha 12, 8
@@ -9659,21 +9731,21 @@ PrecipiceBladesPlayer:
delay 5
createsprite gPrecipiceBladesSpikeTemplate, ANIM_ATTACKER, 5, ANIM_ATTACKER, -10, 17, 120, 0x0
PrecipiceBladesContinue:
- delay 0x10
+ delay 16
createsprite gPrecipiceBladesPlumeTemplate, ANIM_TARGET, 2, -15, 18, ANIM_TARGET
createsprite gPrecipiceBladesPlumeTemplate, ANIM_TARGET, 2, -15, 18, ANIM_DEF_PARTNER
- delay 0x20
+ delay 32
createsprite gPrecipiceBladesPlumeTemplate, ANIM_TARGET, 2, 15, 18, ANIM_TARGET
createsprite gPrecipiceBladesPlumeTemplate, ANIM_TARGET, 2, 15, 18, ANIM_DEF_PARTNER
- delay 0x20
+ delay 32
stopsound
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
createsprite gPrecipiceBladesLargeSpikeTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, -25, 40, 0x0
createsprite gPrecipiceBladesLargeSpikeTemplate, ANIM_TARGET, 2, ANIM_DEF_PARTNER, 0, -25, 40, 0x0
- delay 0x6
+ delay 6
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, -20, 0, 6, 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, ANIM_DEF_PARTNER, -20, 0, 6, 1
- delay 0x22
+ delay 34
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x6
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 2, ANIM_DEF_PARTNER, 0x0, 0x6
waitforvisualfinish
@@ -9703,13 +9775,13 @@ gBattleAnimMove_DragonAscent::
invisible ANIM_ATTACKER
createsprite gDragonAscentFlyUpTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x400, 0x24, 0x15, 0x1, ANIM_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 4, 0, 14, RGB(21, 31, 27)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 4, 0, 14, RGB(21, 31, 27)
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
waitforvisualfinish
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createvisualtask AnimTask_StartSlidingBg, 0x5, -7304, -784, 1, -1
delay 2
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 0, 14, 0, RGB(21, 31, 27)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 0, 14, 0, RGB(21, 31, 27)
waitforvisualfinish
delay 1
monbg ANIM_DEF_PARTNER
@@ -9721,7 +9793,7 @@ gBattleAnimMove_DragonAscent::
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -32, 0, 0, 3
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 6, 0, 12, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 2, 16, 0, RGB(26, 31, 0)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 2, 16, 0, RGB(26, 31, 0)
waitforvisualfinish
delay 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
@@ -9736,19 +9808,19 @@ gBattleAnimMove_HyperspaceFury::
loadspritegfx ANIM_TAG_HOOPA_RING @Hoopa Ring
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_POISON_BUBBLE
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xA, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 10, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
createsprite gHyperspaceFuryRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
- delay 0x5
+ delay 5
createsprite gHyperspaceFuryRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
- delay 0x5
+ delay 5
createsprite gHyperspaceFuryRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
- delay 0x5
+ delay 5
createsprite gHyperspaceFuryRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
- delay 0x5
+ delay 5
createsprite gHyperspaceFuryRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
- delay 0x15
+ delay 21
invisible ANIM_ATTACKER
waitforvisualfinish
fadetobg BG_HYPERSPACE_FURY
@@ -9759,42 +9831,42 @@ gBattleAnimMove_HyperspaceFury::
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 32, 1
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe0, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x16, 0xffea, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x1e, 0x0, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createvisualtask AnimTask_IsTargetSameSide, 0x2
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x14, 0x14, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x1c, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffed, 0x13, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffe5, 0x0, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffee, 0xffee, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe7, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x11, 0xffef, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x17, 0x0, 0x10
call HyperspaceFuryRandomImpact
- delay 0x2
+ delay 2
createsprite gHyperspaceFuryHandTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x10, 0x10, 0x10
call HyperspaceFuryRandomImpact
- delay 0x7
+ delay 7
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
visible ANIM_ATTACKER
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 0, 3, 32, 1
@@ -9803,15 +9875,15 @@ gBattleAnimMove_HyperspaceFury::
call UnsetPsychicBg
waitforvisualfinish
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB_BLACK
end
HyperspaceFuryRandomImpact:
createsprite gHyperspaceFuryImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
@@ -9823,19 +9895,19 @@ gBattleAnimMove_ShoreUp::
loadspritegfx ANIM_TAG_BLUE_STAR @heal2
playsewithpan SE_M_SANDSTORM, 0x0
createvisualtask AnimTask_LoadSandstormBackground, 0x5, 0x0
- delay 0x10
+ delay 16
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0xa, 0x900, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x5a, 0x800, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x32, 0xa00, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x14, 0x900, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x46, 0x7c0, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0xb00, 0x60, 0x0
- delay 0xa
+ delay 10
createsprite gFlyingSandCrescentSpriteTemplate, ANIM_ATTACKER, 40, 0x3c, 0xa00, 0x60, 0x0
call HealingEffect
waitforvisualfinish
@@ -9851,21 +9923,21 @@ gBattleAnimMove_FirstImpression::
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 5, 1
createvisualtask AnimTask_StretchTargetUp, 0x3
waitforvisualfinish
- delay 0x19
+ delay 25
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x6
waitforvisualfinish
monbg ANIM_TARGET @This is placed here on purpose (to not ruin astonishs animation)
- delay 0x1
+ delay 1
createsprite gFirstImpressionPoundTemplate, ANIM_ATTACKER, 4, 0xfff6, 0x0, 0x1, 0x0
loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET 0xA 0x2
- delay 0x1
+ delay 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -28, 0, 0, 3
waitforvisualfinish
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
waitforvisualfinish
- delay 0xa
+ delay 10
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x6
- delay 0x5
+ delay 5
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x6
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -9879,19 +9951,19 @@ gBattleAnimMove_BanefulBunker::
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER 0x10
createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0x0, 0x5a
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gBanefulBunkerPoisonBubbleTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
@@ -9952,11 +10024,11 @@ gBattleAnimMove_DarkestLariat::
end
DarkestLariatImpact:
createsprite gDarkestLariatImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0xfff4, 0x1, 0x1
- delay 0x8
+ delay 8
createsprite gDarkestLariatImpactTemplate, ANIM_ATTACKER, 3, 0xfff4, 0x8, 0x1, 0x1
- delay 0x8
+ delay 8
createsprite gDarkestLariatImpactTemplate, ANIM_ATTACKER, 3, 0xc, 0x0, 0x1, 0x1
- delay 0x8
+ delay 8
return
gBattleAnimMove_SparklingAria::
@@ -9965,19 +10037,19 @@ gBattleAnimMove_SparklingAria::
loadspritegfx ANIM_TAG_HYDRO_PUMP @hydro pump
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xE, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 14, RGB_BLACK
waitforvisualfinish
createsprite gSparklingAriaBlueChargeTemplate, ANIM_ATTACKER, 2, 0x0
call SparklingAriaCharge
call SparklingAriaCharge
call SparklingAriaCharge
waitforvisualfinish
- delay 0x1E
+ delay 30
playsewithpan SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER
call SparklingAriaRain
call SparklingAriaRain
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xE, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 14, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATTACKER
blendoff
@@ -9986,69 +10058,69 @@ SparklingAriaRain:
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0xdc, 0x3c
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaBubbleRainTemplate, ANIM_TARGET, 2, 0x1, 0x3c, 0x64
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0x8c, 0x37
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0xb4, 0x32
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0x14, 0x5a
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaBubbleRainTemplate, ANIM_TARGET, 2, 0x1, 0x5a, 0x5a
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0xa0, 0x3c
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0x1e, 0x5a
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaRainTemplate, ANIM_TARGET, 2, 0x1, 0x78, 0x3c
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
createsprite gSparklingAriaBubbleRainTemplate, ANIM_TARGET, 2, 0x1, 0xc8, 0x28
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 3, 0, 6, 1
- delay 0x2
+ delay 2
return
SparklingAriaCharge:
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_ATTACKER
createsprite gSparklingAriaBubblesTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
return
gBattleAnimMove_IceHammer::
@@ -10057,11 +10129,11 @@ gBattleAnimMove_IceHammer::
loadspritegfx ANIM_TAG_ECLIPSING_ORB @gray color
loadspritegfx ANIM_TAG_BLACK_SMOKE @smoke
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
- createsprite gIceHammerPunchStompTemplate, ANIM_TARGET, 3, 0x0, 0xffe0, 0xf
- delay 0x13
+ createsprite gIceHammerPunchStompTemplate, ANIM_TARGET, 3, 0, -32, 15
+ delay 19
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_SquishTarget, 0x2
createsprite gIceHammerSmokesTemplate, ANIM_TARGET, 4, 0x0, 0xfff4, 0x68, 0x0, 0x4b
@@ -10077,7 +10149,7 @@ gBattleAnimMove_IceHammer::
createsprite gIceHammerSmokesTemplate, ANIM_TARGET, 4, 0x0, 0x12, 0x50, 0x0, 0x4b
createsprite gIceHammerSmokesTemplate, ANIM_TARGET, 4, 0x0, 0x12, 0x48, 0x1, 0x4b
call IceCrystalEffectShort
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
end
@@ -10097,27 +10169,27 @@ gBattleAnimMove_FloralHealing::
playsewithpan SE_M_TWISTER, 0x0
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x46, 0x1, 0x40
clearmonbg ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3c, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3a, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x5a, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0x0, 0x40 @2
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x5f, 0x1, 0x50
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x4b, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x55, 0x0, 0x78
- delay 0x2
+ delay 2
loopsewithpan SE_M_POISON_POWDER, SOUND_PAN_TARGET, 0x12, 0xa
monbg ANIM_TARGET
call FloralHealingSpores
@@ -10126,7 +10198,7 @@ gBattleAnimMove_FloralHealing::
waitforvisualfinish
playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 16, 0xfff1, 0x0, 0x1, 0x0, 0x20, 0x3c, 0x1
- delay 0x8
+ delay 8
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 16, 0xc, 0xfffb, 0x1, 0x0, 0x20, 0x3c, 0x1
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -10134,80 +10206,80 @@ gBattleAnimMove_FloralHealing::
FloralHealingSpores:
createsprite gFloralHealingFlowerTemplate, ANIM_ATTACKER, 2, 0x0, 0xffec, 0x55, 0x50, 0x0
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x46, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3c, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3a, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x5a, 0x0, 0x40
- delay 0x3
+ delay 3
createsprite gFloralHealingFlowerTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0xaa, 0x50, 0x0
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x5f, 0x1, 0x50
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x4b, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x55, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x46, 0x1, 0x40
- delay 0x3
+ delay 3
createsprite gFloralHealingFlowerTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff1, 0x0, 0x50, 0x0
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3c, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0x1, 0x40
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x3a, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x64, 0x0, 0x78
- delay 0x2
+ delay 2
createsprite gFloralHealingWindLeavesTemplate, ANIM_ATTACKER, 2, 0x5a, 0x0, 0x40
- delay 0x2
+ delay 2
createsprite gSweetScentPetalSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0x0, 0x40
- delay 0x3
+ delay 3
return
CIRCLES_LEAVES:
createsprite gFloralHealingOrbsTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, 0x0
- delay 0x2
+ delay 2
createsprite gFloralHealingLeavesTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, 0x0
- delay 0x2
+ delay 2
createsprite gFloralHealingOrbsTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, 0x0
- delay 0x2
+ delay 2
createsprite gFloralHealingLeavesTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, 0x0
- delay 0x2
+ delay 2
createsprite gFloralHealingOrbsTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, 0x0
- delay 0x2
+ delay 2
createsprite gFloralHealingLeavesTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, 0x0
- delay 0x2
+ delay 2
return
gBattleAnimMove_HighHorsepower::
loadspritegfx ANIM_TAG_IMPACT @hit
loadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST @horseshoe
monbg ANIM_TARGET
- delay 0x2
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x10, 0x0
+ delay 2
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 16, RGB_BLACK
setalpha 12, 8
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
createsprite gHighHorsepowerHorseshoeTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x32
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x7, 0x7fff
- delay 0x32
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 7, RGB_WHITE
+ delay 50
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
call SetImpactBackground
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x0, 0x7fff
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x1f, 0x3, 0x1, 0x0, 0x8, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 0, RGB_WHITE
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 1, RGB_BLACK, 8, RGB_BLACK, 0
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
- delay 0x2
+ delay 2
restorebg
waitbgfadein
end
@@ -10228,7 +10300,7 @@ gBattleAnimMove_StrengthSap::
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffce, 0xffd8, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffd8, 0x28, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x32, 0xffce, 0x6
- delay 0x2
+ delay 2
createsprite gStrengthSapRedSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x1, 0x0
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x32, 0xffe2, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x3c, 0xa, 0x6
@@ -10236,7 +10308,7 @@ gBattleAnimMove_StrengthSap::
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x0, 0xffd8, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffc4, 0x14, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffc4, 0xffe2, 0x6
- delay 0x2
+ delay 2
createsprite gStrengthSapRedSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x1, 0x0
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffce, 0x32, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0xffc4, 0x14, 0x6
@@ -10244,36 +10316,36 @@ gBattleAnimMove_StrengthSap::
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x14, 0xffc4, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x32, 0xffce, 0x6
createsprite gStrengthSapRedInwardTemplate, ANIM_ATTACKER, 4, 0x23, 0x28, 0x6
- delay 0x2
+ delay 2
createsprite gStrengthSapRedSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x1, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x3, 0x07FD
- delay 0x5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 3, RGB(29, 31, 1)
+ delay 5
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0x0, 0x5, 0x8, 0x1a
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0xa, 0xfffb, 0xfff8, 0x1a
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0xfffb, 0xf, 0x10, 0x21
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0x0, 0xfff1, 0xfff0, 0x24
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0x0, 0x5, 0x8, 0x1a
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0xa, 0xfffb, 0xfff8, 0x1a
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0xfff6, 0x14, 0x14, 0x27
- delay 0x4
+ delay 4
playsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET
createsprite gStrengthSapAbsorbTemplate, ANIM_ATTACKER, 3, 0x5, 0xffee, 0xffec, 0x23
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x3, 0x0, 0x07FD
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 3, 0, RGB(29, 31, 1)
loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 0x10, 0x3
call GrantingStarsEffect
waitforvisualfinish
@@ -10290,7 +10362,7 @@ SolarBladeUnleash:
loadspritegfx ANIM_TAG_SUNLIGHT @sun rays
monbg ANIM_ATTACKER
setalpha 13, 3
- createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 6, RGB_WHITE
waitforvisualfinish
playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 16, 6, 1, 4
@@ -10299,15 +10371,15 @@ SolarBladeUnleash:
call SolarBladeSunRays
call SolarBladeSunRays
call SolarBladeSunRays
- createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, 0x2715, 0x2, 0x2, 0x7ff2, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
waitforvisualfinish
call SetSolarBeamBg
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSolarBladeImpactTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1
- delay 0x2
+ delay 2
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE
waitforvisualfinish
call UnsetPsychicBg
clearmonbg ANIM_ATTACKER
@@ -10315,7 +10387,7 @@ SolarBladeUnleash:
end
SolarBladeSunRays:
createsprite gSunlightRaySpriteTemplate, ANIM_ATTACKER, 40
- delay 0x6
+ delay 6
return
gBattleAnimMove_Leafage::
@@ -10326,7 +10398,7 @@ gBattleAnimMove_Leafage::
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0x14, 0x1
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0xffec, 0x1
createsprite gRazorLeafCutterSpriteTemplate, ANIM_TARGET, 3, 0x14, 0xfff6, 0x14, 0x0, 0x16, 0x0, 0x1
- delay 0x14
+ delay 20
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gLeafageImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x2
waitforvisualfinish
@@ -10341,7 +10413,7 @@ gBattleAnimMove_Spotlight::
waitforvisualfinish
playsewithpan SE_CONTEST_ICON_CHANGE, SOUND_PAN_ATTACKER
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff8
- delay 0x40
+ delay 64
createvisualtask AnimTask_HardwarePaletteFade, 0x2, 0xf8, 0x3, 0xa, 0x0, 0x1
waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 0x2
@@ -10350,11 +10422,11 @@ gBattleAnimMove_Spotlight::
gBattleAnimMove_ToxicThread::
loadspritegfx ANIM_TAG_STRING
loadspritegfx ANIM_TAG_WEB_THREAD
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 0xA, 0xA, 0x6038 @Purple
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0x0, 0xA, 0xA, 0x6038 @Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_STRING, 0, 10, 10, RGB(24, 1, 24) @Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WEB_THREAD, 0, 10, 10, RGB(24, 1, 24) @Purple
monbg ANIM_DEF_PARTNER
- delay 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x9, 0x0
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 9, RGB_BLACK
waitforvisualfinish
loopsewithpan SE_M_STRING_SHOT, SOUND_PAN_ATTACKER, 0x9, 0x6
call SpiderWebThread
@@ -10378,15 +10450,15 @@ gBattleAnimMove_ToxicThread::
waitforvisualfinish
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
createsprite gToxicThreadString, ANIM_TARGET, 2, 0x0, 0xa
- delay 0x4
+ delay 4
createsprite gToxicThreadString, ANIM_TARGET, 2, 0x0, 0xfffe
- delay 0x4
+ delay 4
createsprite gToxicThreadString, ANIM_TARGET, 2, 0x0, 0x16
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
- delay 0x1
+ delay 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x9, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 9, 0, RGB_BLACK
end
gBattleAnimMove_LaserFocus::
@@ -10394,14 +10466,14 @@ gBattleAnimMove_LaserFocus::
loadspritegfx ANIM_TAG_OPENING_EYE @eyes
loadspritegfx ANIM_TAG_LEER @leer
monbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
createsprite gLaserFocusRedEyesTemplate, ANIM_ATTACKER, 5, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0xfff4
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
@@ -10409,54 +10481,54 @@ gBattleAnimMove_LaserFocus::
gBattleAnimMove_GearUp::
loadspritegfx ANIM_TAG_GEAR
loadspritegfx ANIM_TAG_SPARK_2 @sparks
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x039B
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB(27, 28, 0)
createsprite gGearUpGearsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0xF
+ delay 15
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gGearUpGearsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
- delay 0xF
+ delay 15
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gGearUpGearsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0xF
+ delay 15
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
call GearUpSparks
call GearUpSparks
call GearUpSparks
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x039B
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB(27, 28, 0)
waitforvisualfinish
end
GearUpSparks:
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0xF
+ delay 15
playsewithpan SE_ROULETTE_BALL2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
- delay 0xF
+ delay 15
return
gBattleAnimMove_ThroatChop::
@@ -10467,28 +10539,28 @@ gBattleAnimMove_ThroatChop::
splitbgprio ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
- createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0x0, 0x0, 0x0, 0xa, 0x1, 0x3, 0x0
+ createsprite gKarateChopSpriteTemplate, ANIM_ATTACKER, 2, -16, 0, 0, 0, 10, 1, 3, 0
waitforvisualfinish
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
- delay 0x3
+ delay 3
createsprite gThroatChopRedImpactTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x2
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
waitforvisualfinish
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -10507,18 +10579,18 @@ PollenPuffOpponent:
loadspritegfx ANIM_TAG_ORBS @hit
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
clearmonbg ANIM_ATTACKER
@@ -10533,7 +10605,7 @@ PollenPuffOpponent:
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x10, 0x1e, 0x110, 0x28, 0x0
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0xB0, 0x28, 0x0
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0x100, 0x28, 0x0
- delay 0x1
+ delay 1
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
createsprite gPollenPuffSporeTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x0, 0x0, 0x19, 0xffe0
waitforvisualfinish
@@ -10542,15 +10614,15 @@ PollenPuffOpponent:
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0x0, 0xFFE0, 0x10 @up
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0xFFEE, 0xFFEE, 0x10 @upperleft
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0x0, 0x1C, 0x10 @down
- delay 0x4
+ delay 4
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0xFFE5, 0x0, 0x10 @left
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0x14, 0x14, 0x10 @lowerright
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0xFFED, 0x13, 0x10 @lowerleft
- delay 0x4
+ delay 4
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0x1E, 0x0, 0x10 @right
createsprite gPollenPuffImpactTemplates, ANIM_TARGET, 2, 0x1, 0x1, 0x16, 0xFFEA, 0x10 @upperright
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -10563,18 +10635,18 @@ PollenPuffAlly:
loadspritegfx ANIM_TAG_SPORE @ball
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0xD
+ delay 13
createsprite gPollenPuffPinkStarTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER
clearmonbg ANIM_ATTACKER
@@ -10590,21 +10662,21 @@ PollenPuffAlly:
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x10, 0x1e, 0x120, 0x28, 0x0
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0x90, 0x28, 0x0
createsprite gPollenPuffYellowSparkleTemplate, ANIM_TARGET, 4, 0xa, 0x0, 0x8, 0x1e, 0x110, 0x28, 0x0
- delay 0x1
+ delay 1
createsprite gPollenPuffSporeTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x0, 0x0, 0x19, 0xffe0
waitforvisualfinish
unloadspritegfx ANIM_TAG_SPARKLE_2 @stars
loadspritegfx ANIM_TAG_BLUE_STAR @heal
playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER
createsprite gPollenPuffHealTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0x1, 0x0
- delay 0x7
+ delay 7
createsprite gPollenPuffHealTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xa, 0x1, 0x0
- delay 0x7
+ delay 7
createsprite gPollenPuffHealTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xfff1, 0x1, 0x0
- delay 0x7
+ delay 7
createsprite gPollenPuffHealTemplate, ANIM_ATTACKER, 2, 0xa, 0xfffb, 0x1, 0x0
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x1, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 1, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -10619,14 +10691,14 @@ gBattleAnimMove_AnchorShot::
waitforvisualfinish
createsprite gAnchorShotAnchorTemplate, ANIM_ATTACKER, 3, 0x0, 0xffe0, 0xf
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
- delay 0x25
+ delay 37
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
waitforvisualfinish
loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER 0x1c 0x2
createsprite gAnchorShotChainTemplate, ANIM_TARGET, 2, 0xfff0, 0xfff0
- delay 0x4
+ delay 4
createsprite gAnchorShotChainTemplate, ANIM_TARGET, 2, 0xfff0, 0x0
- delay 0x4
+ delay 4
createsprite gAnchorShotChainTemplate, ANIM_TARGET, 2, 0xfff0, 0x10
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -10681,18 +10753,18 @@ gBattleAnimMove_Lunge::
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 3, 0, 240, 0
loopsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER, 0xe, 0xa
createsprite gLungeGreenChargeTemplate, ANIM_ATTACKER, 2
- delay 0x6e
- delay 0x3e
+ delay 110
+ delay 62
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
- delay 0x15
+ delay 21
clearmonbg ANIM_ATK_PARTNER
invisible ANIM_ATTACKER
waitforvisualfinish
playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER
createsprite gLungeGreenBubbleTemplate, ANIM_TARGET, 2, 0xa, 0x0, 0x0, 0x0, 0x19, 0xffe0
- delay 0xF
+ delay 15
monbg ANIM_DEF_PARTNER
- delay 0x1
+ delay 1
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x46, 0x0, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x28, 0x28, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xa, 0xffc4, 0x6
@@ -10700,14 +10772,14 @@ gBattleAnimMove_Lunge::
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffd8, 0x28, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x32, 0xffce, 0x6
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
- delay 0x2
+ delay 2
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x32, 0xffe2, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x3c, 0xa, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x3c, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0xffd8, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffc4, 0x14, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffc4, 0xffe2, 0x6
- delay 0x2
+ delay 2
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffce, 0x32, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffc4, 0x14, 0x6
createsprite gTealAlertSpriteTemplate, ANIM_ATTACKER, 4, 0xffd8, 0xffd8, 0x6
@@ -10728,38 +10800,38 @@ gBattleAnimMove_FireLash::
splitbgprio_foes ANIM_TARGET
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 6
- delay 0x4
+ delay 4
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 8, 1
createvisualtask AnimTask_BlendMonInAndOut, 3, ANIM_TARGET, RGB_RED, 12, 1, 1
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
loadspritegfx ANIM_TAG_SLASH
createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 0x1, 0xfff8, 0x0
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x8, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
- delay 0x7
+ delay 7
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x9
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
@@ -10773,21 +10845,21 @@ gBattleAnimMove_PowerTrip::
monbg ANIM_DEF_PARTNER
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call PowerTripBuffUp
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_BLACK
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call PowerTripBuffUp
- delay 0x8
+ delay 8
call PowerTripBuffUp
waitforvisualfinish
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createsprite gPowerTripImpactTemplate, ANIM_ATTACKER, 2, 0xFFF5, 0xA, 0x1, 0x2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x5
+ delay 5
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createsprite gPowerTripImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0xFFF5, 0x1, 0x2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x5
+ delay 5
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createsprite gPowerTripImpactTemplate, ANIM_ATTACKER, 2, 0xA, 0x0, 0x1, 0x2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
@@ -10796,13 +10868,13 @@ gBattleAnimMove_PowerTrip::
end
PowerTripBuffUp:
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -10817,49 +10889,49 @@ gBattleAnimMove_BurnUp::
waitbgfadeout
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xA00, 0x0, 0x1, 0xffff
waitbgfadein
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x5, 0x1c
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 5, RGB(28, 0, 0)
waitforvisualfinish
createvisualtask AnimTask_AllocBackupPalBuffer, 0x5
waitforvisualfinish
createvisualtask AnimTask_CopyPalUnfadedToBackup, 0x5, 0x0, 0x1
- delay 0x1
+ delay 1
createvisualtask AnimTask_CopyPalFadedToUnfaded, 0x5, 0x0
- delay 0x1
+ delay 1
loopsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER 0x9 0x2
createvisualtask AnimTask_CopyPalUnfadedToBackup, 0x5, 0x1, 0x0
- delay 0x1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x0, 0xd, 0x1c
+ delay 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 13, RGB(28, 0, 0)
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 2, 0, 15, 1
waitforvisualfinish
- delay 0x1E
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1f, 0x8
+ delay 30
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
waitforvisualfinish
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createsprite gBurnUpRedYawnTemplate, ANIM_TARGET, 0, 0x0, 0x0, 0x0, 0x0, 0x1e, 0x0
- delay 0x1
+ delay 1
createvisualtask AnimTask_CopyPalFadedToUnfaded, 0x5, 0x1
- delay 0x1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0x0, 0xd, 0x4a52
+ delay 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 0, 13, RGB(18, 18, 18)
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 3, 0, 15, 1
- delay 0xF
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x0, 0xC, 0x1C
- delay 0x1
+ delay 15
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 12, RGB(28, 0, 0)
+ delay 1
createvisualtask AnimTask_CopyPalUnfadedFromBackup, 0x5, 0x0, 0x1
- delay 0x1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x5, 0x0, 0x1c
- delay 0x1
+ delay 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 5, 0, RGB(28, 0, 0)
+ delay 1
createvisualtask AnimTask_CopyPalUnfadedFromBackup, 0x5, 0x1, 0x0
- delay 0x1
+ delay 1
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 2, 0, 15, 1
call FireSpreadEffect
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0xd, 0x0, 0x4a52
- delay 0x1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 13, 0, RGB(18, 18, 18)
+ delay 1
createvisualtask AnimTask_FreeBackupPalBuffer, 0x5
- delay 0x1
+ delay 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0xC, 0x0, 0x1C
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 12, 0, RGB(28, 0, 0)
waitforvisualfinish
call UnsetPsychicBg
clearmonbg ANIM_DEF_PARTNER
@@ -10872,9 +10944,9 @@ gBattleAnimMove_SpeedSwap::
loadspritegfx ANIM_TAG_ORBS @circle
monbg ANIM_TARGET
panse SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 0xfd, 0x0
- delay 0xf
+ delay 15
createsprite gSpeedSwapCircleTemplate, ANIM_TARGET, 2, 0xfff4, 0x18
- delay 0x5
+ delay 5
createsprite gSpeedSwapRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x1, 0x0
createsprite gSpeedSwapOrbTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xFFE0, 0x10
createsprite gSpeedSwapOrbTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x16, 0xFFEA, 0x10
@@ -10911,7 +10983,7 @@ gBattleAnimMove_SmartStrike::
createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 0x2
createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 0x3
createsprite gLockOnMoveTargetSpriteTemplate, ANIM_ATTACKER, 40, 0x4
- delay 0x78
+ delay 120
setarg 0x7 0xffff
waitforvisualfinish
monbg ANIM_DEF_PARTNER
@@ -10919,7 +10991,6 @@ gBattleAnimMove_SmartStrike::
setalpha 12, 8
call SonicBoomProjectile
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 10, 1
- loadspritegfx ANIM_TAG_FLASH_CANNON_BALL
createsprite gSmartStrikeImpactTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x8, 0x1, 0x0
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
createsprite gSmartStrikeGemTemplate, ANIM_TARGET, 2, 0x1, 0x1, 0x0, 0xffe8, 0xa
@@ -10934,7 +11005,6 @@ gBattleAnimMove_SmartStrike::
clearmonbg ANIM_DEF_PARTNER
blendoff
waitforvisualfinish
- clearmonbg ANIM_ATTACKER
blendoff
waitforvisualfinish
end
@@ -10948,7 +11018,7 @@ gBattleAnimMove_Purify::
setalpha 12, 8
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
createsprite gPurifyWhiteBallTemplate, ANIM_ATTACKER, 2, 0x14, 0xfff8, 0xfff8, 0xfff8, 0x14, 0xffe0
- delay 0x13
+ delay 19
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
createsprite gPurifySmokeTemplate, ANIM_TARGET, 4, 0x0, 0xfff4, 0x68, 0x0, 0x4b
createsprite gPurifySmokeTemplate, ANIM_TARGET, 4, 0x0, 0xfff4, 0x48, 0x1, 0x4b
@@ -10974,25 +11044,25 @@ gBattleAnimMove_RevelationDance::
loadspritegfx ANIM_TAG_AIR_WAVE @sonicboom
loadspritegfx ANIM_TAG_THIN_RING @ring
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xF, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gRevelationDanceYellowOrbsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0x10, 0xffe8, 0x8, 0x64
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xffe8, 0x8, 0x64
- delay 0xf
+ delay 15
createsprite gRevelationDanceYellowOrbsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0x20, 0xffe8, 0x8, 0x64
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe8, 0x8, 0x64
- delay 0xf
+ delay 15
createsprite gRevelationDanceYellowOrbsTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x8, 0x8c
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0x18, 0xffe8, 0x8, 0x64
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0xffe8, 0xffe8, 0x8, 0x64
- delay 0x1e
+ delay 30
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0x10, 0xffe8, 0x0, 0x64
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xffe8, 0x0, 0x64
- delay 0x1e
+ delay 30
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0x14, 0xfff0, 0xe, 0x50
createsprite gRevelationDanceYellowFlowerTemplate, ANIM_ATTACKER, 2, 0xffec, 0xfff2, 0x10, 0x50
@@ -11017,7 +11087,7 @@ gBattleAnimMove_RevelationDance::
createsprite gRevelationDanceYellowDispersalTemplate, ANIM_TARGET, 1, 0x0, 0xa, 0x70, 0xff80, 0x28
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xF, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 15, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
end
@@ -11039,102 +11109,102 @@ gBattleAnimMove_CoreEnforcer::
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gCoreEnforcerBlueRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
waitforvisualfinish
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
waitforvisualfinish
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gCoreEnforcerYellowRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
waitforvisualfinish
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
waitforvisualfinish
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gCoreEnforcerGreenRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
waitforvisualfinish
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerBlueSparkTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gCoreEnforcerGreenChargeTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
- delay 0x5
+ delay 5
createsprite gCoreEnforcerCircleChargeTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
waitforvisualfinish
unloadspritegfx ANIM_TAG_SPARK_2 @yellow color
@@ -11148,10 +11218,10 @@ gBattleAnimMove_CoreEnforcer::
loadspritegfx ANIM_TAG_SNORE_Z
loadspritegfx ANIM_TAG_EXPLOSION
clearmonbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 0xD, 0xD, 0x079F @Yellow
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 0xA, 0xA, 0x7501 @Royal Blue
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 0xA, 0xA, 0x0688 @Green
- delay 0x10
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 13, 13, RGB(31, 28, 1) @Yellow
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 10, 10, RGB(1, 8, 29) @Royal Blue
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SNORE_Z, 0, 10, 10, RGB(8, 20, 1) @Green
+ delay 16
monbg ANIM_TARGET
createvisualtask AnimTask_CreateSmallSolarBeamOrbs, 0x5
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
@@ -11159,79 +11229,79 @@ gBattleAnimMove_CoreEnforcer::
createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 65, 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x0
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfff5, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfffa, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xffff, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x5, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xA, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xF, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x14, 0xffe2, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xF, 0xffe7, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x2
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xC, 0xffea, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x9, 0xffed, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x6, 0xfff0, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x3, 0xfff3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x3
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x0, 0xfff6, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfffc, 0xfff9, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfff9, 0xfffc, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfff6, 0xffff, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x4
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfff3, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfff8, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xfffd, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x2, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x5
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x7, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0xC, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x11, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerImpactTemplate, ANIM_TARGET, 3, 0x16, 0x3, 0x1, 0x3
- delay 0x1
+ delay 1
createsprite gCoreEnforcerBeamTemplate, ANIM_TARGET, 3, 0xf, 0x0, 0x14, 0x6
- delay 0x7
+ delay 7
createsprite gCoreEnforcerSnoreTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 30, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 30, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 30, 1
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gCoreEnforcerExplosionTemplate, ANIM_ATTACKER, 3, 0xffe8, 0x18, ANIM_TARGET, 0x1
waitforvisualfinish
@@ -11248,7 +11318,7 @@ gBattleAnimMove_TropKick::
createsprite gTropKickGreenFootTemplate, ANIM_ATTACKER, 2, 0xfff0, 0x8, 0x0, 0x0, 0xa, 0x1, 0x1, 0x1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 4, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
- delay 0xA
+ delay 10
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 192, 176, 40
createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, -192, 240, 40
@@ -11266,26 +11336,26 @@ gBattleAnimMove_Instruct::
loadspritegfx ANIM_TAG_SPOTLIGHT @spotlight
setalpha 12, 8
createsprite gMetronomeFingerSpriteTemplate, ANIM_ATTACKER, 12, 0x0
- delay 0x18
+ delay 24
loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 0x16, 0x3
waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 0x2, 0xf8, 0x3, 0x0, 0xa, 0x0
waitforvisualfinish
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x8, 0x7DB9
- delay 0x4
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 8, RGB(25, 13, 31)
+ delay 4
monbg ANIM_TARGET
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 41, 1
playsewithpan SE_M_BIND, SOUND_PAN_TARGET
- delay 0x1A
+ delay 26
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
playsewithpan SE_M_BIND, SOUND_PAN_TARGET
- delay 0x1A
+ delay 26
createvisualtask AnimTask_BlendMonInAndOut, 5, ANIM_ATTACKER, RGB(27, 27, 0), 12, 1, 1
playsewithpan SE_M_BIND, SOUND_PAN_TARGET
- delay 0x1D
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x8, 0x0, 0x7DB9
+ delay 29
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 8, 0, RGB(25, 13, 31)
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -11294,21 +11364,21 @@ gBattleAnimMove_Instruct::
gBattleAnimGeneral_BeakBlastSetUp::
loadspritegfx ANIM_TAG_SMALL_EMBER @Fire
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_RED
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
waitforvisualfinish
end
gBattleAnimMove_BeakBlast::
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x0, 0x9, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB_RED
waitforvisualfinish
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x0
playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x2
+ delay 2
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0x1
- delay 0x2
+ delay 2
loopsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET 0x4 0x8
createvisualtask AnimTask_DrillPeckHitSplats, 0x5
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 18, 1
@@ -11317,7 +11387,7 @@ gBattleAnimMove_BeakBlast::
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x6
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_ATTACKER, 0x2, 0x9, 0x0, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_RED
waitforvisualfinish
end
@@ -11326,46 +11396,46 @@ gBattleAnimMove_ClangingScales::
loadspritegfx ANIM_TAG_POISON_BUBBLE @purple color
monbg ANIM_DEF_PARTNER
splitbgprio_foes ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x2002
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_METAL_SOUND_WAVES, 0, 10, 10, 0x642D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB(2, 0, 8)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_METAL_SOUND_WAVES, 0, 10, 10, RGB(13, 1, 25)
waitforvisualfinish
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 2, 0, 8, 1
call ClangingScalesMetalSound
call ClangingScalesMetalSound
call ClangingScalesMetalSound
call ClangingScalesMetalSound
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 15, 1
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
- delay 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x2002
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB(2, 0, 8)
waitforvisualfinish
end
ClangingScalesMetalSound:
panse SE_M_SCREECH, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createsprite gClangingScalesPurpleMetalSoundTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0x1e, 0x0, ANIM_TARGET
createsprite gClangingScalesPurpleMetalSoundTemplate, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0x1e, 0x0, ANIM_DEF_PARTNER
- delay 0x2
+ delay 2
return
gBattleAnimMove_DragonHammer::
loadspritegfx ANIM_TAG_ROUND_SHADOW
loadspritegfx ANIM_TAG_GRAY_SMOKE
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, 0x7D7F @Pinkish purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 12, 12, RGB(31, 11, 31) @Pinkish purple
fadetobg BG_COSMIC
waitbgfadeout
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, -500, 0x0, 0xffff
waitbgfadein
setalpha 15, 0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 26, 0, 0, 5
- delay 0x6
+ delay 6
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
- delay 0x2
+ delay 2
createvisualtask AnimTask_SquishTarget, 0x2
- delay 0x5
+ delay 5
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gOctazookaSmokeSpriteTemplate, ANIM_TARGET, 2, 8, 8, 1, 0
delay 2
@@ -11399,21 +11469,21 @@ gBattleAnimMove_BrutalSwing::
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 0x6, 0x1, 0x0
waitforvisualfinish
- delay 0xb
+ delay 11
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 26, 0, 0, 5
- delay 0x6
+ delay 6
createsprite gBrutalSwingBasicImpactTemplate, ANIM_TARGET, 3, 0xffe0, 0xfff0, 0x1, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 21, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 21, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATK_PARTNER, 0, 3, 21, 1
- delay 0x4
+ delay 4
createsprite gBrutalSwingRandomImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBrutalSwingRandomImpactTemplate, ANIM_TARGET, 3, 0x1, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBrutalSwingBasicImpactTemplate, ANIM_TARGET, 3, 0x20, 0x14, 0x1, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
waitsound
@@ -11434,9 +11504,9 @@ gBattleAnimMove_AuroraVeil::
setalpha 8, 8
playsewithpan SE_M_MILK_DRINK, SOUND_PAN_ATTACKER
createsprite gAuroraVeilRingTemplate, ANIM_ATTACKER, 2
- delay 0x4
+ delay 4
createsprite gAuroraVeilRingTemplate, ANIM_ATTACKER, 2
- delay 0x4
+ delay 4
createsprite gAuroraVeilRingTemplate, ANIM_ATTACKER, 2
waitforvisualfinish
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
@@ -11454,9 +11524,9 @@ gBattleAnimGeneral_ShellTrapSetUp::
monbg ANIM_TARGET
setalpha 12, 8
call FireSpreadEffect
- delay 0x4
+ delay 4
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
- delay 0x15
+ delay 21
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, ANIM_TARGET, 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 0, ANIM_TARGET, 2
@@ -11474,171 +11544,171 @@ ShellTrapUnleash:
loadspritegfx ANIM_TAG_JAGGED_MUSIC_NOTE @red
monbg ANIM_TARGET
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
- delay 0x6
+ delay 6
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapYellowImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
createsprite gShellTrapRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x2
- delay 0x5
+ delay 5
waitforvisualfinish
call ShellTrapFireLaunch1
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
- delay 0x3
+ delay 3
call ShellTrapFireLaunch2
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
- delay 0x3
+ delay 3
waitforvisualfinish
clearmonbg ANIM_TARGET
end
ShellTrapFireLaunch1:
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1
- delay 0x3
+ delay 3
return
ShellTrapFireLaunch2:
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0, 0x38, 0x4, 0x4, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xfff6, 0x0, 0xfff6, 0x38, 0x4, 0x4, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xa, 0x0, 0xa, 0x38, 0xfffc, 0x3, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0xfffc, 0x5, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xf, 0x0, 0xf, 0x38, 0x4, 0x4, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0xffec, 0x0, 0xffec, 0x38, 0x4, 0x4, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
createsprite gShellTrapFireHitsTemplate, ANIM_ATTACKER, 40, 0x0, 0x14, 0x0, 0x14, 0x38, 0x4, 0x4, 0x1
createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
- delay 0x3
+ delay 3
return
gBattleAnimMove_FleurCannon::
@@ -11648,7 +11718,7 @@ gBattleAnimMove_FleurCannon::
loadspritegfx ANIM_TAG_PINK_HEART @pink color
setalpha 12, 8
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xF, 0x7440
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB(0, 2, 29)
waitforvisualfinish
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
@@ -11675,14 +11745,14 @@ gBattleAnimMove_FleurCannon::
call FleurCannonBeam
call FleurCannonBeam
call FleurCannonBeam
- delay 0x20
+ delay 32
createsprite gFleurCannonDischargeTemplate, ANIM_ATTACKER, 2, 0x1, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gFleurCannonDischargeTemplate, ANIM_ATTACKER, 2, 0x1, 0xfff0, 0xfff0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 11, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7440
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB(0, 2, 29)
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -11690,10 +11760,10 @@ gBattleAnimMove_FleurCannon::
FleurCannonBeam:
createsprite gFleurCannonOrbTemplate, ANIM_TARGET, 2
createsprite gFleurCannonOrbTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
createsprite gFleurCannonOrbTemplate, ANIM_TARGET, 2
createsprite gFleurCannonOrbTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
return
gBattleAnimMove_PsychicFangs::
@@ -11709,14 +11779,14 @@ PsychicFangsRegular:
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe0, 0x1, 0x333, 0x333, 0xa
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0x20, 0x5, 0xfccd, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
- delay 0x10
+ delay 16
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xffe0, 0x7, 0xfccd, 0x333, 0xa
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x20, 0x3, 0x333, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2
PsychicFangsEnd:
@@ -11731,14 +11801,14 @@ PsychicFangsDestroyWall:
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe0, 0x1, 0x333, 0x333, 0xa
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0x20, 0x5, 0xfccd, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 5, 2
- delay 0x10
+ delay 16
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xffe0, 0x7, 0xfccd, 0x333, 0xa
createsprite gSharpTeethSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x20, 0x3, 0x333, 0xfccd, 0xa
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 8, 0, ANIM_TARGET, 1
createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0xfff8, 0xfff4
createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x1, 0x8, 0xfff4
@@ -11746,7 +11816,7 @@ PsychicFangsDestroyWall:
createsprite gBrickBreakWallShardSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x3, 0x8, 0xc
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 8, 4, 2
- delay 0x10
+ delay 16
goto PsychicFangsEnd
gBattleAnimMove_StompingTantrum::
@@ -11756,7 +11826,7 @@ gBattleAnimMove_StompingTantrum::
loadspritegfx ANIM_TAG_SMALL_EMBER @hit color
monbg ANIM_TARGET
createvisualtask AnimTask_Splash, 2, ANIM_ATTACKER, 3
- delay 0x5
+ delay 5
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 0x5
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 0x5
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
@@ -11765,14 +11835,14 @@ gBattleAnimMove_StompingTantrum::
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x3
call StompingTantrumImpact
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x25
+ delay 37
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x1
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x2
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x3
call StompingTantrumImpact
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x25
+ delay 37
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x0
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x1
createsprite gStompingTantrumRockTemplate, ANIM_ATTACKER, 2, 0x0, 0x2
@@ -11783,7 +11853,7 @@ gBattleAnimMove_StompingTantrum::
clearmonbg ANIM_TARGET
end
StompingTantrumImpact:
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x1
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 1
return
gBattleAnimMove_ShadowBone::
@@ -11796,10 +11866,10 @@ gBattleAnimMove_ShadowBone::
setalpha 12, 8
playsewithpan SE_M_BONEMERANG, SOUND_PAN_TARGET
createsprite gSpinningBoneSpriteTemplate, ANIM_ATTACKER, 2, 0xffd6, 0xffe7, 0x0, 0x0, 0xf
- delay 0xc
+ delay 12
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x7, 0x5, 0x1, 0x0, 0xa, 0x0, 0x0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_ATTACKER | F_PAL_TARGET, 0x5, 0x1, 0x0, 10, RGB_BLACK, 0
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_NightmareClone, 0x2
@@ -11820,7 +11890,7 @@ gBattleAnimMove_Accelerock::
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
createvisualtask AnimTask_TraceMonBlended, 0x2, 0x0, 0x4, 0x7, 0x3
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
- delay 0x4
+ delay 4
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
@@ -11843,7 +11913,7 @@ gBattleAnimMove_Liquidation::
monbg ANIM_TARGET
setalpha 12, 8
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4
- delay 0x6
+ delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
@@ -11863,10 +11933,9 @@ gBattleAnimMove_PrismaticLaser::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge animation
loadspritegfx ANIM_TAG_TEAL_ALERT @straight lines
loadspritegfx ANIM_TAG_GREEN_SPIKE @needle arm animation
- loadspritegfx ANIM_TAG_NEEDLE @sting
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
playsewithpan SE_ELEVATOR, SOUND_PAN_ATTACKER
createsprite gPrismaticLaserChargeTemplate, ANIM_ATTACKER, 2, 0x0
call PrismaticLaserInwardSpikes
@@ -11877,22 +11946,23 @@ gBattleAnimMove_PrismaticLaser::
playsewithpan SE_ELEVATOR, SOUND_PAN_ATTACKER
call PrismaticLaserInwardSpikes
playsewithpan SE_ELEVATOR, SOUND_PAN_ATTACKER
- delay 0x1E
+ delay 30
call PrismaticLaserOutwardSpikes
- delay 0x5
+ delay 5
call PrismaticLaserOutwardSpikes2
- delay 0x5
+ delay 5
call PrismaticLaserOutwardSpikes
- delay 0x5
+ delay 5
call PrismaticLaserOutwardSpikes2
- delay 0x5
+ delay 5
call PrismaticLaserOutwardSpikes
waitforvisualfinish
unloadspritegfx ANIM_TAG_TEAL_ALERT
unloadspritegfx ANIM_TAG_GREEN_SPIKE
unloadspritegfx ANIM_TAG_ICE_CHUNK
unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
- delay 0x1E
+ loadspritegfx ANIM_TAG_NEEDLE @sting
+ delay 30
createvisualtask AnimTask_HorizontalShake, 5, (MAX_BATTLERS_COUNT + 1), 10, 0x32
createvisualtask AnimTask_HorizontalShake, 5, MAX_BATTLERS_COUNT, 10, 0x32
playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER
@@ -11901,7 +11971,7 @@ gBattleAnimMove_PrismaticLaser::
call PrismaticLaserRain
call PrismaticLaserRain
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_ATTACKER
blendoff
@@ -11931,48 +12001,48 @@ PrismaticLaserOutwardSpikes2:
PrismaticLaserInwardSpikes:
createsprite gPrismaticLaserRedInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0, 0xFF90, 0x10 @up
createsprite gPrismaticLaserVioletInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFFE0, 0x43, 0x10 @between lower left and down
- delay 0x1
+ delay 1
createsprite gPrismaticLaserGreenInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x5F, 0xFF9D, 0x10 @upper right
createsprite gPrismaticLaserYellowInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1F, 0x37, 0x10 @between lower right and down
createsprite gPrismaticLaserYellowInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFFDA, 0xFF94, 0x10 @between up and upper left
- delay 0x1
+ delay 1
createsprite gPrismaticLaserYellowInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x73, 0x0, 0x10 @right
createsprite gPrismaticLaserRedInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFF60, 0x43, 0x10 @between left and lower left
- delay 0x1
+ delay 1
createsprite gPrismaticLaserVioletInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x4F, 0x37, 0x10 @lower right
createsprite gPrismaticLaserGreenInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFF2A, 0xFFAA, 0x10 @between left and upper left
- delay 0x1
+ delay 1
createsprite gPrismaticLaserRedInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0, 0x53, 0x10 @down
createsprite gPrismaticLaserVioletInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x2D, 0xFF9D, 0x10 @between up and upper right
- delay 0x1
+ delay 1
createsprite gPrismaticLaserGreenInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFFB0, 0x43, 0x10 @lower left
createsprite gPrismaticLaserRedInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xDF, 0xFF9D, 0x10 @between right and upper right
- delay 0x1
+ delay 1
createsprite gPrismaticLaserYellowInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFF60, 0x0, 0x10 @left
createsprite gPrismaticLaserGreenInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x9F, 0x37, 0x10 @between right and lower right
- delay 0x1
+ delay 1
createsprite gPrismaticLaserVioletInwardTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xFFAA, 0xFF94, 0x10 @upper left
- delay 0x1
+ delay 1
return
PrismaticLaserRain:
createsprite gPrismaticLaserYellowRainTemplate, ANIM_TARGET, 2, 35, 0x3c, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserGreenRainTemplate, ANIM_TARGET, 2, -30, 0x44, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserRedRainTemplate, ANIM_TARGET, 2, 27, 0x37, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserVioletRainTemplate, ANIM_TARGET, 2, -20, 0x32, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserYellowRainTemplate, ANIM_TARGET, 2, 33, 0x3a, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserGreenRainTemplate, ANIM_TARGET, 2, -12, 0x3a, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserRedRainTemplate, ANIM_TARGET, 2, 19, 0x3c, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserVioletRainTemplate, ANIM_TARGET, 2, -38, 0x3a, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserYellowRainTemplate, ANIM_TARGET, 2, 5, 0x3c, 4, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gPrismaticLaserGreenRainTemplate, ANIM_TARGET, 2, -23, 0x28, 4, ANIM_TARGET
return
@@ -11987,77 +12057,77 @@ SpectralThiefUnleash:
loadspritegfx ANIM_TAG_POISON_BUBBLE
fadetobg BG_GHOST
waitbgfadein
- delay 0x5
+ delay 5
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x0, 0x0
invisible ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0x8, 0x8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0xfff8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0x8, 0xfff8, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSpectralThiefBlackSmokeTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x0, 0x0
waitforvisualfinish
playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
waitforvisualfinish
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x30
- delay 0x30
+ delay 48
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 2, 0, 24, 1
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 0x2, 0x6, 0x1, 0x0, 0xc, 0x77bd
- delay 0x18
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 0x2, 0x6, 0x1, 0xc, 0x0, 0x77bd
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 0, 12, RGB(29, 29, 29)
+ delay 24
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 2, 6, 1, 12, 0, RGB(29, 29, 29)
waitforvisualfinish
setalpha 0, 16
- delay 0x1
+ delay 1
monbg_static ANIM_TARGET
createvisualtask AnimTask_MoveTargetMementoShadow, 0x5
playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET
waitforvisualfinish
clearmonbg_static ANIM_TARGET
- delay 0x1
+ delay 1
blendoff
- delay 0x1
+ delay 1
setalpha 12, 8
monbg ANIM_TARGET
- delay 0x1
+ delay 1
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0xfff1, 0xf, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x4
+ delay 4
createsprite gSpectralThiefThiefImpactTemplate, ANIM_TARGET, 2, 0x14, 0x2, 0x0
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
waitforvisualfinish
visible ANIM_ATTACKER
- delay 0x2
+ delay 2
restorebg
waitbgfadein
clearmonbg ANIM_TARGET
@@ -12070,30 +12140,30 @@ SpectralThiefSteal:
setalpha 11, 5
splitbgprio_all
panse SE_M_MINIMIZE, SOUND_PAN_TARGET, SOUND_PAN_ATTACKER, 0xfd, 0x0
- delay 0xf
+ delay 15
createsprite gSpectralThiefBlackOrbsTemplate, ANIM_TARGET, 2, 0xfff4, 0x18
- delay 0xB
+ delay 11
setarg 0x7 0xffff
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call SpectralThiefBuffUp
- delay 0x8
+ delay 8
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call SpectralThiefBuffUp
- delay 0x8
+ delay 8
call SpectralThiefBuffUp
waitforvisualfinish
blendoff
end
SpectralThiefBuffUp:
createsprite gSpectralThiefBlackBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gSpectralThiefBlackBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gSpectralThiefBlackBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gSpectralThiefBlackBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gSpectralThiefBlackBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -12107,11 +12177,11 @@ gBattleAnimMove_SunsteelStrike::
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
createsprite gSunsteelStrikeBlackFlyBallTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATK_PARTNER, 1, 20
- delay 0x18
- createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x0 @The rock particles mess up the fly animation
- createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x1
- createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x2
- createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0x0, 0x3
+ delay 24
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 0 @The rock particles mess up the fly animation
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 1
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 2
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 3
waitforvisualfinish
unloadspritegfx ANIM_TAG_ROUND_SHADOW @fly
unloadspritegfx ANIM_TAG_AIR_WAVE_2 @black color
@@ -12135,7 +12205,7 @@ gBattleAnimMove_SunsteelStrike::
stopsound
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gSunsteelStrikeSuperpowerTemplate, ANIM_TARGET, 2, 0x14
- delay 0x14
+ delay 20
createsprite gSunsteelStrikeRedImpactTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x0
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
waitforvisualfinish
@@ -12145,7 +12215,7 @@ gBattleAnimMove_SunsteelStrike::
unloadspritegfx ANIM_TAG_IMPACT @hit
loadspritegfx ANIM_TAG_SMALL_EMBER @FireSpreadEffect
call FireSpreadEffect
- delay 0x4
+ delay 4
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
visible ANIM_ATTACKER
@@ -12156,9 +12226,9 @@ gBattleAnimMove_SunsteelStrike::
end
SunsteelStrikeBeam:
createsprite gSunsteelStrikeYellowBeamTemplate, ANIM_TARGET, 2, 0x14
- delay 0x1
+ delay 1
createsprite gSunsteelStrikeRedBeamTemplate, ANIM_TARGET, 2, 0x14
- delay 0x1
+ delay 1
return
gBattleAnimMove_MoongeistBeam::
@@ -12169,9 +12239,9 @@ gBattleAnimMove_MoongeistBeam::
loadspritegfx ANIM_TAG_WATER_GUN @water gun colour
loadspritegfx ANIM_TAG_ASSURANCE_HAND @purple colour
setalpha 8, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 15, 15, 0x7FFF @White
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 15, 15, 0x7FFC @Light Blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 15, 15, RGB_WHITE @White
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 15, 15, RGB(28, 31, 31) @Light Blue
waitforvisualfinish
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
createsprite gMoonSpriteTemplate, ANIM_TARGET, 0, 0x20, 0x15
@@ -12182,8 +12252,8 @@ gBattleAnimMove_MoongeistBeam::
call MoongeistBeamCharge
createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0 @;Charge circle
call MoongeistBeamCharge
- delay 0x20
- createsoundtask SoundTask_LoopSEAdjustPanning, 0x7, 0xCC, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5
+ delay 32
+ createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call MoongeistBeamOrbs
@@ -12192,7 +12262,7 @@ gBattleAnimMove_MoongeistBeam::
call MoongeistBeamOrbs
call MoongeistBeamOrbs
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0xb, 0x6739
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(25, 25, 25)
call MoongeistBeamOrbs
call MoongeistBeamOrbs
call MoongeistBeamOrbs
@@ -12222,8 +12292,8 @@ gBattleAnimMove_MoongeistBeam::
call MoongeistBeamOrbs
call MoongeistBeamOrbs
call MoongeistBeamOrbs
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0xb, 0x0, 0x6739
- delay 0x1A
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(25, 25, 25)
+ delay 26
stopsound
createvisualtask AnimTask_MoonlightEndFade, 0x2
end
@@ -12234,36 +12304,36 @@ MoongeistBeamCharge:
createsprite gMoongeistBeamChargeTemplate, ANIM_ATTACKER, 0, 25, -40, 0, 0, 30, 20 @From top right
createsprite gMoongeistBeamChargeTemplate, ANIM_ATTACKER, 0, 25, 20, 0, 0, 30, 20 @From bottom right
createsprite gMoongeistBeamChargeTemplate, ANIM_ATTACKER, 0, -25, 40, 0, 0, 30, -20 @From bottom left
- delay 0x5
+ delay 5
return
MoongeistBeamOrbs:
createsprite gMoongeistBeamBlueOrbsTemplate, ANIM_TARGET, 2
createsprite gMoongeistBeamPurpleOrbsTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
return
gBattleAnimMove_TearfulLook::
loadspritegfx ANIM_TAG_SMALL_BUBBLES @tears
loadspritegfx ANIM_TAG_OPENING_EYE @eye
monbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x5, 0x7DE0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 5, RGB(0, 15, 31)
waitforvisualfinish
playsewithpan SE_M_CONFUSE_RAY, SOUND_PAN_TARGET
createsprite gOpeningEyeSpriteTemplate, ANIM_ATTACKER, 5, 0x0, 0x0, 0x1, 0x0
- delay 0x35
+ delay 53
loopsewithpan SE_M_TAIL_WHIP, SOUND_PAN_ATTACKER, 0xC, 0x2
- delay 0x8
+ delay 8
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x1
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x2
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x3
- delay 0x8
+ delay 8
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x1
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x2
createsprite gTearDropSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x3
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x5, 0x0, 0x7DE0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 5, 0, RGB(0, 15, 31)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -12277,24 +12347,24 @@ gBattleAnimMove_ZingZap::
monbg ANIM_TARGET
call ZingZapSparks1
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 4, 0, 6, 1
- delay 0xA
+ delay 10
call ZingZapSparks2
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 4, 0, 6, 1
- delay 0xA
+ delay 10
call ZingZapSparks1
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 4, 0, 6, 1
- delay 0xA
+ delay 10
call ZingZapSparks2
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 4, 0, 6, 1
- delay 0xA
+ delay 10
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 1, 5
- delay 0x4
+ delay 4
call ZingZapSparks1
invisible ANIM_ATTACKER
createsprite gZingZapYellowBallTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xF
- delay 0xA
+ delay 10
call ZingZapSparks2
- delay 0x5
+ delay 5
stopsound
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -12308,7 +12378,7 @@ gBattleAnimMove_ZingZap::
ZingZapSparks1:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
return
@@ -12316,7 +12386,7 @@ ZingZapSparks2:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
return
@@ -12328,47 +12398,47 @@ gBattleAnimMove_NaturesMadness::
loadspritegfx ANIM_TAG_ICE_CHUNK @blue green CrystalsTemplate
monbg ANIM_ATTACKER
setalpha 14, 8
- delay 0x1
+ delay 1
loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 0x10, 0x3
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0x14, 0xa, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff6, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xf, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0x19, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x0
- delay 0x4
+ delay 4
createsprite gNaturesMadnessPinkRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0, 0x1F, 0x8
createsprite gNaturesMadnessPinkStarsTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x0
clearmonbg ANIM_ATTACKER
- delay 0x1
+ delay 1
monbg ANIM_TARGET
waitforvisualfinish
unloadspritegfx ANIM_TAG_SPARKLE_2
loadspritegfx ANIM_TAG_ECLIPSING_ORB @blue green grayRing
createsprite gNaturesMadnessGrayRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x1, 0x0
playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER
- delay 0xe
+ delay 14
createsprite gNaturesMadnessGrayRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x1, 0x0
playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER
- delay 0xe
+ delay 14
createsprite gNaturesMadnessGrayRingTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x1, 0x0
playsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -12393,9 +12463,9 @@ gBattleAnimMove_NaturesMadness::
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xffec, 0x14, 0x19, 0x1
createsprite gNaturesMadnessCrystalsTemplate, ANIM_ATTACKER, 2, 0xc, 0x0, 0x19, 0x1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -12406,36 +12476,36 @@ gBattleAnimMove_MultiAttack::
loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy
loadspritegfx ANIM_TAG_CUT @cut
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call MultiAttackBuff
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_WHITE
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call MultiAttackBuff
- delay 0x8
+ delay 8
call MultiAttackBuff
waitforvisualfinish
- delay 0xF
+ delay 15
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0xffe0, 0x0
createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0xffd0, 0x0
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
end
MultiAttackBuff:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -12447,7 +12517,7 @@ gBattleAnimMove_MindBlown::
loadspritegfx ANIM_TAG_IMPACT @hit
monbg ANIM_TARGET
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_FALL, SOUND_PAN_TARGET
createsprite gMindBlownHeadTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x25
@@ -12455,22 +12525,22 @@ gBattleAnimMove_MindBlown::
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 2, 0, 15, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATK_PARTNER, 2, 0, 15, 1
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMindBlownBlueImpactTemplate, ANIM_TARGET, 3, 0x1, 0x0
createsprite gMindBlownPinkImpactTemplate, ANIM_TARGET, 3, 0x1, 0x0
call MindBlownBlueOrbs
- delay 0x1
+ delay 1
call MindBlownPinkOrbs
- delay 0x1
+ delay 1
call MindBlownBlueOrbs
- delay 0x1
+ delay 1
call MindBlownPinkOrbs
- delay 0x1
+ delay 1
call MindBlownBlueOrbs
- delay 0x1
+ delay 1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_TARGET
@@ -12505,32 +12575,32 @@ gBattleAnimMove_PlasmaFists::
loadspritegfx ANIM_TAG_LIGHTNING @thunder punch
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
waitforvisualfinish
createsprite gPlasmaFistsChargeTemplate, ANIM_ATTACKER, 2, 0x0
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 3, 92, 1
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
- delay 0xA
+ delay 10
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
- delay 0xA
+ delay 10
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
- delay 0xA
+ delay 10
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
- delay 0xA
+ delay 10
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
- delay 0xA
+ delay 10
call PlasmaFistSpark1
- delay 0xA
+ delay 10
call PlasmaFistSpark2
waitforvisualfinish
clearmonbg ANIM_ATTACKER
@@ -12541,7 +12611,7 @@ gBattleAnimMove_PlasmaFists::
waitforvisualfinish
call PlasmaFistsImpact
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -12550,7 +12620,7 @@ PlasmaFistSpark1:
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 11, RGB(31, 31, 22)
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
return
@@ -12558,25 +12628,25 @@ PlasmaFistSpark2:
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
return
PlasmaFistsImpact:
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gFistFootSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x8, 0x1, 0x0
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
- delay 0x1
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xffd0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10
- delay 0x1
+ delay 1
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -48
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_ATTACKER, 2, 0, 16
+ delay 1
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101
- delay 0x2
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101
+ delay 2
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 2
return
@@ -12594,34 +12664,34 @@ gBattleAnimMove_PhotonGeyser::
call PhotonGeyserSparks1
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xffd8, 0x10
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x28, 0x10
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
- delay 0xA
+ delay 10
call PhotonGeyserSparks1
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
- delay 0xA
+ delay 10
call PhotonGeyserSparks1
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd8, 0x10
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0x14, 0x10
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
- delay 0xA
+ delay 10
call PhotonGeyserSparks1
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
- delay 0xA
+ delay 10
call PhotonGeyserSparks1
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0xffd8, 0x0, 0x10
createsprite gPowerAbsorptionOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0x0, 0x10
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
- delay 0xA
+ delay 10
call PhotonGeyserSparks1
- delay 0xA
+ delay 10
call PhotonGeyserSparks2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xF, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 15, RGB_BLACK
clearmonbg ANIM_ATTACKER
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_ATTACKER
unloadspritegfx ANIM_TAG_ORBS @recover
@@ -12649,13 +12719,13 @@ gBattleAnimMove_PhotonGeyser::
unloadspritegfx ANIM_TAG_AIR_WAVE_2 @white/gray color
@Shoot beam to the sky
loadspritegfx ANIM_TAG_STRAIGHT_BEAM
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x6, 0x0, 0x10, 0x43FF @Light yellow
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 6, 0, 16, RGB(31, 31, 16) @Light yellow
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 96, 1
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
call PhotonGeyserBeam
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x10, 0x0, 0x43FF @Light yellow
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xF, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 16, 0, RGB(31, 31, 16) @Light yellow
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 15, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
@@ -12664,7 +12734,7 @@ PhotonGeyserSparks1:
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gThinRingShrinkingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0x20, 0x18, 0xbe, 0xc, 0x0, 0x1, 0x0
- delay 0x0
+ delay 0
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0x9c, 0x18, 0x79, 0xd, 0x0, 0x1, 0x1
return
@@ -12672,22 +12742,22 @@ PhotonGeyserSparks2:
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0xaa, 0x18, 0x2a, 0xb, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createsprite gPhotonGeyserSparkTemplate, ANIM_ATTACKER, 0, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
return
PhotonGeyserBeam:
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, 19, ANIM_TARGET, 180, 2, 6
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, 3, ANIM_TARGET, 180, 2, 5
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, -13, ANIM_TARGET, 180, 2, 4
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, -29, ANIM_TARGET, 180, 2, 3
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, -45, ANIM_TARGET, 180, 2, 2
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, -61, ANIM_TARGET, 180, 2, 1
- delay 0x1
+ delay 1
createsprite gPhotonGeyserBeam, ANIM_TARGET, 3, 0, -77, ANIM_TARGET, 180, 2, 0
return
@@ -12863,7 +12933,7 @@ gBattleAnimMove_GlitzyGlow::
loadspritegfx ANIM_TAG_POISON_BUBBLE @violet color
loadspritegfx ANIM_TAG_SMALL_EMBER @flame wheel particle
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 12, 12, 0x289F
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 12, 12, RGB(31, 4, 10)
monbg ANIM_DEF_PARTNER
splitbgprio_foes ANIM_TARGET
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, 0 @Darken
@@ -13005,8 +13075,8 @@ gBattleAnimMove_FreezyFrost::
loadspritegfx ANIM_TAG_ICICLE_SPEAR
loadspritegfx ANIM_TAG_ICE_SPIKES
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICICLE_SPEAR, 0, 0, 12, RGB_BLACK
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICE_SPIKES, 0, 0, 12, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ICICLE_SPEAR, 0, 0, 12, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ICE_SPIKES, 0, 0, 12, RGB_BLACK
waitforvisualfinish
call FreezyFrostHitEffect
call FreezyFrostHitEffect
@@ -13086,9 +13156,9 @@ gBattleAnimMove_DoubleIronBash::
createvisualtask AnimTask_AnimateGustTornadoPalette, 0x5, 0x1, 0x46
createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, 0xffe7, 0x0, 0x0, 0x0, 0x0 @wing attack
createsprite gGustToTargetSpriteTemplate, ANIM_ATTACKER, 2, 0x19, 0x0, 0x0, 0x0, 0x0 @wing attack
- delay 0x18
+ delay 24
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 9
- delay 0x11
+ delay 17
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, 0, 0, ANIM_TARGET, 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -32, 0, 0, 3
waitforvisualfinish
@@ -13096,7 +13166,7 @@ gBattleAnimMove_DoubleIronBash::
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0xb
waitforvisualfinish
- delay 0x3
+ delay 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x7
clearmonbg ANIM_DEF_PARTNER
blendoff
@@ -13104,7 +13174,69 @@ gBattleAnimMove_DoubleIronBash::
@@@@@@@@@@@@@@@@@@@@@@@ GEN 8 @@@@@@@@@@@@@@@@@@@@@@@
gBattleAnimMove_DynamaxCannon::
- goto gBattleAnimMove_HyperBeam
+ loadspritegfx ANIM_TAG_ELECTRIC_ORBS
+ loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+ loadspritegfx ANIM_TAG_ORBS @hyper beam
+ loadspritegfx ANIM_TAG_WATER_GUN @water gun colour
+ loadspritegfx ANIM_TAG_ASSURANCE_HAND @purple colour
+ loadspritegfx ANIM_TAG_HYDRO_PUMP
+ loadspritegfx ANIM_TAG_SPARK_2 @spark
+ loadspritegfx ANIM_TAG_LEAF @green
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 15, 15, RGB(30, 2, 11)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 15, 15, RGB(30, 2, 11)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(30, 2, 11)
+ setalpha 8, 8
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 2, 0, 15, 0
+ waitforvisualfinish
+ loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 14, 10
+ createsprite gGrowingChargeOrb3SpriteTemplate, ANIM_ATTACKER, 2, 0 @;Charge circle
+ call LightThatBurnsTheSkyGreenSparks
+ call LightThatBurnsTheSkyGreenSparks
+ call LightThatBurnsTheSkyGreenSparks
+ call LightThatBurnsTheSkyGreenSparks
+ call LightThatBurnsTheSkyGreenSparks
+ delay 20
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 2, 15, 0, 0
+ fadetobg BG_DYNAMAX_CANNON
+ waitbgfadein
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB(31, 4, 10) @Pinkish Red
+ panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER SOUND_PAN_TARGET 2 0
+ createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 87, 1
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 0, 4, 81, 1
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ call DynamaxCannonLaunch
+ waitforvisualfinish
+ restorebg
+ waitbgfadein
+ blendoff
+ end
+
+DynamaxCannonLaunch:
+ createsprite gSpriteTemplate_DynamaxCannonOrb, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ createsprite gSpriteTemplate_DynamaxCannonOrb, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ return
gBattleAnimMove_SnipeShot::
loadspritegfx ANIM_TAG_IMPACT_2
@@ -13114,7 +13246,7 @@ gBattleAnimMove_SnipeShot::
createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 0x18, -12
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x20
+ delay 32
playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
createsprite gSnipeShotBallTemplate, ANIM_TARGET, 2, 0, 0, 16
waitforvisualfinish
@@ -13127,21 +13259,21 @@ gBattleAnimMove_SnipeShot::
gBattleAnimMove_JawLock::
loadspritegfx ANIM_TAG_SHARP_TEETH
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, 0x0B1D @Light orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, RGB(29, 24, 2) @Light orange
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x7, 0x0 @Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 7, RGB_BLACK @Black
waitforvisualfinish
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
createsprite gJawLockTeethTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffe0, 0x1, 0x333, 0x333, 0xa, 15
createsprite gJawLockTeethTemplate, ANIM_ATTACKER, 2, 0x20, 0x20, 0x5, 0xfccd, 0xfccd, 0xa, 15
- delay 0xa
+ delay 10
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -8, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 10, 2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x7, 0x0, 0x0 @;Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 7, 0, RGB_BLACK @;Black
waitforvisualfinish
clearmonbg ANIM_TARGET
- delay 0x1
+ delay 1
end
gBattleAnimMove_StuffCheeks::
@@ -13150,23 +13282,23 @@ gBattleAnimMove_StuffCheeks::
loadspritegfx ANIM_TAG_THIN_RING
playsewithpan SE_M_METRONOME, 0xc0
createsprite gFloatingBerryTemplate, ANIM_ATTACKER, 1, 0x0
- delay 0x45
+ delay 69
createvisualtask AnimTask_IsTargetPlayerSide, 0x2
jumpargeq 0x7 0x1 BERRYEAT_ON_PLAYER
BerryEatingOpponent:
call BiteOpponent
- delay 0x10
+ delay 16
call BiteOpponent
- delay 0xA
+ delay 10
goto POST_BERRY_EAT
BERRYEAT_ON_PLAYER:
call BitePlayer
- delay 0x10
+ delay 16
call BitePlayer
- delay 0xA
+ delay 10
POST_BERRY_EAT:
playsewithpan SE_SHINY, 0xc0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x2, 0x3, 0x7, 0x0, 0x67f1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 3, 7, 0, RGB(17, 31, 25)
createsprite gThinRingExpandingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
end
@@ -13192,22 +13324,22 @@ gBattleAnimMove_NoRetreat::
gBattleAnimMove_TarShot::
loadspritegfx ANIM_TAG_POISON_BUBBLE
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, 0 @Black
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 15, 15, RGB_BLACK @Black
monbg ANIM_TARGET
createsprite gAppleAcidLaunchTemplate, ANIM_TARGET, 2, 0x14, 0x0, 0x28, 0x1, 0x0, 0x0
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gAppleAcidLaunchTemplate, ANIM_TARGET, 2, 0x14, 0x0, 0x28, 0x1, 0xffe8, 0x0
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 16, RGB_BLACK @;Black
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xffe6, 0xffe8, 0x0, 0xf, 0x37
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xf, 0xffe5, 0x0, 0xC, 0x32
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xfff1, 0xffef, 0x0, 0xa, 0x2d
playsewithpan SE_M_BUBBLE SOUND_PAN_TARGET
waitforvisualfinish
@@ -13221,17 +13353,17 @@ gBattleAnimMove_MagicPowder::
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0xffe2, 0xffea, 0x75, 0x50, 0x5, 0x1
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0xa, 0xffea, 0x75, 0x50, 0xfffb, 0x1
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0xffe7, 0xffea, 0x75, 0x70, 0x5, 0x3
- delay 0xf
+ delay 15
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0xfffb, 0xffea, 0x75, 0x50, 0xfffb, 0x1
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0x5, 0xffea, 0x75, 0x60, 0x5, 0x1
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0x0, 0xffea, 0x75, 0x45, 0xfffb, 0x1
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xffea, 0x75, 0x70, 0x5, 0x2
- delay 0x1e
+ delay 30
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0xfff1, 0xffea, 0x75, 0x70, 0x5, 0x2
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0xf, 0xffea, 0x75, 0x50, 0xfffb, 0x1
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0xfff6, 0xffea, 0x75, 0x60, 0x7, 0x2
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xffea, 0x75, 0x5a, 0xfff8, 0x0
- delay 0x14
+ delay 20
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0xfff6, 0xffea, 0x75, 0x50, 0xfffb, 0x1
createsprite gPoisonPowderParticleSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xffea, 0x75, 0x59, 0x5, 0x2
createsprite gMagicPowderBluePowderTemplate, ANIM_TARGET, 2, 0x14, 0xffea, 0x75, 0x70, 0xfff8, 0x2
@@ -13249,7 +13381,7 @@ gBattleAnimMove_DragonDarts::
loadspritegfx ANIM_TAG_EXPLOSION
playsewithpan SE_FALL, SOUND_PAN_ATTACKER
createdragondartsprite ANIM_TARGET, 2, 0x0, 0x0, 0x19
- delay 0x19
+ delay 25
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 16, 1
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x1
@@ -13272,17 +13404,17 @@ gBattleAnimMove_Teatime::
gBattleAnimMove_Octolock::
loadspritegfx ANIM_TAG_TENDRILS
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, 0x3D98 @Pinkish Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TENDRILS, 0, 12, 12, RGB(24, 12, 15) @Pinkish Red
loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET 0x6 0x4
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x10, 0x0, 0x2
- delay 0x7
+ delay 7
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x0, 0x2
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x8, 0x1, 0x2
- delay 0x7
+ delay 7
createsprite gConstrictBindingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xfff8, 0x1, 0x2
- delay 0x8
+ delay 8
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 6, 1
- delay 0x14
+ delay 20
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 8, RGB_RED
playsewithpan SE_M_BIND, SOUND_PAN_TARGET
setarg 0x7 0xffff
@@ -13294,13 +13426,13 @@ gBattleAnimMove_BoltBeak::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_SPARK_2
loadspritegfx ANIM_TAG_ELECTRICITY
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, 0x079D @Yellow
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, RGB(1, 23, 29) @Blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HORN_HIT, 0, 12, 12, RGB(29, 28, 1) @Yellow
call BoltBeakSparks
waitforvisualfinish
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
createsprite gHorizontalLungeSpriteTemplate, 0x2, 0x2, 0x4, 0x4
- delay 0x4
+ delay 4
createsprite gHornHitSpriteTemplate, 0x84, 0x3, 0x8, 0x8, 0xa
waitforvisualfinish
createsprite gFlashingHitSplatSpriteTemplate, 0x83, 0x4, 0x0, 0x0, 0x1, 0x1
@@ -13314,21 +13446,21 @@ gBattleAnimMove_BoltBeak::
BoltBeakSparks:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 7, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
- delay 0x0
+ delay 0
createsprite gBoltBeakBlueSparkTemplate, 0x0, 0x7, 0x50, 0x18, 0x16, 0xc, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 7, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
- delay 0xa
+ delay 10
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 5, 5, RGB(31, 31, 22)
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gBoltBeakBlueSparkTemplate, 0x0, 0x7, 0x64, 0x18, 0x3c, 0xa, 0x0, 0x1, 0x0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 7, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gBoltBeakBlueSparkTemplate, 0x0, 0x7, 0xee, 0x18, 0xa5, 0xa, 0x0, 0x1, 0x1
- delay 0x0
+ delay 0
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(1, 23, 29)
- delay 0x14
+ delay 20
createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 4, 4, RGB(1, 23, 29)
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, 0x4, 0x8, 0x0, 0x0, 0x20, 0xc, 0x0, 0x14, 0x0, 0x0
@@ -13339,13 +13471,13 @@ BoltBeakSparks:
createsprite gBoltBeakBlueFlashingSparkTemplate, 0x4, 0x8, 0x0, 0x0, 0x10, 0xc, 0x60, 0x14, 0x1, 0x0
createsprite gSparkElectricityFlashingSpriteTemplate, 0x4, 0x8, 0x0, 0x0, 0x10, 0xc, 0xa0, 0x14, 0x0, 0x0
createsprite gBoltBeakBlueFlashingSparkTemplate, 0x4, 0x8, 0x0, 0x0, 0x10, 0xc, 0xe0, 0x14, 0x2, 0x0
- delay 0x4
+ delay 4
return
gBattleAnimMove_FishiousRend::
loadspritegfx ANIM_TAG_SHARP_TEETH @Teeth
loadspritegfx ANIM_TAG_SMALL_BUBBLES
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, 0x726A @Blue Teeth
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, RGB(10, 19, 28) @Blue Teeth
playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
createsprite gFishiousRendTeethTemplate, ANIM_TARGET, 0, 50, 4
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 12, 2
@@ -13355,43 +13487,43 @@ gBattleAnimMove_FishiousRend::
FishousRendBubbles:
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xF, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xF, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xA, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xA, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x5, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfffb, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfffb, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff6, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff6, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff1, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff1, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xffec, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xffec, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff1, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff1, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff6, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfff6, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfffb, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xfffb, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x5, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xA, 0x0
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0xA, 0x0
return
@@ -13427,29 +13559,29 @@ gBattleAnimMove_ClangorousSoul::
ClangorousSoulStarBuffEffect:
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createsprite gClangorousSoulBlueBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gClangorousSoulPurpleBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x0, 0x0, 0x20, 0x3c
- delay 0x4
+ delay 4
createsprite gClangorousSoulWhiteBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, 0x0, 0x0, 0x20, 0x3c
return
gBattleAnimMove_BodyPress::
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly and bounce animation
loadspritegfx ANIM_TAG_GRAY_SMOKE @smoke
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 0xD, 0xD, 0x1E5D @Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 13, 13, RGB(29, 18, 7) @Orange
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 0x6, 0x1, 0x0
- delay 0x7
+ delay 7
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150 @Fly up
waitforvisualfinish
- delay 0x2F
+ delay 47
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3 @Bounce down
- delay 0x2
+ delay 2
playsewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_SquishTarget, 0x2
waitforvisualfinish
@@ -13463,55 +13595,55 @@ gBattleAnimMove_DrumBeating::
loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE
loadspritegfx ANIM_TAG_ROOTS
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_MUSIC_NOTES, 0, 0xD, 0xD, 0x03AC @Green
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_MUSIC_NOTES, 0, 13, 13, RGB(12, 29, 0) @Green
monbg ANIM_TARGET
splitbgprio ANIM_TARGET
setalpha 12, 8
call BellyDrumRight
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
call BellyDrumLeft
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x1, 0x1, 0x0
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
call BellyDrumRight
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x3, 0x3, 0x80
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
- delay 0x7
+ delay 7
call BellyDrumLeft
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x2, 0x0, 0x80
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
- delay 0x7
+ delay 7
call BellyDrumRight
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1, 0x1, 0x0
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
- delay 0x7
+ delay 7
call BellyDrumLeft
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0x3, 0x0
playsewithpan SE_M_BELLY_DRUM, SOUND_PAN_ATTACKER
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 0x55, 0x10, 0x6, 0x0, 0x3, 0x50
playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
- delay 0x5
+ delay 5
createsprite gFrenzyPlantRootSpriteTemplate, ANIM_ATTACKER, 2, 0x55, 0xfff0, 0xfffa, 0x0, 0x2, 0x4b
playsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET
- delay 0x5
+ delay 5
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, -10, ANIM_TARGET, 3
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 3, ANIM_TARGET, 8, 0, 20, 1
- delay 0x3
+ delay 3
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 8, ANIM_TARGET, 3
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
- delay 0x3
+ delay 3
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, -3, ANIM_TARGET, 2
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
- delay 0x3
+ delay 3
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -3, 1, ANIM_TARGET, 2
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 1, ANIM_TARGET, 1
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 10, ANIM_TARGET, 1
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
waitforvisualfinish
@@ -13524,7 +13656,7 @@ gBattleAnimMove_SnapTrap::
loadspritegfx ANIM_TAG_FLOWER @flowers
loadspritegfx ANIM_TAG_SHARP_TEETH
loadspritegfx ANIM_TAG_IMPACT
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, 0x0688
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHARP_TEETH, 0, 10, 10, RGB(8, 20, 1)
monbg ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_BITE, SOUND_PAN_TARGET
@@ -13550,77 +13682,269 @@ gBattleAnimMove_PyroBall::
loadspritegfx ANIM_TAG_SMALL_EMBER
playsewithpan SE_LEDGE, SOUND_PAN_ATTACKER @;Hop
createsprite gPyroBallRockTemplate, ANIM_ATTACKER, 2, 0, 0, 0
- delay 0x19
+ delay 25
playsewithpan SE_LEDGE, SOUND_PAN_ATTACKER @;Hop
- delay 0x19
+ delay 25
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x3, 0x0, 0x7, 0x043D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 0, 7, RGB(29, 1, 1)
createsprite gPyroBallBurningRockTemplate, ANIM_ATTACKER, 2, 0, 0, 0
- delay 0x19
+ delay 25
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
- delay 0x19
+ delay 25
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
createsprite gPyroBallFlamesUpTemplate, ANIM_ATTACKER, 2, 0, 0, 1
- delay 0x19
+ delay 25
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
createsprite gPyroBallEmberBallTemplate, ANIM_ATTACKER, 2, 0, 10, 0, 5, 20, -20
waitforvisualfinish
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 12, RGB_RED
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
call FireSpreadEffect
- delay 0x20
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x7, 0x0, 0x043D
+ delay 32
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 7, 0, RGB(29, 1, 1)
waitforvisualfinish
end
gBattleAnimMove_BehemothBlade::
- goto gBattleAnimMove_SacredSword
+ loadspritegfx ANIM_TAG_CUT @Cut
+ loadspritegfx ANIM_TAG_SWORD @Sword
+ loadspritegfx ANIM_TAG_HYDRO_PUMP @Blue Colour
+ loadspritegfx ANIM_TAG_PUNISHMENT_BLADES @Punishment Blade
+ monbg ANIM_ATTACKER
+ setalpha 12, 8
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 0, 15, 0
+ waitforvisualfinish
+ playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
+ createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
+ delay 22
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
+ waitforvisualfinish
+ clearmonbg ANIM_ATTACKER
+ delay 1
+ loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
+ loadspritegfx ANIM_TAG_AIR_WAVE_2 @black color
+ loadspritegfx ANIM_TAG_ROCKS @rock colour
+ loadspritegfx ANIM_TAG_SMALL_ROCK @small rock
+ monbg ANIM_TARGET
+ setalpha 12, 8
+ playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
+ createsprite gSunsteelStrikeBlackFlyBallTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
+ createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATK_PARTNER, 1, 20
+ delay 24
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 0 @The rock particles mess up the fly animation
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 1
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 2
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 3
+ waitforvisualfinish
+ unloadspritegfx ANIM_TAG_ROUND_SHADOW @fly
+ unloadspritegfx ANIM_TAG_AIR_WAVE_2 @black color
+ playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+ createsprite gSacredSwordBladesTemplate, ANIM_TARGET, 1, 0, 10, 0, 0xFF00, 10
+ createsprite gSacredSwordCutTemplate, ANIM_ATTACKER, 2, 40, 0xffe0, 0
+ delay 5
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ blendoff
+ loadspritegfx ANIM_TAG_WHITE_STREAK
+ call BehemothBladeSlashes
+ unloadspritegfx ANIM_TAG_WHITE_STREAK
+ waitforvisualfinish
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1
+ call OpposingExplosion2
+ waitforvisualfinish
+ visible ANIM_ATTACKER
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 15, 0, 0
+ waitforvisualfinish
+ blendoff
+ clearmonbg ANIM_TARGET
+ end
+OpposingExplosion2:
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1
+ delay 6
+ return
+
+BehemothBladeSlashes:
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -10, 3
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, 24, -19
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -28, -15
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 2
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -6, -30
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -20, 6
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -28, -15
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 2
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -6, -30
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAcrobaticsSlashesSpriteTemplate, ANIM_TARGET, 2, -20, 6
+ playsewithpan SE_SHINY, SOUND_PAN_TARGET
+ delay 1
+ return
gBattleAnimMove_BehemothBash::
- goto gBattleAnimMove_SunsteelStrike
+ loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
+ loadspritegfx ANIM_TAG_AIR_WAVE_2 @black color
+ loadspritegfx ANIM_TAG_ROCKS @rock colour
+ loadspritegfx ANIM_TAG_SMALL_ROCK @small rock
+ monbg ANIM_TARGET
+ setalpha 12, 8
+ playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
+ createsprite gSunsteelStrikeBlackFlyBallTemplate, ANIM_ATTACKER, 2, 0, 0, 13, 336
+ createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATK_PARTNER, 1, 20
+ delay 24
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 0 @The rock particles mess up the fly animation
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 1
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 2
+ createsprite gSunsteelStrikeRocksTemplate, ANIM_ATTACKER, 2, 0, 3
+ waitforvisualfinish
+ unloadspritegfx ANIM_TAG_ROUND_SHADOW @fly
+ unloadspritegfx ANIM_TAG_AIR_WAVE_2 @black color
+ loadspritegfx ANIM_TAG_METEOR @superpower
+ loadspritegfx ANIM_TAG_GOLD_RING @beam
+ loadspritegfx ANIM_TAG_SMALL_RED_EYE @red color
+ loadspritegfx ANIM_TAG_IMPACT @hit
+ playsewithpan SE_ORB, SOUND_PAN_ATTACKER
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 0, 15, 0
+ waitforvisualfinish
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ call BehemothBashBeam
+ stopsound
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gSunsteelStrikeSuperpowerTemplate, ANIM_TARGET, 2, 20
+ delay 20
+ createsprite gSunsteelStrikeRedImpactTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 0
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 6, 0, 8, 1
+ waitforvisualfinish
+ unloadspritegfx ANIM_TAG_METEOR @superpower
+ unloadspritegfx ANIM_TAG_GOLD_RING @beam
+ unloadspritegfx ANIM_TAG_SMALL_RED_EYE @red color
+ unloadspritegfx ANIM_TAG_IMPACT @hit
+ loadspritegfx ANIM_TAG_SMALL_EMBER @FireSpreadEffect
+ clearmonbg ANIM_TARGET
+ blendoff
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1
+ call OpposingExplosion1
+ call OpposingExplosion1
+ waitforvisualfinish
+ visible ANIM_ATTACKER
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 15, 0, 0
+ waitforvisualfinish
+ blendoff
+ clearmonbg ANIM_TARGET
+ end
+BehemothBashBeam:
+ createsprite gSunsteelStrikeYellowBeamTemplate, ANIM_TARGET, 2, 20
+ delay 1
+ createsprite gSunsteelStrikeRedBeamTemplate, ANIM_TARGET, 2, 20
+ delay 1
+ return
+OpposingExplosion1:
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 24, -24, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -16, 16, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, -24, -12, 1, 1
+ delay 6
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 16, 16, 1, 1
+ delay 6
+ return
gBattleAnimMove_AuraWheel::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_SPARK
loadspritegfx ANIM_TAG_SPARK_2
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0x0, 0xC, 0xC, 0x303B @Pinkish-Red Electricity
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 0x0, 0xC, 0xC, 0x76E1 @Blue Electricity
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0x0, 0xA, 0xA, 0x303B @Pinkish-Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK, 0, 12, 12, RGB(27, 1, 12) @Pinkish-Red Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 0, 12, 12, RGB(1, 23, 29) @Blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 10, 10, RGB(27, 1, 12) @Pinkish-Red
setalpha 12, 8
monbg ANIM_DEF_PARTNER
splitbgprio_foes ANIM_TARGET
createsprite gAuraWheelBlueElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelRedElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelBlueElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelRedElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelBlueElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelRedElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gAuraWheelBlueElectricityTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 6
- delay 0x4
+ delay 4
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 23, 1
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 2, 12, 0, 0x76E1 @Revert blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 2, 12, 0, RGB(1, 23, 29) @Revert blue Electricity
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x30, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x30, 0x2c, 0x40, 0x28, 0x1, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x30, 0x2c, 0x80, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x30, 0x2c, 0xc0, 0x28, 0x2, 0x8003
- delay 0x7
+ delay 7
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x9
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
@@ -13630,8 +13954,8 @@ gBattleAnimMove_AuraWheel::
gBattleAnimMove_BreakingSwipe::
loadspritegfx ANIM_TAG_IMPACT @hits
loadspritegfx ANIM_TAG_SPARK_2
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, 0x001F @Red
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 0, 12, 12, 0x001F @Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB_RED @Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPARK_2, 0, 12, 12, RGB_RED @Red
monbg ANIM_TARGET
setalpha 12, 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -32, -16, ANIM_TARGET, 1
@@ -13639,15 +13963,15 @@ gBattleAnimMove_BreakingSwipe::
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 21, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 21, 1
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x1
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 1
createsprite gBreakingSwipeCenteredElectricity, ANIM_TARGET, 2, 0xfff1, 0xfff6, 0x5, 0x0
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
- createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 0x1, 0x1
+ delay 4
+ createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 1
createsprite gBreakingSwipeCenteredElectricity, ANIM_TARGET, 2, 0xfff8, 0x8, 0x5, 0x2
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 1
createsprite gBreakingSwipeCenteredElectricity, ANIM_TARGET, 2, 0xffec, 0xf, 0x5, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
@@ -13673,15 +13997,15 @@ gBattleAnimMove_Overdrive::
loadspritegfx ANIM_TAG_THIN_RING
loadspritegfx ANIM_TAG_SPARK_2
loadspritegfx ANIM_TAG_ELECTRICITY
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, 0x76E1 @Blue Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRICITY, 0, 12, 12, RGB(1, 23, 29) @Blue Electricity
call BoltBeakSparks
waitforvisualfinish
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, 0x17BF @Yellow Electricity
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 12, 12, RGB(31, 29, 5) @Yellow Electricity
call OverdriveRings
- delay 0x8
+ delay 8
call OverdriveRings
- delay 0x10
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, 0x76E1 @Blue Electricity
+ delay 16
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 0, 12, RGB(1, 23, 29) @Blue Electricity
waitforvisualfinish
end
OverdriveRings:
@@ -13698,33 +14022,33 @@ OverdriveRings:
gBattleAnimMove_AppleAcid::
loadspritegfx ANIM_TAG_APPLE
loadspritegfx ANIM_TAG_POISON_BUBBLE
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 12, 12, 0x061D @Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 12, 12, RGB(29, 16, 1) @Orange
playsewithpan SE_M_METRONOME, SOUND_PAN_ATTACKER
createsprite gAppleAcidFloatingAppleTemplate, ANIM_ATTACKER, 12, 0x0
- delay 0x30
+ delay 48
monbg ANIM_TARGET
createsprite gAppleAcidLaunchTemplate, ANIM_TARGET, 2, 0x14, 0x0, 0x28, 0x1, 0x0, 0x0
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gAppleAcidLaunchTemplate, ANIM_TARGET, 2, 0x14, 0x0, 0x28, 0x1, 0x18, 0x0
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gAppleAcidLaunchTemplate, ANIM_TARGET, 2, 0x14, 0x0, 0x28, 0x1, 0xffe8, 0x0
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0x0, 0xffea, 0x0, 0xf, 0x37
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xffe6, 0xffe8, 0x0, 0xf, 0x37
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xf, 0xffe5, 0x0, 0xf, 0x32
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0xfff1, 0xffef, 0x0, 0xa, 0x2d
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
- delay 0xa
+ delay 10
createsprite gAppleAcidDripTemplate, ANIM_TARGET, 2, 0x1b, 0xffea, 0x0, 0xf, 0x32
playsewithpan SE_M_BUBBLE, SOUND_PAN_TARGET
waitforvisualfinish
@@ -13740,10 +14064,10 @@ gBattleAnimMove_GravApple::
call SmallAppleShower
call SmallAppleShower
createsprite gGravAppleLargeApple, ANIM_TARGET, 2, 0x0, 0x3c, 4, ANIM_TARGET
- delay 0x7
+ delay 7
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 21, 0, 4
- delay 0x30
+ delay 48
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
waitforvisualfinish
call UnsetPsychicBg
@@ -13751,34 +14075,34 @@ gBattleAnimMove_GravApple::
SmallAppleShower:
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, 35, 0x3c, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, -30, 0x44, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, 27, 0x37, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, -20, 0x32, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, 33, 0x3a, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, -12, 0x3a, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, 19, 0x3c, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, -38, 0x3a, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, 5, 0x3c, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
createsprite gGravAppleSmallApple, ANIM_TARGET, 2, -23, 0x28, 4, ANIM_TARGET
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x2
+ delay 2
return
@ credits to Skeli
@@ -13786,9 +14110,9 @@ gBattleAnimMove_SpiritBreak::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_TEAL_ALERT
loadspritegfx ANIM_TAG_EXPLOSION_2
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0x10, 0x10, 0x7FFF
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_TEAL_ALERT, 0x0, 0xA, 0xA, 0x7DDE
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_EXPLOSION_2, 0x0, 0xA, 0xA, 0x7DDE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 16, 16, RGB_WHITE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_TEAL_ALERT, 0, 10, 10, RGB(30, 14, 31)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION_2, 0, 10, 10, RGB(30, 14, 31)
monbg ANIM_DEF_PARTNER
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -20, 8, 48, 8, 56, 6
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
@@ -13802,7 +14126,7 @@ gBattleAnimMove_SpiritBreak::
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gSpriteTemplate_SpiritBreakExplode, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x1
waitforvisualfinish
- delay 0x5
+ delay 5
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
clearmonbg ANIM_DEF_PARTNER
waitforvisualfinish
@@ -13812,7 +14136,7 @@ gBattleAnimMove_StrangeSteam::
loadspritegfx ANIM_TAG_PINK_CLOUD
loadspritegfx ANIM_TAG_FINGER
loadspritegfx ANIM_TAG_WATER_GUN @blue colour
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FINGER, 0, 10, 10, 0x4798 @Green
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FINGER, 0, 10, 10, RGB(24, 28, 17) @Green
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 0x4, 0xA
@@ -13835,10 +14159,10 @@ StrangeSteamCloud:
createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0, 0
createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xa, 0x5
createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xfff6, 0xfffb
- delay 0x1
+ delay 1
createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0x14, 0xa
createsprite gStrangeSteamBlueCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xffec, 0xfff6
- delay 0x2
+ delay 2
return
gBattleAnimMove_LifeDew::
@@ -13847,22 +14171,22 @@ gBattleAnimMove_LifeDew::
monbg ANIM_ATK_PARTNER
createsprite gLifeDewDropletTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_ATTACKER
createsprite gLifeDewDropletTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_ATK_PARTNER
- delay 0x15
+ delay 21
playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
waitforvisualfinish
playsewithpan SE_M_ABSORB_2, SOUND_PAN_ATTACKER
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, 0, -5, ANIM_ATTACKER, FALSE
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, 0, -5, ANIM_ATK_PARTNER, FALSE
- delay 0x7
+ delay 7
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, -15, 10, ANIM_ATTACKER, FALSE
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, -15, 10, ANIM_ATK_PARTNER, FALSE
- delay 0x7
+ delay 7
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, -15, -15, ANIM_ATTACKER, FALSE
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, -15, -15, ANIM_ATK_PARTNER, FALSE
- delay 0x7
+ delay 7
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, 10, -5, ANIM_ATTACKER, FALSE
createsprite gLifeDewSpecialOrbsTemplate, ANIM_ATTACKER, 2, 10, -5, ANIM_ATK_PARTNER, FALSE
- delay 0x7
+ delay 7
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
end
@@ -13871,12 +14195,12 @@ gBattleAnimMove_Obstruct::
loadspritegfx ANIM_TAG_NOISE_LINE @growl
loadspritegfx ANIM_TAG_PROTECT
loadspritegfx ANIM_TAG_OBSTRUCT_CROSS
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_NOISE_LINE, 0, 10, 10, 0 @Black
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, 0 @Black
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_NOISE_LINE, 0, 10, 10, RGB_BLACK @Black
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, RGB_BLACK @Black
createvisualtask SoundTask_PlayDoubleCry, 2, ANIM_ATTACKER, DOUBLE_CRY_GROWL
call RoarEffect
waitforvisualfinish
- delay 0x10
+ delay 16
monbg ANIM_ATK_PARTNER
splitbgprio ANIM_ATTACKER
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
@@ -13895,34 +14219,34 @@ gBattleAnimMove_FalseSurrender::
monbg ANIM_ATTACKER
fadetobg BG_DARK
waitbgfadein
- delay 0x0
+ delay 0
playsewithpan SE_M_FAINT_ATTACK, 0xc0
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
createvisualtask AnimTask_AttackerFadeToInvisible, 0x2, 0x1
waitforvisualfinish
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
createvisualtask AnimTask_SetAttackerInvisibleWaitForSignal, 0x2,
monbg ANIM_TARGET
setalpha 12, 8
- delay 0x1
+ delay 1
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x1f, 0x3, 0x1, 0x7fff, 0xa, 0x0, 0xa
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 1, RGB_WHITE, 10, RGB_BLACK, 10
createsprite gSpriteTemplate_LargeCrossImpact, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x14
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 9, 1
waitforvisualfinish
clearmonbg ANIM_TARGET
blendoff
- delay 0x1
+ delay 1
setarg 0x7, 0x1000
- delay 0x1
+ delay 1
createvisualtask AnimTask_InitAttackerFadeFromInvisible, 0x2,
monbg ANIM_ATTACKER
createvisualtask AnimTask_AttackerFadeFromInvisible, 0x2, 0x1
waitforvisualfinish
clearmonbg ANIM_ATTACKER
- delay 0x1
+ delay 1
restorebg
waitbgfadein
end
@@ -13931,43 +14255,124 @@ gBattleAnimMove_MeteorAssault::
loadspritegfx ANIM_TAG_ELECTRIC_ORBS
loadspritegfx ANIM_TAG_METEOR
loadspritegfx ANIM_TAG_EXPLOSION
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 12, 12, 0x0B1D @Light orange
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, 0x0B1D @Light orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 12, 12, RGB(29, 24, 2) @Light orange
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB(29, 24, 2) @Light orange
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 48, 0, 4
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
waitforvisualfinish
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- delay 0xF
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 1, 0x10, 0x10, 0x7FFF @Screen flash white
+ delay 15
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 1, 16, 16, RGB_WHITE @Screen flash white
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 32, 1
call BasicExplosion
call BasicExplosion
waitforvisualfinish
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 1, 0x10, 0, 0x7FFF @Screen revert from white
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 1, 16, 0, RGB_WHITE @Screen revert from white
waitforvisualfinish
end
BasicExplosion:
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x1
- delay 0x3
+ delay 3
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, 0x1, 0x1
- delay 0x3
+ delay 3
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, 0x1, 0x1
- delay 0x3
+ delay 3
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, 0x1, 0x1
- delay 0x3
+ delay 3
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, 0x1, 0x1
return
gBattleAnimMove_Eternabeam::
- goto gBattleAnimMove_HyperBeam
+ loadspritegfx ANIM_TAG_HYDRO_PUMP
+ loadspritegfx ANIM_TAG_ROUND_SHADOW
+ loadspritegfx ANIM_TAG_BLUE_STAR
+ loadspritegfx ANIM_TAG_PURPLE_DRAKE
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(31, 4, 10) @Pinkish Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROUND_SHADOW, 0, 13, 13, RGB(31, 4, 10) @Pinkish Red
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(11, 1, 22)
+ fadetobgfromset BG_SPACIAL_REND_ON_OPPONENT BG_SPACIAL_REND_ON_PLAYER BG_SPACIAL_REND_ON_OPPONENT
+ playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
+ invisible ANIM_ATTACKER
+ createsprite gDevastatingDrakeDrakeUpSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0x04E0, 36, 21, 1, ANIM_ATTACKER
+ waitforvisualfinish
+ createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_SOLAR_BEAM, 0xf0, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5
+ call OblivionWingBeam
+ call OblivionWingBeam
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 4, 0, 12, RGB(31, 4, 10) @Pinkish Red
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ call OblivionWingBeam
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ visible ANIM_ATTACKER
+ waitforvisualfinish
+ restorebg
+ waitbgfadein
+ blendoff
+ end
+EternabeamGeyser:
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 3, 5, 1, 0
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -11, -15, 1, 0
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 8, -5, 1, 0
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -6, 18, 1, 0
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 1, 0
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 3, -11, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -11, -31, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 8, -21, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -6, 2, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0, -11, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 3, -27, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -11, -47, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 8, -47, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, -6, -14, ANIM_TARGET, 0
+ delay 0
+ createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0, -27, ANIM_TARGET, 0
+ delay 0
+ return
gBattleAnimMove_SteelBeam::
loadspritegfx ANIM_TAG_CLAW_SLASH
@@ -13987,7 +14392,7 @@ gBattleAnimMove_SteelBeam::
delay 4
createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 1
delay 4
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 0, 10, RGB(24, 24, 48)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 10, RGB(24, 24, 48)
createsprite gSteelBeamBigOrbSpriteTemplate, ANIM_TARGET, 3, 15, 0, 20, 2
delay 4
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 65, 1
@@ -14002,7 +14407,7 @@ gBattleAnimMove_SteelBeam::
call SteelBeam_Continuity
call SteelBeam_Continuity
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 10, 0, RGB(24, 24, 48)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 10, 0, RGB(24, 24, 48)
call UnsetHighSpeedBg
end
SteelBeam_Continuity:
@@ -14028,13 +14433,14 @@ SetSteelBeamBackground:
goto SetHighSpeedBgFade
SetSteelBeamBgPlayer:
fadetobg BG_STEEL_BEAM_PLAYER
+ goto SetHighSpeedBgFade
@Credits to Skeli
gBattleAnimMove_ExpandingForce::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_EXPLOSION_2
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0xA, 0xA, 0x7DDE
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_EXPLOSION_2, 0x0, 0xA, 0xA, 0x7DDE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 10, 10, RGB(30, 14, 31)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION_2, 0, 10, 10, RGB(30, 14, 31)
monbg ANIM_DEF_PARTNER
call SetPsychicBackground
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 10, 1
@@ -14068,74 +14474,74 @@ ExpandingForceBothTargets:
ExpandingForceExplosionGeyser:
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0003, 0x0005, ANIM_TARGET
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfff5, 0xfff1, ANIM_TARGET
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0008, 0xfffb, ANIM_TARGET
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfffa, 0x0012, ANIM_TARGET
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0000, 0x0005, ANIM_TARGET
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0003, 0xfff5, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfff5, 0xffe1, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0008, 0xffeb, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfffa, 0x0002, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0000, 0xfff5, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0003, 0xffe5, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfff5, 0xffd1, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0008, 0xffdb, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0xfffa, 0xfff2, ANIM_TARGET
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_ExpandingForceExplode, ANIM_TARGET, 4, 0x0000, 0xffe5, ANIM_TARGET
return
MaxKnuckleExplosionGeyser:
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0x0005, ANIM_TARGET, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xfff1, ANIM_TARGET, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xfffb, ANIM_TARGET, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0012, ANIM_TARGET, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0x0005, ANIM_TARGET, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xfff5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffe1, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffeb, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0002, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xfff5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xffe5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffd1, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffdb, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0xfff2, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xffe5, ANIM_TARGET, 0x0
return
@@ -14168,14 +14574,14 @@ gBattleAnimMove_ScaleShot::
loadspritegfx ANIM_TAG_SHELL_RIGHT
loadspritegfx ANIM_TAG_IMPACT
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x6
- delay 0x3
+ delay 3
playsewithpan SE_M_BONEMERANG, SOUND_PAN_ATTACKER
createsprite gSpriteTemplate_ScaleShotScale, ANIM_TARGET, 2, 0x10, 0x0, 0x0, 0x0, 0x14, 0x101
waitforvisualfinish
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 5, 1
- delay 0x10
+ delay 16
stopsound
waitforvisualfinish
end
@@ -14235,9 +14641,9 @@ MeteorBeamBlast:
MeteorBeamRockLaunch:
createsprite gSpriteTemplate_MeteorBeamRock, ANIM_TARGET, 2, 0, 0, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_MeteorBeamRock, ANIM_TARGET, 2, 0, 0, 0x10
- delay 0x2
+ delay 2
return
gBattleAnimMove_ShellSideArm::
@@ -14278,7 +14684,7 @@ gBattleAnimMove_ShellSideArmSpecial:: @ Modified Snipe Shot, placeholder
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 0x18, -12
waitforvisualfinish
- delay 0x20
+ delay 32
playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_TARGET
createsprite gSnipeShotBallTemplate, ANIM_TARGET, 2, 0, 0, 24
waitforvisualfinish
@@ -14289,7 +14695,7 @@ gBattleAnimMove_ShellSideArmSpecial:: @ Modified Snipe Shot, placeholder
@Credits to Skeli
gBattleAnimMove_MistyExplosion::
loadspritegfx ANIM_TAG_EXPLOSION
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x8, 0x9, 0x7A5B, 0x8, 0x0, 0x8
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(27, 18, 30), 8, RGB_BLACK, 8
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
@@ -14298,9 +14704,9 @@ gBattleAnimMove_MistyExplosion::
call Explosion1
call Explosion1
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x1, 0x1, 0x10, 0x10, 0x7F7F @;White Pink
- delay 0x32
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x1, 0x3, 0x10, 0x0, 0x7F7F @;White Pink
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 16, RGB(31, 27, 31) @;White Pink
+ delay 50
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 3, 16, 0, RGB(31, 27, 31) @;White Pink
end
@Credits to Skeli
@@ -14308,9 +14714,9 @@ gBattleAnimMove_GrassyGlide::
loadspritegfx ANIM_TAG_LEAF @leaves
loadspritegfx ANIM_TAG_IMPACT @hits
loadspritegfx ANIM_TAG_WHIP_HIT
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_IMPACT, 0x0, 0xD, 0xD, 0x0266 @;Leaf Green
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 13, 13, RGB(6, 19, 0) @;Leaf Green
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 2, 0, 8, RGB(12, 29, 0)
- delay 0x2
+ delay 2
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -120, 0, 0, 10 @;Slide off off, screen
waitforvisualfinish
@@ -14330,63 +14736,63 @@ gBattleAnimMove_RisingVoltage::
createvisualtask AnimTask_GetBattleEnvironment, 0x5,
jumpargeq 0x0, BG_ELECTRIC_TERRAIN, ANIM_RISING_VOLTAGE_STRONGER
ANIM_RISING_VOLTAGE_NORMAL:
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_BG, 0x1, 0x0, 0x4, 0x0 @;To black
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_BG, 1, 0, 4, RGB_BLACK @;To black
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 30, 0, 3 @;Amount, Slowness, Slowness, Compaction
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 0, 0x0
waitforvisualfinish
createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 0x2, 0x0, 0x1, 0x34, 0x1, 0x0
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 4, 0, 12, RGB(29, 28, 1)
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x10
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xffe0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32
call StokedSparksurferSparkGeyser
call StokedSparksurferSparkGeyser
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_BG, 0x1, 0x4, 0x0, 0x0 @;From black
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_BG, 1, 4, 0, RGB_BLACK @;From black
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
ANIM_RISING_VOLTAGE_STRONGER:
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_BG, 0x1, 0x0, 0xC, 0x0 @;To black
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_BG, 1, 0, 12, RGB_BLACK @;To black
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 55, 0, 0 @;Amount, Slowness, Slowness, Compaction
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2,
waitforvisualfinish
createvisualtask AnimTask_ShakeTargetBasedOnMovePowerOrDmg, 0x2, 0x0, 0x1, 0x54, 0x1, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0x10, 0x079D
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 0, 16, RGB(29, 28, 1)
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x10, 0x10
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x10, 0xfff0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x10, 0xffe0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, 16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 16, -32
call StokedSparksurferSparkGeyser
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -0x18, 0x10
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -0x18, 0xfff0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -0x18, 0xffe0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -24, 16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -24, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -24, -32
call StokedSparksurferSparkGeyser
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x10
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xffe0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32
call StokedSparksurferSparkGeyser
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x10, 0x0, 0x079D @;From Yellow
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_BG, 0x1, 0xC, 0x0, 0x0 @;From black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 16, 0, RGB(29, 28, 1) @;From Yellow
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_BG, 1, 12, 0, RGB_BLACK @;From black
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
@@ -14480,7 +14886,7 @@ gBattleAnimMove_SkitterSmack::
loadspritegfx ANIM_TAG_WHITE_SHADOW @Destiny Bond
loadspritegfx ANIM_TAG_QUICK_GUARD_HAND @Black Colour
loadspritegfx ANIM_TAG_RAZOR_LEAF
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_WHITE
waitforvisualfinish
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
invisible ANIM_ATTACKER
@@ -14494,10 +14900,10 @@ gBattleAnimMove_SkitterSmack::
invisible ANIM_ATTACKER
waitsound
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x30
- delay 0x17
+ delay 23
createvisualtask AnimTask_IsTargetSameSide, 0x2,
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2,
- delay 0x19
+ delay 25
visible ANIM_ATTACKER
invisible ANIM_ATTACKER
delay 5
@@ -14519,7 +14925,7 @@ gBattleAnimMove_SkitterSmack::
invisible ANIM_ATTACKER
delay 1
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_WHITE
waitforvisualfinish
end
@@ -14530,19 +14936,19 @@ gBattleAnimMove_BurningJealousy::
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 42, 1
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 8, RGB_RED
call BurningJealousyFireBuffEffect
- delay 0x8
+ delay 8
call BurningJealousyFireBuffEffect
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 8, RGB_RED
- delay 0x4
+ delay 4
call BurningJealousyFireBuffEffect
waitforvisualfinish
monbg ANIM_TARGET
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
call BurningJealousyFlames
- delay 0x8
+ delay 8
call BurningJealousyFlames
- delay 0x8
+ delay 8
call BurningJealousyFlames
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 12, 1
@@ -14556,13 +14962,13 @@ gBattleAnimMove_BurningJealousy::
BurningJealousyFireBuffEffect:
createsprite gSpriteTemplate_BurningJealousyFireBuff, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0xffe8, 0x1a, 0x2, 0x18
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_BurningJealousyFireBuff, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0xe, 0x1c, 0x1, 0x18
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_BurningJealousyFireBuff, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0xfffb, 0xa, 0x2, 0x18
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_BurningJealousyFireBuff, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x1c, 0x1a, 0x3, 0x18
- delay 0x3
+ delay 3
return
BurningJealousyFlames:
@@ -14582,35 +14988,35 @@ gBattleAnimMove_LashOut::
loadspritegfx ANIM_TAG_HANDS_AND_FEET @black color
loadspritegfx ANIM_TAG_SLAM_HIT_2
loadspritegfx ANIM_TAG_IMPACT @hit
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_SLAM_HIT_2, 0x0, 0xA, 0xA, 0x1F
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SLAM_HIT_2, 0, 10, 10, RGB_RED
monbg ANIM_DEF_PARTNER
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call PowerTripBuffUp
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_RED
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call PowerTripBuffUp
- delay 0x8
+ delay 8
call PowerTripBuffUp
waitforvisualfinish
fadetobg BG_DARK
waitbgfadein
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
createsprite gSpriteTemplate_LashOutStrike, ANIM_TARGET, 2, 0xfff0, 0xfff0, FALSE
- delay 0x8
+ delay 8
createsprite gFoulPlayImpactTemplate, ANIM_TARGET, 3, 10, 0x0, ANIM_TARGET, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -12, 10, 0, 3
- delay 0x8
+ delay 8
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x5
- delay 0x8
+ delay 8
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_TARGET
createsprite gSpriteTemplate_LashOutStrike, ANIM_TARGET, 2, 0xfff0, 0xfff0, TRUE
- delay 0x8
+ delay 8
createsprite gFoulPlayImpactTemplate, ANIM_TARGET, 3, -10, 0x0, ANIM_TARGET, 0x1
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 12, 10, 0, 3
- delay 0x8
+ delay 8
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x5
restorebg
@@ -14634,16 +15040,16 @@ gBattleAnimMove_Poltergeist::
waitforvisualfinish
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 0, 16, 0, RGB_BLACK
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
- delay 0x1
+ delay 1
createvisualtask AnimTask_DestinyBondWhiteShadow, 0x5, 0x0, 0x24
- delay 0x30
+ delay 48
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
createvisualtask AnimTask_PoltergeistItem, 2
waitforvisualfinish
setalpha 12, 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 5, 1
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x7, 0x5, 0x1, 0x0, 0xa, 0x0, 0x0
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_ATTACKER | F_PAL_TARGET, 5, 1, 0, 10, RGB_BLACK, 0
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish
createvisualtask AnimTask_NightmareClone, 0x2
@@ -14654,26 +15060,27 @@ gBattleAnimMove_Poltergeist::
waitbgfadein
clearmonbg 0x3
blendoff
+ unloadspritegfx ANIM_TAG_ITEM_BAG
end
@Credits to Skeli
gBattleAnimMove_CorrosiveGas::
loadspritegfx ANIM_TAG_PINK_CLOUD @Fumes
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_PINK_CLOUD, 0x0, 0xE, 0xE, 0x19EF @;Garbage green
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINK_CLOUD, 0, 14, 14, RGB(15, 15, 6) @;Garbage green
monbg ANIM_ATTACKER
loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER, 0x8, 0x3
- delay 0x0
+ delay 0
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 1, 2, 0, 15, RGB(15, 15, 6) @;Garbage green
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x7a, 0x3, 0xfff2, 0x12, 0x2e
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x79, 0x3, 0xe, 0xfff2, 0x2e
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x78, 0x3, 0xfff4, 0xfff6, 0x2e
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x77, 0x3, 0xe, 0xe, 0x2e
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x76, 0x3, 0x0, 0x0, 0x2e
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_CorrosiveGasSmoke, ANIM_ATTACKER, 0x7b, 0x3, 0x4, 0x4, 0x1e
waitforvisualfinish
playsewithpan SE_M_TOXIC, SOUND_PAN_TARGET
@@ -14853,28 +15260,28 @@ gBattleAnimMove_JungleHealing::
waitbgfadeout
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0x1a, 0xffff, 0x2, 0x96
playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- delay 0xa
+ delay 10
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x14, 0x1, 0x1, 0x8c
playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- delay 0xa
+ delay 10
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0x16, 0x1, 0x0, 0x82
playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- delay 0xa
+ delay 10
createsprite gIngrainRootSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0x19, 0xffff, 0x3, 0x78
playsewithpan SE_M_SCRATCH, SOUND_PAN_ATTACKER
- delay 0x28
+ delay 40
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 0x20, 0x1a, 0xffff, 0x3, 0x1e
- delay 0x5
+ delay 5
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 0xffd0, 0x14, 0x1, 0x2, 0x1e
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
createsprite gIngrainOrbSpriteTemplate, ANIM_ATTACKER, 3, 0x30, 0x1a, 0xfffe, 0x3, 0x12
playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
- delay 0xa
+ delay 10
playsewithpan SE_M_STAT_INCREASE, 0xc0
createvisualtask AnimTask_StatusClearedEffect, 0x2, 0x1
waitforvisualfinish
@@ -14922,22 +15329,22 @@ gBattleAnimMove_WickedBlow::
loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_PAIN_SPLIT
loadspritegfx ANIM_TAG_SPARKLE_4
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_PAIN_SPLIT, 0x0, 0x9, 0x9, 0x1F
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_FOCUS_ENERGY, 0x0, 0x8, 0x8, 0x1F
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PAIN_SPLIT, 0, 9, 9, RGB_RED
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FOCUS_ENERGY, 0, 8, 8, RGB_RED
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call WickedBlowBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_BLACK
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call WickedBlowBuffEffect
- delay 0x8
+ delay 8
call WickedBlowBuffEffect
waitforvisualfinish
fadetobg BG_DARK
waitbgfadeout
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 28, 0, 0, 5
- delay 0x5
+ delay 5
createsprite gSpriteTemplate_WickedBlowFist, ANIM_TARGET, 4, ANIM_TARGET, 0, 0, 16, 32
delay 6
loopsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET, 0x4, 0x6
@@ -14966,13 +15373,13 @@ gBattleAnimMove_WickedBlow::
WickedBlowBuffEffect:
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gPowerTripFocusEnergyTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -15044,7 +15451,7 @@ gBattleAnimMove_ThunderCage::
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 16
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 50, 1
call ThunderCageBolts
- delay 0x4
+ delay 4
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, -16
delay 4
createsprite gThunderWaveSpriteTemplate, ANIM_TARGET, 2, -16, 0
@@ -15056,24 +15463,24 @@ gBattleAnimMove_ThunderCage::
end
ThunderCageBolts:
createvisualtask AnimTask_ElectricBolt, 2, 25, -40, 1
- delay 0x9
+ delay 9
createvisualtask AnimTask_ElectricBolt, 2, -25, -40, 1
- delay 0x9
+ delay 9
createvisualtask AnimTask_ElectricBolt, 2, 0, -40, 1
- delay 0x9
+ delay 9
return
@Credits to Skeli
gBattleAnimMove_DragonEnergy::
loadspritegfx ANIM_TAG_HYDRO_PUMP
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x2C5E @;Regidrago Reddish Reddish, Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(30, 2, 11) @;Regidrago Reddish Reddish, Purple
monbg ANIM_TARGET
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 0, 4, 0, 11, RGB(31, 28, 31) @;Pinkish White
waitforvisualfinish
playsewithpan SE_M_DETECT, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x2C5E @;Regidrago Reddish Reddish, Purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 16, 0, RGB(30, 2, 11) @;Regidrago Reddish Reddish, Purple
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -120, 0, 0, 1 @;Slide off off, screen
waitforvisualfinish
playsewithpan SE_M_SOLAR_BEAM, SOUND_PAN_TARGET
@@ -15117,9 +15524,9 @@ gBattleAnimMove_DragonEnergy::
DragonEnergyShot:
createsprite gSpriteTemplate_DragonEnergyShot, ANIM_TARGET, 2, 0x19
- delay 0x1
+ delay 1
createsprite gSpriteTemplate_DragonEnergyShot, ANIM_TARGET, 2, 0x19
- delay 0x1
+ delay 1
return
@@ -15148,14 +15555,14 @@ gBattleAnimMove_FieryWrath::
loadspritegfx ANIM_TAG_PURPLE_RING
monbg ANIM_DEF_PARTNER
playsewithpan SE_M_SACRED_FIRE2, 0xc0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x2, 0x0, 0xE, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x4, 0x0, 0x8, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 2, 0, 14, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 4, 0, 8, RGB_RED
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 32, 1
call DragonClawFireSpiral
call DragonClawFireSpiral
waitforvisualfinish
loopsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET, 20, 3
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_DEF_SIDE, 0x4, 0x0, 0xF, 0x3006
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 4, 0, 15, RGB(6, 0, 12)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 60, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 4, 0, 60, 1
call FieryWrathGeyser
@@ -15163,9 +15570,9 @@ gBattleAnimMove_FieryWrath::
call FieryWrathGeyser
call FieryWrathGeyser
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x8, 0x0, 0x1F
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_DEF_SIDE, 0x2, 0x9, 0x0, 0x3006
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xE, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 8, 0, RGB_RED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 2, 9, 0, RGB(6, 0, 12)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 14, 0, RGB_BLACK
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -15173,52 +15580,52 @@ gBattleAnimMove_FieryWrath::
FieryWrathGeyser:
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x4, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x4, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x4, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x4, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
createsprite gSpriteTemplate_FieryWrathGeyser, ANIM_TARGET, 4, ANIM_DEF_PARTNER, 0xfff0, 0x10
- delay 0x0
+ delay 0
return
@@ -15234,23 +15641,23 @@ gBattleAnimMove_ThunderousKick::
setalpha 12, 8
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
createsprite gMegaPunchKickSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x1, 0x32
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0x7, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 7, RGB_WHITE
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 2, 0, 22, 1
call ZingZapSparks1
- delay 0xA
+ delay 10
call ZingZapSparks2
- delay 0xA
+ delay 10
call ZingZapSparks1
- delay 0xA
+ delay 10
call ZingZapSparks2
- delay 0x3
+ delay 3
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 48, 3, 0, 4
- delay 0x7
+ delay 7
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 22, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x10, 0x0, 0x7fff
- createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, 0x1f, 0x3, 0x1, 0x0, 0x8, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 16, 0, RGB_WHITE
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG | F_PAL_BATTLERS, 3, 1, RGB_BLACK, 8, RGB_BLACK, 0
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
clearmonbg ANIM_TARGET
@@ -15264,13 +15671,13 @@ gBattleAnimMove_GlacialLance::
loadspritegfx ANIM_TAG_ICICLE_SPEAR
loadspritegfx ANIM_TAG_ICE_CUBE
loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xA, 0x3C00 @;Royal Blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 10, RGB(0, 0, 15) @;Royal Blue
monbg ANIM_TARGET
playsewithpan SE_M_HAIL, SOUND_PAN_TARGET
createvisualtask AnimTask_CentredFrozenIceCube, ANIM_TARGET, 0
createsprite gSpriteTemplate_GlacialLance, ANIM_TARGET, 2, 0, 40, 0, 0, 40, 50, 10
delay 60
- createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, ANIM_TAG_ICICLE_SPEAR, 0x4, 0x1, 0x7FFF, 0x10, 0x0, 0x0
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ICICLE_SPEAR, 4, 1, RGB_WHITE, 16, 0, 0
playsewithpan SE_M_DETECT, SOUND_PAN_TARGET
delay 38
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
@@ -15279,44 +15686,62 @@ gBattleAnimMove_GlacialLance::
delay 4
call IceCrystalEffectLong
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0xA, 0x0, 0x3C00 @;Royal Blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 10, 0, RGB(0, 0, 15) @;Royal Blue
waitforvisualfinish
clearmonbg ANIM_TARGET
end
gBattleAnimMove_AstralBarrage::
- loadspritegfx ANIM_TAG_FLAT_ROCK
- loadspritegfx ANIM_TAG_ICE_CRYSTALS
- loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_FLAT_ROCK, 0x0, 0xA, 0xA, RGB(2, 1, 4)
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_ICE_CRYSTALS, 0x0, 0xA, 0xA, RGB(2, 1, 4)
+ loadspritegfx ANIM_TAG_PURPLE_FLAME
+ loadspritegfx ANIM_TAG_SHADOW_BALL
+ loadspritegfx ANIM_TAG_THIN_RING
+ loadspritegfx ANIM_TAG_ICE_CHUNK
+ loadspritegfx ANIM_TAG_HANDS_AND_FEET
monbg ANIM_ATK_PARTNER
splitbgprio ANIM_ATTACKER
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
setalpha 12, 8
fadetobg BG_GHOST
waitbgfadein
- createsprite gShakeMonOrPlatformSpriteTemplate, ANIM_ATTACKER, 2, 4, 1, 180, 1
- createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 5, 20, 0, 5
- createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 200, 96, 1, 120
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ createvisualtask AnimTask_GrudgeFlames, 3
+ createsprite gBlackHoleEclipseHoleUserSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_ATTACKER, 0
+ createsprite gBlackHoleEclipseBlueRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
delay 8
- createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 20, 248, 4, 112
+ createsprite gBlackHoleEclipseBlackRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
delay 8
- createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 130, 160, 2, 104
+ createsprite gBlackHoleEclipseBlueRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
delay 8
- createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 160, 192, 0, 96
+ createsprite gBlackHoleEclipseBlackRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0
delay 8
- createsprite gSuperpowerRockSpriteTemplate, ANIM_ATTACKER, 41, 60, 288, 3, 88
- delay 74
- panse SE_M_BLIZZARD, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
- call BlizzardIceCrystals
- call BlizzardIceCrystals
- playsewithpan SE_M_BLIZZARD2, SOUND_PAN_TARGET
+ unloadspritegfx ANIM_TAG_SHADOW_BALL
+ unloadspritegfx ANIM_TAG_THIN_RING
+ unloadspritegfx ANIM_TAG_ICE_CHUNK
+ unloadspritegfx ANIM_TAG_HANDS_AND_FEET
waitforvisualfinish
- playsewithpan SE_M_NIGHTMARE, SOUND_PAN_TARGET
+ loadspritegfx ANIM_TAG_WISP_FIRE
+ loadspritegfx ANIM_TAG_EXPLOSION
+ loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_PURPLE
+ call AstralBarrageFlames1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 50, 1
+ call AstralBarrageFlames2
+ call AstralBarrageFlames3
+ call AstralBarrageFlames4
+ call AstralBarrageFlames5
+ waitforvisualfinish
+ playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET
createspriteontargets gCurseGhostSpriteTemplate, ANIM_TARGET, 3, 2, 8, -5, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 8, 0, 16, 1
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 0
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 42
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 84
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 126
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 168
+ createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 210
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
restorebg
@@ -15324,6 +15749,76 @@ gBattleAnimMove_AstralBarrage::
blendoff
delay 1
end
+AstralBarrageFlames1:
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
+ delay 2
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
+ delay 2
+ return
+AstralBarrageFlames2:
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
+ delay 2
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
+ delay 2
+ return
+AstralBarrageFlames3:
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
+ delay 2
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 6, 5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
+ delay 2
+ return
+AstralBarrageFlames4:
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -16, -15, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
+ delay 2
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 16, -5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
+ delay 2
+ return
+AstralBarrageFlames5:
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, -12, 18, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
+ delay 2
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
+ delay 2
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gExplosionSpriteTemplate, ANIM_TARGET, 4, 0, 5, 3, 0
+ createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
+ delay 2
+ return
@Credits to Skeli
@@ -15346,25 +15841,25 @@ gBattleAnimMove_EerieSpell::
EerieSpellConvergingFlames:
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe0, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x16, 0xffea, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x1e, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x14, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x1c, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0xffed, 0x13, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0xffe5, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0xffee, 0xffee, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe7, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x11, 0xffef, 0x10
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_EerieSpellFlame, ANIM_TARGET, 2, 0x1, 0x0, 0x17, 0x0, 0x10
return
@@ -15373,16 +15868,16 @@ EerieSpellConvergingFlames:
gBattleAnimMove_DireClaw::
loadspritegfx ANIM_TAG_SLASH
loadspritegfx ANIM_TAG_POISON_BUBBLE
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SLASH, 0x0, 0xC, 0xC, 0x6038 @;Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SLASH, 0, 12, 12, RGB(24, 1, 24) @;Purple
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 4
delay 6
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x0
- delay 0x2
+ delay 2
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x0
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 36, 1
- delay 0x2
+ delay 2
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x0
call PoisonBubblesEffect
@@ -15398,20 +15893,20 @@ gBattleAnimMove_PsyshieldBash::
monbg ANIM_DEF_PARTNER
setalpha 12, 8
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x0, 0xB, 0x7FAF @;Light blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 11, RGB(15, 29, 31) @;Light blue
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 56, 10
- delay 0x23
+ delay 35
createsprite gSpriteTemplate_PsyshieldBashHit, ANIM_ATTACKER, 4, -10, 0x0, 0x1, 0x0
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- delay 0x1
+ delay 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, -16, 0, 0, 4
waitforvisualfinish
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
waitforvisualfinish
- delay 0x2
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0xB, 0x0, 0x7FAF @;Light blue
+ delay 2
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 11, 0, RGB(15, 29, 31) @;Light blue
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x5
- delay 0x3
+ delay 3
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0x7
waitforvisualfinish
call UnsetPsychicBg
@@ -15443,11 +15938,11 @@ gBattleAnimMove_StoneAxe::
splitbgprio ANIM_TARGET
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSpriteTemplate_StoneAxeSlash, ANIM_TARGET, 2, 50, -10, 100, 8, 1 @;Move left
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 16, 1
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
call StoneAxeRockFragments
- delay 0x8
+ delay 8
call StoneAxeRockFragments
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -15472,7 +15967,7 @@ gBattleAnimMove_SpringtideStorm::
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
- createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 2, 6, 0, 11, 0x7ADF
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 2, 6, 0, 11, RGB(31, 22, 30)
call HurricaneGustCentered
call SpringtideStormHeartSwirl
call HurricaneGustCentered
@@ -15491,15 +15986,15 @@ gBattleAnimMove_SpringtideStorm::
SpringtideStormHeartSwirl:
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_SpringtideHeart, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@@ -15514,13 +16009,13 @@ gBattleAnimMove_MysticalPower::
monbg ANIM_TARGET
splitbgprio ANIM_TARGET
call PsystrikeInwardRing
- delay 0xA
+ delay 10
call PsystrikeInwardRing
- delay 0xA
+ delay 10
call PsystrikeInwardRing
- delay 0xA
+ delay 10
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x6, 0x0, 0xB, 0x7FAF @;Light blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 6, 0, 11, RGB(15, 29, 31) @;Light blue
createvisualtask AnimTask_ExtrasensoryDistortion, 0x5, 0x0
call MysticalPowerFoeRings
createvisualtask AnimTask_ExtrasensoryDistortion, 0x5, 0x1
@@ -15529,7 +16024,7 @@ gBattleAnimMove_MysticalPower::
call MysticalPowerFoeTwoRingsOnly
waitforvisualfinish
clearmonbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xB, 0x0, 0x7FAF @;Light blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 11, 0, RGB(15, 29, 31) @;Light blue
call UnsetPsychicBg
blendoff
end
@@ -15582,16 +16077,16 @@ gBattleAnimMove_WaveCrash::
loadspritegfx ANIM_TAG_SMALL_BUBBLES
loadspritegfx ANIM_TAG_ICE_CRYSTALS @Bubbles on attacker
monbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0xB, 0x726A
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, RGB(10, 19, 28)
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -20, 8, 48, 8, 56, 6
call WaterfallBubblesOnAttacker
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 5, 5, 1
call RisingWaterHitEffect
waitforvisualfinish
- delay 0x5
+ delay 5
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0xB, 0x0, 0x726A
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 11, 0, RGB(10, 19, 28)
clearmonbg ANIM_DEF_PARTNER
waitforvisualfinish
end
@@ -15601,23 +16096,23 @@ gBattleAnimMove_WaveCrash::
gBattleAnimMove_Chloroblast::
loadspritegfx ANIM_TAG_THIN_RING
loadspritegfx ANIM_TAG_HYDRO_PUMP
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_THIN_RING, 0x0, 0xA, 0xA, 0x03AC
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_HYDRO_PUMP, 0x0, 0xC, 0xC, 0x03AC
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x2, 0x0, 0x10, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0x10, 0x03AC
- createvisualtask AnimTask_BlendNonAttackerPalettes, 0x2, 0x2, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_THIN_RING, 0, 10, 10, RGB(12, 29, 0)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB(12, 29, 0)
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 2, 0, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 16, RGB(12, 29, 0)
+ createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 2, 0, 16, RGB_BLACK
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
createsprite gThinRingShrinkingSpriteTemplate ANIM_ATTACKER, 0x28, 0, 0, 0, 0
- delay 0xe
+ delay 14
createsprite gThinRingShrinkingSpriteTemplate ANIM_ATTACKER, 0x28, 0, 0, 0, 0
- delay 0xe
+ delay 14
createsprite gThinRingShrinkingSpriteTemplate ANIM_ATTACKER, 0x28, 0, 0, 0, 0
waitforvisualfinish
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA,
fadetobg BG_CHLOROBLAST
waitbgfadeout
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x0, 0x10, 0x0, 0x0
- delay 0x10
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 16, 0, RGB_BLACK
+ delay 16
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 74, 1
createsoundtask SoundTask_LoopSEAdjustPanning, 0xf0, 0xFF00 | SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x1, 0x17, 0x0, 0x5
createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 1, 67
@@ -15641,21 +16136,21 @@ gBattleAnimMove_Chloroblast::
call ChloroblastShot
call ChloroblastShot
waitforvisualfinish
- delay 0x5
- createvisualtask AnimTask_BlendNonAttackerPalettes, 0x2, 0x2, 0x0, 0x0, 0x0 @;From Black
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0x10, 0x0, 0x03AC
+ delay 5
+ createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 2, 0, 0, RGB_BLACK @;From Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 16, 0, RGB(12, 29, 0)
restorebg
waitbgfadeout
createvisualtask AnimTask_AllBattlersVisible, 0xA,
clearmonbg ANIM_DEF_PARTNER
waitbgfadein
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x0, 0x0 @;From Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 0, RGB_BLACK @;From Black
end
ChloroblastShot:
createsprite gSpriteTemplate_ChloroblastShot, ANIM_TARGET, 2, 0, 0, 0x19
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_ChloroblastShot, ANIM_TARGET, 2, 0, 0, 0x19
- delay 0x2
+ delay 2
return
@Credits to Skeli
@@ -15664,21 +16159,21 @@ gBattleAnimMove_MountainGale::
loadspritegfx ANIM_TAG_DRAGON_ASCENT_FOE @White Rock Colour
monbg ANIM_TARGET
call MountainGaleIceRock
- delay 0x6
+ delay 6
call MountainGaleIceRock
- delay 0x6
+ delay 6
call MountainGaleIceRock
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 4, 24, 1
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
- delay 0x6
+ delay 6
call MountainGaleIceRock
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
- delay 0x6
+ delay 6
call MountainGaleIceRock
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
- delay 0x6
+ delay 6
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
- delay 0x6
+ delay 6
playsewithpan SE_M_STRENGTH, SOUND_PAN_TARGET
waitforvisualfinish
clearmonbg ANIM_TARGET
@@ -15696,17 +16191,17 @@ gBattleAnimMove_VictoryDance::
loadspritegfx ANIM_TAG_HOLLOW_ORB
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 40, 6, 3, 3
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
- delay 0x8
- createvisualtask AnimTask_BlendPalInAndOutByTag, 0x5, ANIM_TAG_HOLLOW_ORB, 0x0B1D, 0xe, 0x0, 0x3 @;Light orange
+ delay 8
+ createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(29, 24, 2), 14, 0, 3 @;Light orange
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x2b
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x55
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x80
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0xaa
createsprite gDragonDanceOrbSpriteTemplate, ANIM_ATTACKER, 2, 0xd5
- delay 0x1e
+ delay 30
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
- delay 0x1e
+ delay 30
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
waitforvisualfinish
end
@@ -15734,7 +16229,7 @@ gBattleAnimMove_HeadlongRush::
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 42, 0, 0, 5
createsprite gSpriteTemplate_HeadlongRushImpact, ANIM_TARGET, 4, 0xfff6, 0x0, 0x1, 0x0
- delay 0x5
+ delay 5
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 44, 1
call MaxQuake_DirtGeyser
call MaxQuake_DirtGeyser
@@ -15748,52 +16243,52 @@ MaxQuake_DirtGeyser:
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0003, 0x0005, 0x1, 0x0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff1, 0x1, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x100D, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0008, 0xfffb, 0x1, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x4, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfffa, 0x0012, 0x1, 0x0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0000, 0x0005, 0x1, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0003, 0xfff5, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xffe1, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0008, 0xffeb, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfffa, 0x0002, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0000, 0xfff5, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0003, 0xffe5, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xffd1, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0008, 0xffdb, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0xfffa, 0xfff2, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0000, 0xffe5, ANIM_TARGET, 0x0
createsprite gSpriteTemplate_MaxQuakeDirtGeyser, ANIM_TARGET, 4, 0, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_MaxQuakeRockGeyser, ANIM_TARGET, 4, ANIM_TARGET, 0xfff0, 0x10
return
@@ -15807,25 +16302,25 @@ gBattleAnimMove_BarbBarrage::
call BarbBarrageSpikeShoot
loopsewithpan SE_M_DIG, SOUND_PAN_ATTACKER, 0x7, 0x3
createvisualtask AnimTask_FlailMovement, 2, ANIM_ATTACKER
- delay 0x14
+ delay 20
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 7, 0, 32, 1
call PoisonBubblesEffect
clearmonbg ANIM_TARGET
end
BarbBarrageSpikeShoot:
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0xfb00, 0x0, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x0, 0x0500, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x0, 0xfb00, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x0500, 0x0300, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0xfb00, 0x0300, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0x0500, 0xfd00, 0x3
- delay 0x0
+ delay 0
createsprite gSpriteTemplate_BarbBarrage, ANIM_TARGET, 2, 0x0, 0x0, 0x1e, 0xfb00, 0xfd00, 0x3
return
@@ -15835,7 +16330,7 @@ BarbBarrageSpikeShoot:
gBattleAnimMove_EsperWing::
loadspritegfx ANIM_TAG_PUNISHMENT_BLADES @Punishment Blade
loadspritegfx ANIM_TAG_WHITE_FEATHER
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_WHITE_FEATHER, 0x0, 0xA, 0xA, 0x7DDE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_WHITE_FEATHER, 0, 10, 10, RGB(30, 14, 31)
monbg ANIM_TARGET
call SetPsychicBackground
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
@@ -15876,30 +16371,30 @@ gBattleAnimMove_BitterMalice::
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
createvisualtask AnimTask_ScaryFace, 0x5 @ internally checks side
createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 76, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0xF, 0x3006 @;Dark Purple
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_PURPLE_RING, 0x4, 0x0, 0xE, 0x3006 @;Dark Purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 0, 15, RGB(6, 0, 12) @;Dark Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PURPLE_RING, 4, 0, 14, RGB(6, 0, 12) @;Dark Purple
call BitterMaliceSwirl
call BitterMaliceSwirl
call BitterMaliceSwirl
- delay 0x4 @;Wait until the blends are reset after the scary face fades out
+ delay 4 @;Wait until the blends are reset after the scary face fades out
call IceCrystalEffectShort
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0xF, 0x0, 0x3006 @;Dark Purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 15, 0, RGB(6, 0, 12) @;Dark Purple
end
BitterMaliceSwirl:
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, 0x1
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, 0x1
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, 0x1
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, 0x1
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, 0x1
- delay 0x2
+ delay 2
createsprite gSpriteTemplate_BitterMaliceRing, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, 0x1
- delay 0x2
+ delay 2
return
@ credits to Skeli
@@ -15908,8 +16403,8 @@ gBattleAnimMove_Shelter::
loadspritegfx ANIM_TAG_SHELL_RIGHT
playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShellSmashShrinkAttacker, 0x2
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_SHELL_LEFT, 0x1, 0x0, 0xE, 0x6B5A @ light light, gray
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_SHELL_RIGHT, 0x1, 0x0, 0xE, 0x6B5A @ light light, gray
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHELL_LEFT, 1, 0, 14, RGB(26, 26, 26) @ light light, gray
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SHELL_RIGHT, 1, 0, 14, RGB(26, 26, 26) @ light light, gray
createsprite gShellSmashRightShellSpriteTemplate, ANIM_ATTACKER, 2, 0xffd7, 0x0, 0x2, 0x333, 0x0, 10, 30
createsprite gShellSmashLeftShellSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0x0, 0x6, 0xfccd, 0x0, 10, 30
createvisualtask AnimTask_FadeOutParticles, 0x2, 0
@@ -15929,20 +16424,20 @@ gBattleAnimMove_TripleArrows::
waitforvisualfinish
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 6, 6, 1
- delay 0x4
+ delay 4
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
createsprite gSpiritShackleArrowTemplate, ANIM_TARGET, 2, -40, 0, 0, 0, TRIPLE_ARROW_FLY_TIME
- delay 0x3
+ delay 3
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
createsprite gSpiritShackleArrowTemplate, ANIM_TARGET, 2, 40, 0, 0, 0, TRIPLE_ARROW_FLY_TIME
- delay 0x3
+ delay 3
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 10, 1
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
createvisualtask AnimTask_IsAttackerPlayerSide, 0x2,
jumpargeq 0x7, FALSE, TripleArrowsOnOpponent
createsprite gSpiritShackleArrowTemplate, ANIM_TARGET, 2, 0, -60, 0, 0, TRIPLE_ARROW_FLY_TIME
TripleArrowsEnd:
- delay 0x3
+ delay 3
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -15962,11 +16457,11 @@ gBattleAnimMove_InfernalParade::
playsewithpan SE_M_PSYBEAM, 0xc0
waitbgfadein
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
- delay 0x3
+ delay 3
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
call InfernalFlames
call InfernalFlames
@@ -15980,20 +16475,20 @@ gBattleAnimMove_InfernalParade::
createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 0xa8
createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 0xd2
waitforvisualfinish
- delay 0xC
+ delay 12
restorebg
waitbgfadein
clearmonbg ANIM_TARGET
end
InfernalFlames:
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, -30, -20 @;Top left
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, -30, 10, 20 @;Bottom left
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, -30, -20 @;Top right
- delay 0x3
+ delay 3
createsprite gSpriteTemplate_InfernalParadeFlame, ANIM_TARGET, 2, 30, 10, 20 @;Bottom right
- delay 0x3
+ delay 3
return
@@ -16004,33 +16499,33 @@ gBattleAnimMove_CeaselessEdge::
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 44, 0, 0, 5
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x10, 0x10, 0x1F @;Fully to to, Red
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_ATTACKER | F_PAL_TARGET), 0x0, 0x10, 0x10, 0x0 @;Fully to to, Black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 16, 16, RGB_RED @;Fully to to, Red
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_TARGET), 0, 16, 16, RGB_BLACK @;Fully to to, Black
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xa,
- delay 0x10
+ delay 16
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 3, 0, 48, 1
call CeaselessEdgeSlashes
call CeaselessEdgeSlashes
call CeaselessEdgeSlashes
waitforvisualfinish
- delay 0x8
+ delay 8
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA,
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x10, 0x0, 0x7FFF @;From White
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 16, 0, RGB_WHITE @;From White
waitforvisualfinish
end
CeaselessEdgeSlashes:
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSpriteTemplate_CeaselessEdgeSlash, ANIM_TARGET, 2, 8, 0, FALSE, FALSE
- delay 0x4
+ delay 4
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSpriteTemplate_CeaselessEdgeSlash, ANIM_TARGET, 2, -8, -8, TRUE, FALSE
- delay 0x4
+ delay 4
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSpriteTemplate_CeaselessEdgeSlash, ANIM_TARGET, 2, -8, 0, TRUE, TRUE
- delay 0x4
+ delay 4
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
createsprite gSpriteTemplate_CeaselessEdgeSlash, ANIM_TARGET, 2, 8, -4, FALSE, TRUE
return
@@ -16043,7 +16538,7 @@ gBattleAnimMove_BleakwindStorm::
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, RGB_WHITE
call HurricaneGustCentered
call BleakwindStormIceSwirl
call HurricaneGustCentered
@@ -16058,20 +16553,20 @@ gBattleAnimMove_BleakwindStorm::
call BleakwindStormIceSwirl
waitforvisualfinish
stopsound
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, RGB_WHITE
waitforvisualfinish
end
BleakwindStormIceSwirl:
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_BleakwindIce, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@@ -16087,7 +16582,7 @@ gBattleAnimMove_WildboltStorm::
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, RGB(30, 31, 1)
call HurricaneGustCentered
call WildboltStormSparkSwirl
call HurricaneGustCentered
@@ -16102,22 +16597,22 @@ gBattleAnimMove_WildboltStorm::
call WildboltStormSparkSwirl
waitforvisualfinish
stopsound
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, RGB(30, 31, 1)
call UnsetPsychicBg
waitforvisualfinish
end
WildboltStormSparkSwirl:
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x210, 0x1e, 0xa, 0x32, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x24, 0x1e0, 0x14, 0xd, 0xffd2, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x240, 0x14, 0x5, 0x2a, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x23, 0x190, 0x19, 0x8, 0xffd6, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x200, 0x19, 0xd, 0x2e, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gSpriteTemplate_WildboltStormSpark, ANIM_TARGET, 2, 6, 0x0, 0x25, 0x1d0, 0x1e, 0xc, 0xffce, ANIM_TARGET
return
@@ -16126,11 +16621,11 @@ WildboltStormSparkSwirl:
gBattleAnimMove_SandsearStorm::
loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_SMALL_EMBER
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_GUST, 0x0, 0xA, 0xA, 0x190B
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_GUST, 0, 10, 10, RGB(11, 8, 6)
playsewithpan SE_M_GUST, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 88, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 88, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 4, 0, 11, RGB_RED
call HurricaneGustCentered
call SandsearStormFireSpin
call HurricaneGustCentered
@@ -16145,21 +16640,21 @@ gBattleAnimMove_SandsearStorm::
call SandsearStormFireSpin
waitforvisualfinish
stopsound
- createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, 0x1F
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_DEF_PARTNER), 1, 11, 0, RGB_RED
waitforvisualfinish
end
SandsearStormFireSpin:
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_TARGET
- delay 0x2
+ delay 2
createspriteontargets gFireSpinSpriteTemplate, ANIM_TARGET, 2, 6, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_TARGET
return
@@ -16172,26 +16667,26 @@ gBattleAnimMove_LunarBlessing::
loadspritegfx ANIM_TAG_SMALL_EMBER @Yellow colour for ring
monbg ANIM_ATK_PARTNER
setalpha 16, 0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x0
- createvisualtask AnimTask_BlendNonAttackerPalettes, 0x2, 0x1, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB_BLACK
+ createvisualtask AnimTask_BlendNonAttackerPalettes, 2, 1, 0, 16, RGB_BLACK
waitforvisualfinish
createsprite gMoonSpriteTemplate, ANIM_ATTACKER, 2, 0x78, 0x38
createvisualtask AnimTask_AlphaFadeIn, 0x3, 0x0, 0x10, 0x10, 0x0, 0x1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x7, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 7, 0, 16, RGB_BLACK
loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 0x10, 0x3
call HealingEffect2
createsprite gSpriteTemplate_LunarDanceRing, ANIM_ATTACKER, 2,
- delay 0x4
+ delay 4
createsprite gSpriteTemplate_LunarDanceRing, ANIM_ATTACKER, 2,
- delay 0x4
+ delay 4
createsprite gSpriteTemplate_LunarDanceRing, ANIM_ATTACKER, 2,
- delay 0x24
+ delay 36
clearmonbg ANIM_ATK_PARTNER
call HealingEffect
- delay 0x28
+ delay 40
createvisualtask AnimTask_AllBattlersInvisible, 0xA,
createvisualtask AnimTask_MoonlightEndFade, 0x2,
- delay 0x10
+ delay 16
createvisualtask AnimTask_AllBattlersVisible, 0xA,
waitforvisualfinish
blendoff
@@ -16205,7 +16700,7 @@ gBattleAnimMove_TakeHeart::
loadspritegfx ANIM_TAG_GUARD_RING
playsewithpan SE_M_BUBBLE, SOUND_PAN_ATTACKER
createsprite gSpriteTemplate_TakeHeartFallingHeart, ANIM_ATTACKER, 2, 0, 0x3a, 4, ANIM_ATTACKER
- delay 0x15
+ delay 21
loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 0x10, 0x4
createvisualtask AnimTask_StatusClearedEffect, 0x2, 0x0
call TakeHeartRings
@@ -16225,7 +16720,7 @@ gBattleAnimMove_TakeHeart::
TakeHeartRings:
createsprite gSpriteTemplate_TakeHeartRing, ANIM_ATTACKER, 2,
- delay 0x4
+ delay 4
return
gBattleAnimMove_BitterBlade::
@@ -16480,7 +16975,7 @@ gBattleAnimMove_BurningBulwark::
monbg ANIM_ATK_PARTNER
splitbgprio ANIM_ATTACKER
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER 16
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 13, 13, 0x015B
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 13, 13, RGB(27, 10, 0)
createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
delay 2
@@ -16502,7 +16997,7 @@ gBattleAnimMove_BurningBulwark::
gBattleAnimMove_AlluringVoice::
loadspritegfx ANIM_TAG_THIN_RING
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x8, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 8, RGB(29, 19, 27)
waitforvisualfinish
createvisualtask SoundTask_PlayCryWithEcho, 5, FALSE
createsprite gHyperVoiceRingSpriteTemplate, ANIM_ATTACKER, 0, 45, 0, 0, 0, 0, 0, 1
@@ -16510,13 +17005,13 @@ gBattleAnimMove_AlluringVoice::
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 6, 1
createvisualtask AnimTask_ShakeBattlePlatforms, 2, 1, 0, 6, 1
createvisualtask SoundTask_WaitForCry, 5
- delay 0xA
+ delay 10
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 1, 0, 26, 1
createvisualtask AnimTask_ShakeMon2, 2, ANIM_DEF_PARTNER, 1, 0, 26, 1
waitforvisualfinish
createvisualtask SoundTask_WaitForCry, 0x5
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x8, 0x0, 0x6e7d
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 8, 0, RGB(29, 19, 27)
waitforvisualfinish
end
@@ -16727,7 +17222,7 @@ gBattleAnimMove_UpperHand::
splitbgprio ANIM_TARGET
setalpha 12, 8
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
- createsprite gKarateChopSpriteTemplate, 2, 8, -16, 0, 0, 0, 10, 1, 3, 0
+ createsprite gKarateChopSpriteTemplate, ANIM_ATK_PARTNER, 8, -16, 0, 0, 0, 10, 1, 3, 0
waitforvisualfinish
playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
createsprite gForcePalmSpriteTemplate 3, 4, 0, 0, 1, 2
@@ -16794,19 +17289,19 @@ gBattleAnimMove_PsychicNoise::
monbg ANIM_DEF_PARTNER
call SetPsychicBackground
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0
@@ -16868,7 +17363,7 @@ gBattleAnimMove_Trailblaze::
call TrailblazeVortex
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 5
- delay 0x3
+ delay 3
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 6, 0, 8, 1
@@ -16881,24 +17376,24 @@ gBattleAnimMove_Trailblaze::
createsprite gTropKickLeavesTemplate, ANIM_TARGET, 1, 0, 10, 112, -128, 40
playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_ATTACKER
waitforvisualfinish
- delay 0x8
+ delay 8
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x7
waitforvisualfinish
clearmonbg ANIM_TARGET
end
TrailblazeVortex:
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gLeafTornadoVortexTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
gBattleAnimMove_LastRespects::
@@ -17292,32 +17787,32 @@ ElectroShotSetUp:
loadspritegfx ANIM_TAG_GRAY_SMOKE @dispersal
monbg ANIM_ATTACKER
setalpha 14, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
loopsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER, 0xE, 0x8
createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, 0x0
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
call TechnoBlastCharging1
- delay 0xF
+ delay 15
call TechnoBlastCharging2
- delay 0xF
+ delay 15
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
blendoff
clearmonbg ANIM_ATTACKER
@@ -17328,7 +17823,7 @@ ElectroShotUnleash:
loadspritegfx ANIM_TAG_ELECTRICITY
loadspritegfx ANIM_TAG_SPARK_2
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0xC, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, RGB_BLACK
waitforvisualfinish
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
delay 12
@@ -17360,7 +17855,7 @@ ElectroShotUnleash:
call SparkBeam
call SparkBeam
delay 20
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0xC, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(31, 31, 22)
waitforvisualfinish
@@ -17388,6 +17883,7 @@ gBattleAnimMove_IvyCudgel::
end
IvyCudgelFire:
loadspritegfx ANIM_TAG_IVY_CUDGEL_FIRE
+ loadspritegfx ANIM_TAG_SMALL_EMBER
createsprite gIvyCudgelFireSpriteTemplate, ANIM_TARGET, 2
delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@@ -17395,10 +17891,14 @@ IvyCudgelFire:
createvisualtask AnimTask_SquishTarget, 0x2
delay 6
call WoodHammerImpact
+ call FireSpreadEffect
+ delay 4
+ playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
waitforvisualfinish
end
IvyCudgelRock:
loadspritegfx ANIM_TAG_IVY_CUDGEL_ROCK
+ loadspritegfx ANIM_TAG_ROCKS
createsprite gIvyCudgelRockSpriteTemplate, ANIM_TARGET, 2
delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@@ -17406,10 +17906,16 @@ IvyCudgelRock:
createvisualtask AnimTask_SquishTarget, 0x2
delay 6
call WoodHammerImpact
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -12, 32, 3, 4
+ createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 8, 31, 2, 2
+ createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, -4, 28, 2, 3
+ createsprite gRockScatterSpriteTemplate, ANIM_TARGET, 2, 12, 30, 4, 3
waitforvisualfinish
end
IvyCudgelWater:
loadspritegfx ANIM_TAG_IVY_CUDGEL_WATER
+ loadspritegfx ANIM_TAG_SPLASH
createsprite gIvyCudgelWaterSpriteTemplate, ANIM_TARGET, 2
delay 60
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 12, 4
@@ -17417,6 +17923,8 @@ IvyCudgelWater:
createvisualtask AnimTask_SquishTarget, 0x2
delay 6
call WoodHammerImpact
+ playsewithpan SE_M_DIVE, SOUND_PAN_TARGET
+ createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 3, 1
waitforvisualfinish
end
@@ -17424,7 +17932,7 @@ gBattleAnimMove_SpicyExtract::
loadspritegfx ANIM_TAG_SMALL_EMBER
loadspritegfx ANIM_TAG_POISON_BUBBLE
loadspritegfx ANIM_TAG_SMALL_BUBBLES
- createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 12, 12, 0x061D @Orange
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 12, 12, RGB(29, 16, 1) @Orange
call SludgeBombProjectile
call SludgeBombProjectile
call SludgeBombProjectile
@@ -17455,9 +17963,9 @@ gBattleAnimMove_SpicyExtract::
createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -16, 44, 20
playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_TARGET
call LetsSnuggleForeverTears
- delay 0x8
+ delay 8
call LetsSnuggleForeverTears
- delay 0x8
+ delay 8
call LetsSnuggleForeverTears
waitsound
waitforvisualfinish
@@ -17542,11 +18050,11 @@ gBattleAnimMove_FilletAway::
createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 60, -37, 0
playsewithpan SE_M_CUT, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 9, RGB_WHITE
waitforvisualfinish
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 2, 4, 4
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, 0x7FFF
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 9, 0, RGB_WHITE
waitforvisualfinish
blendoff
end
@@ -17960,328 +18468,2686 @@ gBattleAnimMove_Thunderclap::
delay 4
createvisualtask AnimTask_BlendBattleAnimPal, 5, F_PAL_TARGET, 0, 0, 0, RGB_BLACK
waitforvisualfinish
- clearmonbg ANIM_ATK_PARTNER
+ clearmonbg ANIM_ATK_PARTNER
+ blendoff
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_HardPress::
+ loadspritegfx ANIM_TAG_EXPLOSION
+ loadspritegfx ANIM_TAG_ACUPRESSURE
+ loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE
+ setalpha 15, 0
+ call SetSteelBeamBackground
+ createvisualtask AnimTask_CompressTargetHorizontallyFast, 2
+ createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 0, 0, 1, 1
+ delay 3
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
+ createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 24, -24, 1, 1
+ delay 3
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
+ createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, -16, 16, 1, 1
+ delay 3
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
+ createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, -24, -12, 1, 1
+ delay 3
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
+ createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 16, 16, 1, 1
+ waitforvisualfinish
+ blendoff
+ call UnsetHighSpeedBg
+ end
+
+gBattleAnimMove_DragonCheer::
+ loadspritegfx ANIM_TAG_NOISE_LINE
+ loadspritegfx ANIM_TAG_CONFETTI
+ loadspritegfx ANIM_TAG_PINK_CLOUD
+ createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
+ delay 12
+ call RoarEffect
+ createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3
+ waitforvisualfinish
+ monbg ANIM_ATTACKER
+ playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 24
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, 6, 24
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, 12, 24
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 18, 24
+ createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 24
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ call CreateFlatterConfetti
+ waitforvisualfinish
+ clearmonbg ANIM_ATTACKER
+ delay 10
+ end
+
+gBattleAnimMove_MalignantChain::
+ loadspritegfx ANIM_TAG_PURPLE_CHAIN
+ loadspritegfx ANIM_TAG_POISON_BUBBLE
+ loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2
+ createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1
+ delay 7
+ createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1
+ delay 3
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
+ delay 20
+ setarg 7, -1
+ playsewithpan SE_M_BIND, SOUND_PAN_TARGET
+ waitforvisualfinish
+ call PoisonBubblesEffect
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_PopulationBomb::
+ loadspritegfx ANIM_TAG_CUT
+ monbg ANIM_TARGET
+ setalpha 12, 8
+ playsewithpan SE_M_CUT, SOUND_PAN_TARGET
+ createvisualtask AnimTask_RandomBool, 2
+ jumpretfalse PopulationBombSliceRight
+ jumprettrue PopulationBombSliceLeft
+PopulationBombSliceRight:
+ createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
+ goto PopulationBombContinue
+PopulationBombSliceLeft:
+ createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1
+PopulationBombContinue:
+ delay 5
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ blendoff
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_RevivalBlessing::
+ goto gBattleAnimMove_LunarBlessing
+
+gBattleAnimMove_TeraStarstorm::
+ loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+ loadspritegfx ANIM_TAG_STARSTORM
+ loadspritegfx ANIM_TAG_YELLOW_STAR
+ loadspritegfx ANIM_TAG_IMPACT
+ fadetobg BG_COSMIC
+ waitbgfadein
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 15, 15, RGB_WHITE
+ playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
+ createsprite gGrowingShockWaveOrbSpriteTemplate, ANIM_ATTACKER, 2
+ delay 20
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 2
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ call TeraStarstormCreateBeam
+ delay 20
+ playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
+ delay 20
+ playsewithpan SE_FALL, SOUND_PAN_ATTACKER
+ jumpifmovetypeequal TYPE_STELLAR, TeraStarstormStellar
+ goto TeraStarstormSingle
+TeraStarstormStellar:
+ jumpifdoublebattle TeraStarstormDouble
+TeraStarstormSingle:
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
+ delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
+ delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
+ delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
+ delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
+ delay 3
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, ANIM_TARGET, 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, -5, 30, 0, 1
+ delay 3
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -16, 8, ANIM_TARGET, 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 5, 30, 0, 1
+ delay 3
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 16, 8, ANIM_TARGET, 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
+ delay 3
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 2
+ delay 5
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 24, 0, ANIM_TARGET, 2
+ delay 5
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 24, 16, ANIM_TARGET, 2
+ waitforvisualfinish
+ restorebg
+ waitbgfadeout
+ end
+TeraStarstormDouble:
+ loadspritegfx ANIM_TAG_EXPLOSION_2
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION_2, 0, 12, 12, RGB_WHITE
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 1, 1
+ delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 1, 1
+ delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 1, 1
+ delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 1, 1
+ delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 1, 1
+ delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 1, 1
+ delay 3
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 10, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 10, 30, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 0, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, -8, 0, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 1, 1
+ delay 3
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -16, 0, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, -16, 0, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 1, 1
+ delay 3
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 16, 8, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, 16, 8, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 2
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 1, 1
+ delay 3
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
+ createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 24, 0, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, 24, 0, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 5
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 24, 16, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, 24, 16, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 5
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -24, 16, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, -24, 16, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ delay 5
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -24, -8, ANIM_TARGET, 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_DEF_PARTNER, 2, -24, -8, ANIM_DEF_PARTNER, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 0, 3, 50, 1
+ call ExpandingForceExplosionGeyser
+ delay 5
+ call ExpandingForceExplosionGeyser
+ delay 5
+ waitforvisualfinish
+ restorebg
+ waitbgfadeout
+ end
+
+TeraStarstormCreateBeam::
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -3, 1, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 1, 0, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 3, -1, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -2, 0, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 0, 1, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -1, -1, 0, 0, 20
+ createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 2, 0, 0, 0, 20
+ return
+
+gBattleAnimMove_TachyonCutter::
+ loadspritegfx ANIM_TAG_CUT
+ loadspritegfx ANIM_TAG_BUBBLE
+ createsprite gTachyonCutterSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
+ createsprite gTachyonCutterSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1
+ playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_SaltCure::
+ loadspritegfx ANIM_TAG_SALT_PARTICLE
+ loadspritegfx ANIM_TAG_WATER_ORB
+ call SaltCureEffect
+ call SaltCureEffect
+ call SaltCureEffect
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ waitforvisualfinish
+ call gBattleAnimGeneral_SaltCureDamage
+ end
+
+SaltCureEffect:
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 33, 416, 40, 4, 42, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 31, 288, 45, 6, -42, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 28, 448, 45, 11, 46, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 33, 464, 50, 10, -50, ANIM_TARGET
+ delay 2
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ return
+
+gBattleAnimMove_GlaiveRush::
+ loadspritegfx ANIM_TAG_CUT @Cut
+ loadspritegfx ANIM_TAG_SWORD @Sword
+ call SetHighSpeedBg
+ setalpha 12, 8
+ playsewithpan SE_M_SWORDS_DANCE, SOUND_PAN_ATTACKER
+ createsprite gSwordsDanceBladeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0
+ delay 22
+ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_SWORD, 2, 2, RGB(18, 31, 31), 16, 0, 0
+ waitforvisualfinish
+ delay 1
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_DRAGON_ASCENT
+ monbg ANIM_ATTACKER
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_DRAGON_ASCENT, 0, 10, 10, RGB(0, 0, 31) @Blue
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 0, 16, RGB_WHITE
+ delay 4
+ createvisualtask AnimTask_AttackerFadeToInvisible, 5, 0
+ waitforvisualfinish
+ createvisualtask SoundTask_PlaySE2WithPanning, 5, 238, SOUND_PAN_ATTACKER
+ createsprite gGlaiveRushSpriteTemplate, ANIM_TARGET, 2
+ delay 14
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, 1, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 6, 0, 12, 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_ATTACKER | F_PAL_BG | F_PAL_ANIM_1 | F_PAL_ANIM_2), 2, 16, 0, RGB(26, 31, 0)
+ waitforvisualfinish
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 15, 0, RGB_WHITE
+ waitforvisualfinish
+ clearmonbg ANIM_ATTACKER
+ call UnsetHighSpeedBg
+ end
+
+gBattleAnimMove_ArmorCannon::
+ loadspritegfx ANIM_TAG_HANDS_AND_FEET
+ loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+ loadspritegfx ANIM_TAG_ELECTRIC_ORBS
+ loadspritegfx ANIM_TAG_GUST
+ loadspritegfx ANIM_TAG_FLASH_CANNON_BALL
+ monbg ANIM_ATTACKER
+ setalpha 13, 8
+ fadetobg BG_FIRE
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 2560, 0, 1, -1
+ waitbgfadein
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HANDS_AND_FEET, 0, 12, 12, RGB(31, 0, 0)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ELECTRIC_ORBS, 0, 15, 15, RGB(31, 0, 0)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 15, 15, RGB(31, 0, 0)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FLASH_CANNON_BALL, 0, 15, 15, RGB(31, 16, 0)
+ createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 30
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 30
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ createsprite gFlashCannonGrayChargeTemplate, ANIM_ATTACKER, 2, 0
+ delay 25
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 20
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 15
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 10
+ delay 6
+ loopsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER, 6, 5
+ waitforvisualfinish
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER
+ createsprite gFlashCannonBallMovementTemplate, ANIM_TARGET, 2, 0, 0, 21
+ clearmonbg ANIM_ATTACKER
+ waitforvisualfinish
+ loadspritegfx ANIM_TAG_SMALL_EMBER @FireSpreadEffect
+ call FireSpreadEffect
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
+ delay 4
+ playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_TripleDive::
+ loadspritegfx ANIM_TAG_SPARKLE_6
+ loadspritegfx ANIM_TAG_ROUND_SHADOW
+ loadspritegfx ANIM_TAG_SPLASH
+ playsewithpan SE_M_DIVE, SOUND_PAN_ATTACKER
+ invisible ANIM_ATTACKER
+ createsprite gDiveWaterSplashSpriteTemplate, ANIM_ATTACKER, 3, 0
+ call DiveSetUpWaterDroplets
+ call DiveSetUpWaterDroplets
+ call DiveSetUpWaterDroplets
+ call DiveSetUpWaterDroplets
+ call DiveSetUpWaterDroplets
+ loadspritegfx ANIM_TAG_WATER_IMPACT
+ loadspritegfx ANIM_TAG_SMALL_BUBBLES
+ monbg ANIM_DEF_PARTNER
+ setalpha 12, 8
+ playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
+ createsprite gDiveWaterSplashSpriteTemplate, ANIM_TARGET, 131, 1
+ call DiveAttackWaterDroplets
+ call DiveAttackWaterDroplets
+ call DiveAttackWaterDroplets
+ call DiveAttackWaterDroplets
+ call DiveAttackWaterDroplets
+ delay 12
+ call RisingWaterHitEffect
+ waitforvisualfinish
+ visible ANIM_ATTACKER
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ end
+
+gBattleAnimMove_Doodle::
+ loadspritegfx ANIM_TAG_PENCIL
+ monbg ANIM_TARGET
+ createvisualtask AnimTask_SketchDrawMon, 2
+ createsprite gPencilSpriteTemplate, ANIM_TARGET, 2
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ delay 12
+ call GrowthEffect
+ waitforvisualfinish
+ call GrowthEffect
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_Ruination::
+ setalpha 0, 16
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 1, 0, 20, 1
+ playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 3, 0, 48, 1
+ createvisualtask AnimTask_BlendMonInAndOut, 2, ANIM_ATTACKER, RGB(31, 6, 1), 12, 4, 1
+ waitforvisualfinish
+ delay 20
+ delay 1
+ createvisualtask AnimTask_InitMementoShadow, 2
+ delay 1
+ createvisualtask AnimTask_MoveAttackerMementoShadow, 5
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 48
+ playsewithpan SE_M_PSYBEAM2, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_MementoHandleBg, 2
+ delay 12
+ setalpha 0, 16
+ delay 1
+ monbg_static ANIM_TARGET
+ createvisualtask AnimTask_MoveTargetMementoShadow, 5
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_TARGET
+ waitforvisualfinish
+ clearmonbg_static ANIM_TARGET
+ delay 1
+ blendoff
+ delay 1
+ end
+
+gBattleAnimMove_CollisionCourse::
+ loadspritegfx ANIM_TAG_SMALL_EMBER
+ loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+ loadspritegfx ANIM_TAG_ELECTRICITY
+ monbg ANIM_ATTACKER
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 8, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 10, 10, RGB(31, 0, 0)
+ waitforvisualfinish
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 2
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 6
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 10
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ clearmonbg ANIM_ATTACKER
+ createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 0
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 1
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 2
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 3
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 4
+ playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER
+ delay 8
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 8, 0, RGB_BLACK
+ call SetImpactBackground
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ createsprite gFireSpreadSpriteTemplate, ANIM_ATTACKER, 2, 1, 16, 16
+ delay 2
+ createsprite gFireSpreadSpriteTemplate, ANIM_ATTACKER, 2, 1, -16, -16
+ delay 8
+ createvisualtask AnimTask_VoltTackleAttackerReappear, 5
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
+ waitforvisualfinish
+ call FireSpreadEffect
+ delay 4
+ playsewithpan SE_M_FIRE_PUNCH, SOUND_PAN_TARGET
+ waitforvisualfinish
+ restorebg
+ waitbgfadein
+ end
+
+gBattleAnimMove_ElectroDrift::
+ loadspritegfx ANIM_TAG_SPARK
+ loadspritegfx ANIM_TAG_SPARK_2
+ loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
+ loadspritegfx ANIM_TAG_ELECTRICITY
+ loadspritegfx ANIM_TAG_LIGHTNING
+ monbg ANIM_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_THUNDER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, -256, 0, 1, -1
+ waitbgfadein
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0
+ delay 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 24, 121, 13, ANIM_ATTACKER, 1, 1
+ delay 10
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1
+ delay 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 24, 165, 10, ANIM_ATTACKER, 1, 1
+ delay 0
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0
+ delay 4
+ createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
+ playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ clearmonbg ANIM_ATTACKER
+ blendoff
+ delay 8
+ createvisualtask AnimTask_VoltTackleBolt, 5, 0
+ playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 1
+ playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 2
+ playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 3
+ playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
+ waitforvisualfinish
+ createvisualtask AnimTask_VoltTackleBolt, 5, 4
+ playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_ATTACKER
+ delay 2
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
+ delay 5
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
+ delay 1
+ playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 10, 0, 18, 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -32
+ playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
+ delay 10
+ createvisualtask AnimTask_ShakeTargetInPattern, 2, 30, 3, TRUE, 0
+ delay 2
+ createvisualtask AnimTask_VoltTackleAttackerReappear, 5
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 3, 0, 9, 1
+ call ElectricityEffect
+ waitforvisualfinish
+ blendoff
+ delay 2
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_Psyblade::
+ loadspritegfx ANIM_TAG_SLASH
+ loadspritegfx ANIM_TAG_CROSS_IMPACT
+ loadspritegfx ANIM_TAG_LEER
+ call SetPsychicBackground
+ waitbgfadein
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
+ playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ delay 12
+ createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 24, -12
+ playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
+ waitforvisualfinish
+ createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0
+ playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+ delay 4
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 15, 0, 40, 1
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 10, 10, RGB_RED
+ createsprite gSpriteTemplate_LargeCrossImpact, ANIM_TARGET, 2, 0, 0, 1, 36
+ playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+ delay 4
+ waitforvisualfinish
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
+ waitforvisualfinish
+ clearmonbg ANIM_ATTACKER
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_MightyCleave::
+ loadspritegfx ANIM_TAG_SLASH
+ loadspritegfx ANIM_TAG_CROSS_IMPACT
+ loadspritegfx ANIM_TAG_LEER
+ loadspritegfx ANIM_TAG_ROCKS
+ fadetobg BG_ROCK_WRECKER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0xF000, 0, 0, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 38, 1
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ call MightyCleaveDiggingRun
+ waitforvisualfinish
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
+ playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ delay 12
+ createsprite gLeerSpriteTemplate, ANIM_TARGET, 2, 24, -12
+ playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 1
+ waitforvisualfinish
+ createsprite gSlashSliceSpriteTemplate, ANIM_TARGET, 2, 1, -8, 0
+ playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+ delay 4
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 15, 0, 40, 1
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 10, 10, RGB_RED
+ createsprite gSpriteTemplate_LargeCrossImpact, ANIM_TARGET, 2, 0, 0, 1, 36
+ playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
+ delay 4
+ waitforvisualfinish
+ createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 2
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ waitbgfadein
+ call UnsetPsychicBg
+ waitforvisualfinish
+ end
+MightyCleaveDiggingRun:
+ createsprite gRockPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 12, 4, -16, 18
+ createsprite gRockPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 16, 4, -10, 18
+ createsprite gRockPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 14, 4, -18, 18
+ createsprite gRockPlumeSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 12, 4, -16, 18
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 5
+ return
+
+gBattleAnimMove_SupercellSlam::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_SPARK_2
+ delay 0
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 5, 5, RGB(31, 31, 22)
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 24, 190, 12, ANIM_ATTACKER, 1, 0
+ delay 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 24, 22, 12, ANIM_ATTACKER, 1, 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 24, 121, 13, ANIM_ATTACKER, 1, 1
+ delay 0
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
+ delay 10
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 5, 5, RGB(31, 31, 22)
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 24, 60, 10, ANIM_ATTACKER, 1, 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 24, 42, 11, ANIM_ATTACKER, 1, 1
+ delay 0
+ createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 24, 165, 10, ANIM_ATTACKER, 1, 1
+ delay 0
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
+ delay 20
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 7, 7, RGB(31, 31, 22)
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 0, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 64, 20, 1, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 128, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 32, 12, 192, 20, 2, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 32, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 96, 20, 1, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 160, 20, 0, 0
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, 16, 12, 224, 20, 2, 0
+ delay 4
+ waitforvisualfinish
+ createvisualtask AnimTask_BlendColorCycle, 2, (F_PAL_BG | F_PAL_ATTACKER), -31, 1, 0, 0, RGB(31, 31, 22)
+ delay 4
+ monbg ANIM_DEF_PARTNER
+ setalpha 12, 8
+ playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
+ createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 6, 1, ANIM_ATTACKER
+ waitforvisualfinish
+ delay 11
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5
+ delay 6
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, -10, 0, ANIM_TARGET, 0
+ loopsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET, 10, 2
+ delay 1
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -28, 0, 0, 3
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ waitforvisualfinish
+ delay 10
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 6
+ delay 5
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 6
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, -31, 2, 0, 6, RGB(31, 31, 22)
+ call ElectricityEffect
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ end
+
+gBattleAnimMove_BlazingTorque::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_SMALL_EMBER
+ fadetobg BG_FIRE
+ waitbgfadeout
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 16, 16, RGB_WHITE
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
+ delay 3
+ waitforvisualfinish
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ call FireSpreadEffect
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ @waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
+ waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
+ waitforvisualfinish
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_WickedTorque::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_POISON_BUBBLE
+ loadspritegfx ANIM_TAG_THIN_RING
+ fadetobg BG_DARK
+ waitbgfadein
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 16, 16, RGB_WHITE
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
+ delay 3
+ waitforvisualfinish
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 10, 0, 0
+ createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0, 0, 256, 0
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
+ delay 2
+ createsprite gFoulPlayRingTemplate, ANIM_ATTACKER, 3, 0, 0, 256, 0
+ waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
+ waitforvisualfinish
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_NoxiousTorque::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_POISON_BUBBLE
+ fadetobg BG_GUNK_SHOT
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 16, 16, RGB_WHITE
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
+ delay 3
+ waitforvisualfinish
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 1, 2, 0, 12, RGB(30, 0, 31)
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ delay 5
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 0, 40, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 46, 9, 20
+ delay 5
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -43, -12, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 16, -46, 20
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
+ waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
+ waitforvisualfinish
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_CombatTorque::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_METEOR
+ fadetobg BG_IN_AIR
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0, 0x1000, 0, -1
+ waitbgfadein
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 16, 16, RGB_WHITE
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
+ delay 3
+ waitforvisualfinish
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gSuperpowerFireballSpriteTemplate, ANIM_TARGET, 3, ANIM_ATTACKER
+ delay 4
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ @waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
+ waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
+ waitforvisualfinish
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_MagicalTorque::
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_PINK_HEART
+ loadspritegfx ANIM_TAG_DUCK
+ loadspritegfx ANIM_TAG_RED_HEART
+ fadetobg BG_TWINKLE_TACKLE
+ waitbgfadeout
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 2, 4
+ waitforvisualfinish
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 0, 16, 16, RGB_WHITE
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 20, 0, 0, 4
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
+ delay 0
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
+ createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
+ delay 3
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
+ waitforvisualfinish
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
+ createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
+ waitforvisualfinish
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
+ delay 3
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 1, 0, 7
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+
+gBattleAnimMove_TeraBlast::
+ jumpifmovetypeequal TYPE_NORMAL, TeraBlastNormal
+ jumpifmovetypeequal TYPE_FIGHTING, TeraBlastFighting
+ jumpifmovetypeequal TYPE_FLYING, TeraBlastFlying
+ jumpifmovetypeequal TYPE_POISON, TeraBlastPoison
+ jumpifmovetypeequal TYPE_GROUND, TeraBlastGround
+ jumpifmovetypeequal TYPE_ROCK, TeraBlastRock
+ jumpifmovetypeequal TYPE_BUG, TeraBlastBug
+ jumpifmovetypeequal TYPE_GHOST, TeraBlastGhost
+ jumpifmovetypeequal TYPE_STEEL, TeraBlastSteel
+ jumpifmovetypeequal TYPE_FIRE, TeraBlastFire
+ jumpifmovetypeequal TYPE_WATER, TeraBlastWater
+ jumpifmovetypeequal TYPE_GRASS, TeraBlastGrass
+ jumpifmovetypeequal TYPE_ELECTRIC, TeraBlastElectric
+ jumpifmovetypeequal TYPE_PSYCHIC, TeraBlastPsychic
+ jumpifmovetypeequal TYPE_ICE, TeraBlastIce
+ jumpifmovetypeequal TYPE_DRAGON, TeraBlastDragon
+ jumpifmovetypeequal TYPE_DARK, TeraBlastDark
+ jumpifmovetypeequal TYPE_FAIRY, TeraBlastFairy
+ jumpifmovetypeequal TYPE_STELLAR, TeraBlastStellar
+ end
+TeraBlastNormal:
+ loadspritegfx ANIM_TAG_PINKVIO_ORB
+ loadspritegfx ANIM_TAG_ORBS
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINKVIO_ORB, 0, 12, 12, RGB_WHITE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ORBS, 0, 12, 12, RGB_WHITE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_WHITE
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, 0
+ waitforvisualfinish
+ createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(25, 25, 25)
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ call HyperBeamOrbs
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(25, 25, 25)
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, 0
+ waitforvisualfinish
+ blendoff
+ clearmonbg ANIM_ATTACKER
+ end
+TeraBlastFighting:
+ loadspritegfx ANIM_TAG_PINKVIO_ORB
+ loadspritegfx ANIM_TAG_HANDS_AND_FEET
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINKVIO_ORB, 0, 12, 12, RGB(29, 24, 2)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(29, 24, 2)
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_ROCK_WRECKER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0xF000, 0, 0, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 63, 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 24, 0, 0, 10, 1, ANIM_FOOT_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
+ delay 2
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -6, 18, 0, 0, 10, 1, ANIM_CHOP, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 16, 0, 0, 10, 1, ANIM_FIST_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 21, 0, 0, 10, 1, ANIM_FOOT_2, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 20, 0, 0, 10, 1, ANIM_FIST_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -32, 23, 0, 0, 10, 1, ANIM_CHOP, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 17, 0, 0, 10, 1, ANIM_FOOT_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -80, 16, 0, 0, 10, 1, ANIM_FOOT_2, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -96, 21, 0, 0, 10, 1, ANIM_CHOP, 1
+ delay 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 24, 0, 0, 10, 1, ANIM_FOOT_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -6, 18, 0, 0, 10, 1, ANIM_CHOP, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -64, 16, 0, 0, 10, 1, ANIM_FIST_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 21, 0, 0, 10, 1, ANIM_FOOT_2, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -48, 20, 0, 0, 10, 1, ANIM_FIST_1, 1
+ delay 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 1
+ createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, -32, 23, 0, 0, 10, 1, ANIM_CHOP, 1
+ delay 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 1, 1
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ clearmonbg ANIM_TARGET
+ waitbgfadein
+ call UnsetPsychicBg
+ waitforvisualfinish
+ end
+TeraBlastPoison:
+ loadspritegfx ANIM_TAG_POISON_BUBBLE
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_PURPLE
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPoisonSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_GUNK_SHOT
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+ playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 50, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB_PURPLE
+ call PoisonBubblesEffect
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+ playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+ call PoisonBubblesEffect
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 42, 27, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -27, 44, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, 39, -28, 20
+ createsprite gSludgeBombHitParticleSpriteTemplate, ANIM_TARGET, 2, -42, -42, 20
+ playsewithpan SE_M_DIG, SOUND_PAN_TARGET
+ delay 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ delay 0
+ call UnsetSkyBg
+ end
+TeraBlastFlying:
+ loadspritegfx ANIM_TAG_AIR_WAVE_2
+ loadspritegfx ANIM_TAG_METAL_SOUND_WAVES
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_METAL_SOUND_WAVES, 0, 12, 12, RGB_WHITE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_WHITE
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gAirWaveSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_BLIZZARD2, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ call SetSkyBg
+ splitbgprio ANIM_TARGET
+ setalpha 12, 8
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ call TeraBlastFlyingBeam
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 50, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 2, 0, 12, RGB_WHITE
+ call TeraBlastFlyingBeam
+ call TeraBlastFlyingBeam
+ delay 8
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ blendoff
+ delay 0
+ call UnsetSkyBg
+ end
+TeraBlastRock:
+ loadspritegfx ANIM_TAG_ROCKS
+ loadspritegfx ANIM_TAG_FIRE_PLUME
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FIRE_PLUME, 0, 12, 12, RGB(29, 24, 2)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(29, 24, 2)
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sRockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_ROCK_WRECKER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0xF000, 0, 0, -1
+ waitbgfadein
+ playsewithpan SE_FALL, SOUND_PAN_TARGET
+ call TeraBlastRock1
+ delay 3
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ call TeraBlastRock2
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 40, 16 @; For Meteor 1
+ createvisualtask AnimTask_HorizontalShake, 5, 5, 2, 1
+ delay 3
+ call TeraBlastRock3
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -8, 16 @; For Meteor 2
+ delay 3
+ call TeraBlastRock4
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 21, 16 @; For Meteor 3
+ delay 3
+ call TeraBlastRock1
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -8, 16 @; For Meteor 4
+ createvisualtask AnimTask_HorizontalShake, 5, 5, 2, 1
+ delay 3
+ call TeraBlastRock2
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 40, 16 @; For Meteor 1
+ delay 3
+ call TeraBlastRock3
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 21, 16 @; For Meteor 3
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastBug:
+ loadspritegfx ANIM_TAG_HOLLOW_ORB
+ loadspritegfx ANIM_TAG_SPARKLE_6
+ loadspritegfx ANIM_TAG_IMPACT
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_GREEN
+ createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB_GREEN, 14, 0, 3
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gDragonDanceOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ monbg ANIM_DEF_PARTNER
+ call SetBugBg
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 50, 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, 30
+ delay 1
+ createsprite gMaxFlutterbyButterflySpriteTemplate, ANIM_ATTACKER, 2, 3, 0, -20
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0, 0, 4
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ call UnsetBugBg
+ end
+TeraBlastGround:
+ loadspritegfx ANIM_TAG_MUD_SAND
+ loadspritegfx ANIM_TAG_FIRE_PLUME
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(29, 24, 2)
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMudSandSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_ROCK_THROW, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_FISSURE
+ waitbgfadeout
+ createvisualtask AnimTask_PositionFissureBgOnBattler, 5, ANIM_TARGET, 5, -1
+ waitbgfadein
+ createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 50
+ playsewithpan SE_M_EARTHQUAKE, SOUND_PAN_TARGET
+ delay 40
+ loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 3, 25, 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -10, -15
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 25
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 15, 5
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -25, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 30, 30
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, -27, 25
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 0, 8
+ delay 1
+ loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -10, -15
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 25
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 15, 5
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -25, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 30, 30
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, -27, 25
+ delay 1
+ loopsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_TARGET 11, 3
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 0, 8
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 5, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -10, -15
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 0, 25
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 15, 5
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, -25, 0
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, 30, 30
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 2, 1, -27, 25
+ delay 1
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_TARGET, 66, 1, 0, 8
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_TARGET, 66, 0, 0, 4
+ waitforvisualfinish
+ restorebg
+ waitbgfadeout
+ setarg 7, -1
+ waitbgfadein
+ end
+TeraBlastGhost:
+ loadspritegfx ANIM_TAG_PURPLE_FLAME
+ loadspritegfx ANIM_TAG_EXPLOSION
+ loadspritegfx ANIM_TAG_GHOSTLY_SPIRIT
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_PURPLE
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_GHOST
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 46, 1
+ delay 6
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 40, 40, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -40, -40, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 0, 40, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB_PURPLE
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 0, -40, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 40, -20, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 40, 20, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -40, -20, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -40, 20, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -20, 30, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 20, -30, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -20, -30, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 30, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, -40, 0, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 2
+ createsprite gGhostProjectileSpriteTemplate, ANIM_TARGET, 2, 40, 0, 16
+ playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
+ delay 6
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastSteel:
+ loadspritegfx ANIM_TAG_METAL_BALL
+ loadspritegfx ANIM_TAG_ROCKS
+ loadspritegfx ANIM_TAG_REALLY_BIG_ROCK
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_ROCKS, 0, 12, 12, RGB(25, 25, 25)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_REALLY_BIG_ROCK, 0, 12, 12, RGB(25, 25, 25)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(25, 25, 25)
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sMetalBallSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ call SetSteelBeamBackground
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
+ call ContinentalCrushStockpileRocks
+ createsprite gContinentalCrushGrowingRockSpriteTemplate, ANIM_ATTACKER, 41, 0, 0, 0, 0
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
+ call ContinentalCrushStockpileRocks
+ delay 30
+ loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
+ createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
+ waitforvisualfinish
+ playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
+ createsprite gReallyBigRockBlastRockSpriteTemplate, ANIM_TARGET, 2, 16, 0, 0, 0, 25, 257
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastFire:
+ loadspritegfx ANIM_TAG_SMALL_EMBER
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(31, 0, 0)
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ monbg ANIM_ATTACKER
+ setalpha 14, 8
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 12, 0
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ createvisualtask AnimTask_GetAttackerSide, 2
+ jumprettrue TeraBlastFireOnPlayer
+ goto TeraBlastFireOnOpponent
+TeraBlastFireOnOpponent:
+ panse SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB(31, 0, 0)
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, 0
+ waitforvisualfinish
+ blendoff
+ clearmonbg ANIM_ATTACKER
+ end
+TeraBlastFireOnPlayer:
+ panse SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB(31, 0, 0)
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 12, 0, 0
+ waitforvisualfinish
+ blendoff
+ clearmonbg ANIM_ATTACKER
+ end
+TeraBlastWater:
+ loadspritegfx ANIM_TAG_HYDRO_PUMP
+ loadspritegfx ANIM_TAG_FIRE_PLUME
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FIRE_PLUME, 0, 12, 12, RGB_BLUE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_BLUE
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_HYDRO_PUMP, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ delay 2
+ createsprite gHydroPumpSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ waitforvisualfinish
+ fadetobg BG_WATER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ playsewithpan SE_FALL, SOUND_PAN_TARGET
+ call TeraBlastWater1
+ delay 3
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ call TeraBlastWater2
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 40, 16 @; For Meteor 1
+ createvisualtask AnimTask_HorizontalShake, 5, 5, 2, 1
+ delay 3
+ call TeraBlastWater3
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -8, 16 @; For Meteor 2
+ delay 3
+ call TeraBlastWater4
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 21, 16 @; For Meteor 3
+ delay 3
+ call TeraBlastWater1
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -8, 16 @; For Meteor 4
+ createvisualtask AnimTask_HorizontalShake, 5, 5, 2, 1
+ delay 3
+ call TeraBlastWater2
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 7, 4, 2
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 40, 16 @; For Meteor 1
+ delay 3
+ call TeraBlastWater3
+ playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
+ createsprite gDragonRageFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 21, 16 @; For Meteor 3
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastGrass:
+ loadspritegfx ANIM_TAG_LEAF
+ loadspritegfx ANIM_TAG_FLOWER
+ loadspritegfx ANIM_TAG_EXPLOSION
+ loadspritegfx ANIM_TAG_AIR_WAVE_2
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(0, 31, 0)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_AIR_WAVE_2, 0, 12, 12, RGB_GREEN
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_LEAF_STORM
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x0A00, 0, 1, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ call AeroblastBeam
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 5, 0, 50, 1
+ call AeroblastBeam
+ call AeroblastBeam
+ call AeroblastBeam
+ call AeroblastBeam
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastElectric:
+ loadspritegfx ANIM_TAG_SHOCK
+ loadspritegfx ANIM_TAG_SPARK
+ loadspritegfx ANIM_TAG_SHOCK_3
+ loadspritegfx ANIM_TAG_SPARK_2
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_YELLOW
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sCirclingShockSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_THUNDER
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0xff00, 0, 1, -1
+ waitbgfadein
+ loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET, 3, 10
+ createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 44, 0, 0, 3
+ createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 44, 0, 0, 3
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 44, 0, 0, 3
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 44, 0, 0, 3
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 0, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 64, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 128, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 32, 44, 192, 40, 2, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 32, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 96, 40, 1, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 160, 40, 0, -32765
+ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0, 0, 16, 44, 224, 40, 2, -32765
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 2, 2, RGB_BLACK
+ delay 6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 6, RGB_BLACK
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 6, 0, RGB_BLACK
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastPsychic:
+ loadspritegfx ANIM_TAG_PINKVIO_ORB
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PINKVIO_ORB, 0, 12, 12, RGB_PURPLE
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_PURPLE
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPinkVioletOrbSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_PSYCHIC
+ waitbgfadeout
+ createvisualtask AnimTask_SetPsychicBackground, 5
+ waitbgfadein
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
+ loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 8, 8, 30, 1
+ createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 30, ANIM_TARGET, 1
+ waitforvisualfinish
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x1 | 0x2 | 0x4
+ waitforvisualfinish
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastIce:
+ loadspritegfx ANIM_TAG_ICE_CRYSTALS
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(12, 26, 31) @ light blue
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sIceCrystalSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_ICE
+ waitbgfadein
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 0, 9, RGB(12, 26, 31)
+ playsewithpan SE_M_STRING_SHOT, SOUND_PAN_TARGET
+ createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 0
+ createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 64
+ createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 128
+ createsprite gIceCrystalSpiralInwardSmall, ANIM_ATTACKER, 2, 192
+ delay 5
+ createsprite gIceCrystalSpiralInwardLarge, ANIM_ATTACKER, 2, 32
+ createsprite gIceCrystalSpiralInwardLarge, ANIM_ATTACKER, 2, 96
+ createsprite gIceCrystalSpiralInwardLarge, ANIM_ATTACKER, 2, 160
+ createsprite gIceCrystalSpiralInwardLarge, ANIM_ATTACKER, 2, 224
+ delay 17
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 5, 3, 1
+ waitforvisualfinish
+ delay 15
+ call IceCrystalEffectShort
+ delay 5
+ call IceCrystalEffectShort
+ delay 5
+ call IceCrystalEffectShort
+ delay 5
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 2, 9, 0, RGB(12, 26, 31)
+ waitforvisualfinish
+ blendoff
+ call UnsetPsychicBg
+ end
+TeraBlastDragon:
+ loadspritegfx ANIM_TAG_SMALL_EMBER
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SMALL_EMBER, 0, 12, 12, RGB(10, 25, 31)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(10, 25, 31)
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gFireSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_FLAME_WHEEL, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_FIRE_2
+ waitbgfadeout
+ createvisualtask AnimTask_StartSlidingBg, 5, 0x1000, 0, 0, -1
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ createvisualtask AnimTask_GetAttackerSide, 2
+ jumprettrue TeraBlastDragonOnPlayer
+ goto TeraBlastDragonOnOpponent
+TeraBlastDragonOnOpponent:
+ panse SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB(31, 0, 0)
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ call FireSpreadBlast
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
+ waitforvisualfinish
blendoff
- waitforvisualfinish
+ call UnsetPsychicBg
end
-
-gBattleAnimMove_HardPress::
- loadspritegfx ANIM_TAG_EXPLOSION
- loadspritegfx ANIM_TAG_ACUPRESSURE
- loadspritegfx ANIM_TAG_PURPLE_HAND_OUTLINE
- setalpha 15, 0
- call SetSteelBeamBackground
- createvisualtask AnimTask_CompressTargetHorizontallyFast, 2
- createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 0, 0, 1, 1
- delay 3
- playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 24, -24, 1, 1
- delay 3
- playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, -16, 16, 1, 1
- delay 3
- playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, -24, -12, 1, 1
- delay 3
- playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- createsprite gCrushGripExplosionTemplate, ANIM_TARGET, 0, 16, 16, 1, 1
+TeraBlastDragonOnPlayer:
+ panse SE_M_FLAMETHROWER, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 43, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB(31, 0, 0)
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ call FireSpreadBlastOpponent
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
waitforvisualfinish
blendoff
- call UnsetHighSpeedBg
+ call UnsetPsychicBg
end
-
-gBattleAnimMove_DragonCheer::
- loadspritegfx ANIM_TAG_NOISE_LINE
- loadspritegfx ANIM_TAG_CONFETTI
- loadspritegfx ANIM_TAG_PINK_CLOUD
- createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
- delay 12
- call RoarEffect
- createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3
+TeraBlastDark:
+ loadspritegfx ANIM_TAG_PURPLE_FLAME
+ loadspritegfx ANIM_TAG_METAL_SOUND_WAVES
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PURPLE_FLAME, 0, 12, 12, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_METAL_SOUND_WAVES, 0, 12, 12, RGB_BLACK
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_BLACK
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite gPurpleFlameSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
waitforvisualfinish
- monbg ANIM_ATTACKER
- playsewithpan SE_BALL_OPEN, SOUND_PAN_TARGET
- createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 122, 3, -14, 18, 24
- createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 121, 3, 14, 6, 24
- createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 120, 3, -12, 12, 24
- createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 119, 3, 14, 18, 24
- createsprite gSmokeBallEscapeCloudSpriteTemplate, ANIM_ATTACKER, 118, 3, 0, 0, 24
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
- call CreateFlatterConfetti
+ fadetobg BG_DARK
+ waitbgfadein
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 46, 1
+ delay 6
+ call TeraBlastFlyingBeam
+ createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 3, 0, 50, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 2, 0, 12, RGB_BLACK
+ call TeraBlastFlyingBeam
+ call TeraBlastFlyingBeam
+ delay 8
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
waitforvisualfinish
- clearmonbg ANIM_ATTACKER
- delay 10
+ blendoff
+ call UnsetPsychicBg
end
-
-gBattleAnimMove_MalignantChain::
- loadspritegfx ANIM_TAG_PURPLE_CHAIN
- loadspritegfx ANIM_TAG_POISON_BUBBLE
- loopsewithpan SE_M_SCRATCH, SOUND_PAN_TARGET, 6, 2
- createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 4, 0, 16, 0, 1
- delay 7
- createsprite gChainBindingSpriteTemplate, ANIM_TARGET, 2, 0, 8, 1, 1
- delay 3
- createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 8, 1
- delay 20
- setarg 7, -1
- playsewithpan SE_M_BIND, SOUND_PAN_TARGET
- waitforvisualfinish
- call PoisonBubblesEffect
+TeraBlastFairy:
+ loadspritegfx ANIM_TAG_PINK_HEART
+ loadspritegfx ANIM_TAG_RED_HEART
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_MAGENTA
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
+ delay 2
+ createsprite sPinkHeartSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
waitforvisualfinish
- end
-
-gBattleAnimMove_PopulationBomb::
- loadspritegfx ANIM_TAG_CUT
- monbg ANIM_TARGET
- setalpha 12, 8
- playsewithpan SE_M_CUT, SOUND_PAN_TARGET
- createvisualtask AnimTask_RandomBool, 2
- jumpretfalse PopulationBombSliceRight
- jumprettrue PopulationBombSliceLeft
-PopulationBombSliceRight:
- createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
- goto PopulationBombContinue
-PopulationBombSliceLeft:
- createsprite gCuttingSliceSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1
-PopulationBombContinue:
+ fadetobg BG_TWINKLE_TACKLE
+ waitbgfadein
+ loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 10, 3
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 4, 4, 0, 12, RGB_MAGENTA
+ call TeraBlastFairyHearts
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 8, 8, 15, 1
+ createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
+ delay 32
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
+ call TeraBlastFairyHearts
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 8, 8, 15, 1
+ createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
+ delay 32
+ playsewithpan SE_M_MEGA_KICK, SOUND_PAN_TARGET
+ call TeraBlastFairyHearts
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 8, 8, 15, 1
+ createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
+ delay 32
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call TeraBlastFairyHearts
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
delay 5
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 10, 1
waitforvisualfinish
- clearmonbg ANIM_TARGET
blendoff
- waitforvisualfinish
+ call UnsetPsychicBg
end
-
-gBattleAnimMove_RevivalBlessing::
- goto gBattleAnimMove_LunarBlessing
-
-gBattleAnimMove_TeraStarstorm::
- loadspritegfx ANIM_TAG_STARSTORM
+TeraBlastStellar:
loadspritegfx ANIM_TAG_YELLOW_STAR
- loadspritegfx ANIM_TAG_IMPACT
- fadetobg BG_COSMIC
- waitbgfadein
- playsewithpan SE_FALL, SOUND_PAN_ATTACKER
- call TeraStarstormCreateBeam
- delay 2
- call TeraStarstormCreateBeam
- delay 2
- call TeraStarstormCreateBeam
- delay 2
- call TeraStarstormCreateBeam
+ loadspritegfx ANIM_TAG_EXPLOSION
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB_WHITE
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 0
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- call TeraStarstormCreateBeam
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 4
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- call TeraStarstormCreateBeam
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 8
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- call TeraStarstormCreateBeam
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 12
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- call TeraStarstormCreateBeam
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 16
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- call TeraStarstormCreateBeam
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 20
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
delay 2
- jumpifmovetypeequal TYPE_STELLAR, TeraStarstormStellar
- goto TeraStarstormSingle
-TeraStarstormStellar:
- jumpifdoublebattle TeraStarstormDouble
-TeraStarstormSingle:
+ createsprite gYellowStarSpiralOutwardSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 56, 24
+ playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
+ waitforvisualfinish
+ fadetobg BG_COSMIC
+ waitbgfadein
+ playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
+ delay 20
+ playsewithpan SE_FALL, SOUND_PAN_ATTACKER
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
delay 3
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
delay 2
+ playsewithpan SE_M_SWIFT, SOUND_PAN_TARGET
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
delay 3
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
delay 2
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, -5, 30, 0, 1
delay 3
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
delay 2
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 5, 30, 0, 1
delay 3
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
delay 2
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
delay 3
createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
delay 5
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
delay 5
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
+ playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 50, 1
+ call EternabeamGeyser
+ delay 5
+ call EternabeamGeyser
+ delay 5
waitforvisualfinish
restorebg
waitbgfadeout
end
-TeraStarstormDouble:
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 1, 1
+
+FireSpreadBlast:
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 5, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -10, -5, 45
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 1, 1
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 20, 10, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -20, -10, 45
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 1, 1
+ return
+FireSpreadBlastOpponent:
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 0, 0, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5, 10, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -5, -10, 45
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 10, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 10, 30, 1, 1
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 10, 20, 45
+ createsprite gFireSpreadBlastSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, -10, -20, 45
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 10, 0, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 0, 0, 30, 1, 1
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ return
+
+TeraBlastFlyingBeam:
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -10, 0, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, -5, 30, 1, 1
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
delay 2
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, 5, 5, 30, 1, 1
- delay 3
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 0, 1
- createsprite gTeraStarSpriteTemplate, ANIM_BATTLER, 3, 0, 0, -5, 5, 30, 1, 1
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
- delay 5
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
- delay 5
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
- delay 5
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 5, 1, 1
- createvisualtask AnimTask_ShakeMon, 2, ANIM_DEF_PARTNER, 5, 5, 1, 1
- waitforvisualfinish
- restorebg
- waitbgfadeout
- end
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ delay 2
+ playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
+ createsprite gTeraBlastFlyingSpriteTemplate, ANIM_TARGET, 2, 0, 0, 16
+ return
-TeraStarstormCreateBeam::
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -3, 1, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 1, 0, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 3, -1, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -2, 0, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 0, 1, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, -1, -1, 0, 0, 20
- createsprite gTeraStarstormBeamSpriteTemplate, ANIM_BATTLER, 1, 2, 0, 0, 0, 20
+TeraBlastWater1:
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -48, -64, 40, 32, 25
+ delay 2
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -48, -64, 40, 32, 25
+ delay 2
+ return
+TeraBlastWater2:
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -112, -64, -8, 32, 25
+ delay 2
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -112, -64, -8, 32, 25
+ delay 2
+ return
+TeraBlastWater3:
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, 24, 32, 25
+ delay 2
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, 24, 32, 25
+ delay 2
+ return
+TeraBlastWater4:
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, -8, 32, 25
+ delay 2
+ createsprite gTeraBlastWaterSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, -8, 32, 25
+ delay 2
return
-gBattleAnimMove_TachyonCutter::
- loadspritegfx ANIM_TAG_CUT
- loadspritegfx ANIM_TAG_BUBBLE
- createsprite gTachyonCutterSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 0
- createsprite gTachyonCutterSpriteTemplate, ANIM_ATTACKER, 2, 40, -32, 1
- playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER
+TeraBlastRock1:
+ createsprite gTeraBlastRockSpriteTemplate, ANIM_ATTACKER, 3, -48, -64, 40, 32, 25
+ delay 4
+ return
+TeraBlastRock2:
+ createsprite gTeraBlastRockSpriteTemplate, ANIM_ATTACKER, 3, -112, -64, -8, 32, 25
+ delay 4
+ return
+TeraBlastRock3:
+ createsprite gTeraBlastRockSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, 24, 32, 25
+ delay 4
+ return
+TeraBlastRock4:
+ createsprite gTeraBlastRockSpriteTemplate, ANIM_ATTACKER, 3, -80, -64, -8, 32, 25
+ delay 4
+ return
+
+TeraBlastFairyHearts:
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 160, -32
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -256, -40
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 128, -16
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, 416, -38
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -128, -22
+ createsprite gRedHeartBurstSpriteTemplate, ANIM_TARGET, 3, -384, -31
+ return
+
+gBattleAnimMove_OrderUp::
+ loadspritegfx ANIM_TAG_IMPACT
+ playsewithpan SE_M_ENCORE, SOUND_PAN_ATTACKER
+ createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 6
+ createvisualtask AnimTask_GetCommanderType, 2
+ delay 25
+ jumpreteq ANIM_ORDER_UP_NONE, OrderUpNone
+ jumpreteq ANIM_ORDER_UP_CURLY, OrderUpCurly
+ jumpreteq ANIM_ORDER_UP_DROOPY, OrderUpDroopy
+ jumpreteq ANIM_ORDER_UP_STRETCHY, OrderUpStretchy
+OrderUpNone:
+ loadspritegfx ANIM_TAG_TATSUGIRI_CURLY
+ loadspritegfx ANIM_TAG_TATSUGIRI_DROOPY
+ loadspritegfx ANIM_TAG_TATSUGIRI_STRETCHY
+ createsprite gOrderUpTatsugiriCurlySpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 50, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriDroopySpriteTemplate, ANIM_TARGET, 2, 0, 12, 64, 46, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriStretchySpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 42, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
waitforvisualfinish
end
-
-gBattleAnimMove_SaltCure::
- loadspritegfx ANIM_TAG_SALT_PARTICLE
- loadspritegfx ANIM_TAG_WATER_ORB
- call SaltCureEffect
- call SaltCureEffect
- call SaltCureEffect
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+OrderUpCurly:
+ loadspritegfx ANIM_TAG_TATSUGIRI_CURLY
+ createsprite gOrderUpTatsugiriCurlySpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 50, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriCurlySpriteTemplate, ANIM_TARGET, 2, 0, 12, 64, 46, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriCurlySpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 42, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
waitforvisualfinish
- call gBattleAnimGeneral_SaltCureDamage
end
-
-SaltCureEffect:
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 28, 384, 50, 8, 50, ANIM_TARGET
+OrderUpDroopy:
+ loadspritegfx ANIM_TAG_TATSUGIRI_DROOPY
+ createsprite gOrderUpTatsugiriDroopySpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 50, 0
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 32, 240, 40, 11, -46, ANIM_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 33, 416, 40, 4, 42, ANIM_TARGET
+ createsprite gOrderUpTatsugiriDroopySpriteTemplate, ANIM_TARGET, 2, 0, 12, 64, 46, 0
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 31, 288, 45, 6, -42, ANIM_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 28, 448, 45, 11, 46, ANIM_TARGET
+ createsprite gOrderUpTatsugiriDroopySpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 42, 0
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
- createsprite gSaltCureSwirlSpriteTemplate, ANIM_TARGET, 2, 0, 33, 464, 50, 10, -50, ANIM_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ waitforvisualfinish
+ end
+OrderUpStretchy:
+ loadspritegfx ANIM_TAG_TATSUGIRI_STRETCHY
+ createsprite gOrderUpTatsugiriStretchySpriteTemplate, ANIM_TARGET, 2, -20, 12, 64, 50, 0
delay 2
- playsewithpan SE_M_ICY_WIND, SOUND_PAN_TARGET
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, -10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriStretchySpriteTemplate, ANIM_TARGET, 2, 0, 12, 64, 46, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ delay 2
+ createsprite gOrderUpTatsugiriStretchySpriteTemplate, ANIM_TARGET, 2, 20, 12, 64, 42, 0
+ delay 2
+ createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 10, 0, ANIM_TARGET, 2
+ createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
+ playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
+ waitforvisualfinish
+ end
+
+gBattleAnimMove_MatchaGotcha::
+ loadspritegfx ANIM_TAG_POISON_BUBBLE
+ playsewithpan SE_M_SWIFT, SOUND_PAN_ATTACKER
+ createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_ATTACKER, 4, 2, RGB_WHITE, 10, RGB_BLACK, 0
+ waitforvisualfinish
+ delay 10
+ loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 27, 2
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_POISON_BUBBLE, 0, 12, 12, RGB_GREEN
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 24, 6, 2, 3
+ waitforvisualfinish
+ loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 18, 2
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 28, 10, 2, 4
+ waitforvisualfinish
+ loopsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER, 9, 4
+ createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 32, 10, 4, 5
+ waitforvisualfinish
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 20, 0, 0, 4
+ jumpifdoublebattle MatchaGotchaDouble
+ goto MatchaGotchaSingle
+
+MatchaGotchaSingle:
+ call MatchaGotchaProjectile
+ call MatchaGotchaProjectile
+ loopsewithpan SE_FALL, SOUND_PAN_ATTACKER, 8, 2
+ call MatchaGotchaProjectile
+ call MatchaGotchaProjectile
+ delay 10
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7
+ delay 28
+ playsewithpan SE_M_DIVE, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 12, RGB(31, 0, 0)
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 10, 15, 55, FALSE
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -20, 15, 55, FALSE
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 5, 15, 55, FALSE
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -10, 15, 55, FALSE
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 30, 15, 55, FALSE
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -30, 15, 55, FALSE
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 2, 15, 55, FALSE
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -5, 15, 55, FALSE
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 20, 15, 55, FALSE
+ waitforvisualfinish
+ end
+
+MatchaGotchaDouble:
+ playsewithpan SE_M_BUBBLE3, SOUND_PAN_ATTACKER
+ call MatchaGotchaDoubleProjectile
+ call MatchaGotchaDoubleProjectile
+ loopsewithpan SE_FALL, SOUND_PAN_ATTACKER, 8, 2
+ call MatchaGotchaDoubleProjectile
+ call MatchaGotchaDoubleProjectile
+ delay 10
+ createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 7
+ waitforvisualfinish
+ playsewithpan SE_M_DIVE, SOUND_PAN_TARGET
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 2, 0, 10, 1
+ createvisualtask AnimTask_ShakeMon2, 5, ANIM_DEF_PARTNER, 2, 0, 10, 1
+ createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 2, 2, 0, 12, RGB(31, 0, 0)
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 10, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -20, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 10, 15, 55, 2
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -20, 15, 55, 2
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 5, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -10, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 5, 15, 55, 2
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -10, 15, 55, 2
+ delay 3
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 30, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -30, 15, 55, 0
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, 30, 15, 55, 2
+ createsprite gAcidPoisonDropletSpriteTemplate, ANIM_TARGET, 2, 0, -10, -30, 15, 55, 2
+ waitforvisualfinish
+ end
+
+MatchaGotchaProjectile:
+ createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 60, 0
+ delay 3
return
-gBattleAnimMove_TeraBlast::
-gBattleAnimMove_OrderUp::
-gBattleAnimMove_GlaiveRush::
-gBattleAnimMove_TripleDive::
-gBattleAnimMove_Doodle::
-gBattleAnimMove_Ruination::
-gBattleAnimMove_CollisionCourse::
-gBattleAnimMove_ElectroDrift::
-gBattleAnimMove_ArmorCannon::
-gBattleAnimMove_BlazingTorque::
-gBattleAnimMove_WickedTorque::
-gBattleAnimMove_NoxiousTorque::
-gBattleAnimMove_CombatTorque::
-gBattleAnimMove_MagicalTorque::
-gBattleAnimMove_Psyblade::
-gBattleAnimMove_MatchaGotcha::
-gBattleAnimMove_MightyCleave::
-gBattleAnimMove_SupercellSlam::
- end @to do
+MatchaGotchaDoubleProjectile:
+ createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 60, 0, 0
+ createsprite gSludgeProjectileSpriteTemplate, ANIM_TARGET, 2, 20, 0, 60, 0, TRUE
+ delay 3
+ return
@@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@
gBattleAnimMove_None::
@@ -21304,19 +24170,19 @@ gBattleAnimMove_Uproar::
loadspritegfx ANIM_TAG_THIN_RING
monbg ANIM_DEF_PARTNER
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 29, -12, 0
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -12, -29, 1
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 12, -29, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -29, -12, 0
delay 16
createvisualtask AnimTask_UproarDistortion, 2, 0
- createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, 31, 8
+ createsprite gUproarRingSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 0, 0, RGB_RED, 8
playsewithpan SE_M_UPROAR, SOUND_PAN_ATTACKER
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, 24, -24, 1
createsprite gJaggedMusicNoteSpriteTemplate, ANIM_ATTACKER, 2, 0, -24, -24, 0
@@ -24720,7 +27586,7 @@ gBattleAnimMove_RazorLeaf::
end
gBattleAnimMove_NaturePower::
- @ No actual animation, uses the animation of a move from sNaturePowerMoves instead
+ @ No actual animation, uses the animation of a move from gBattleEnvironmentInfo.naturePower instead
gBattleAnimMove_AncientPower::
loadspritegfx ANIM_TAG_ROCKS
@@ -26138,7 +29004,7 @@ gBattleAnimMove_Transform::
monbg ANIM_ATTACKER
playsewithpan SE_M_TELEPORT, SOUND_PAN_ATTACKER
waitplaysewithpan SE_M_MINIMIZE, SOUND_PAN_ATTACKER, 48
- createvisualtask AnimTask_TransformMon, 2, 0, 1
+ createvisualtask AnimTask_TransformMon, 2, SPECIES_GFX_CHANGE_TRANSFORM
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
@@ -27015,7 +29881,7 @@ gBattleAnimMove_RockTomb::
end
SetBugBg:
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 1, 0, 0, 4, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_TARGET, 0, 0, 4, RGB_BLACK
createvisualtask AnimTask_GetAttackerSide, 2
jumprettrue SetBugBgPlayer
fadetobg BG_BUG_OPPONENT
@@ -27028,14 +29894,14 @@ SetBugBgPlayer:
createvisualtask AnimTask_StartSlidingBg, 5, -1536, 0, 0, -1
SetBugBgFade:
delay 0
- createvisualtask AnimTask_BlendBattleAnimPal, 10, 1, 0, 4, 4, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 4, 4, RGB_BLACK
waitbgfadein
return
UnsetBugBg:
restorebg
waitbgfadeout
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, 1, 0, 4, 0, RGB_BLACK
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 10, ANIM_TARGET, 0, 4, 0, RGB_BLACK
setarg 7, -1
waitbgfadein
return
@@ -28218,6 +31084,17 @@ gBattleAnimStatus_Nightmare::
clearmonbg ANIM_DEF_PARTNER
end
+gBattleAnimStatus_Frostbite::
+ playsewithpan SE_M_ICY_WIND, 0
+ loadspritegfx ANIM_TAG_ICE_CRYSTALS
+ monbg ANIM_DEF_PARTNER
+ splitbgprio ANIM_TARGET
+ call IceCrystalEffectShort
+ createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_TARGET, 5, 7, 0, RGB(0, 20, 31)
+ waitforvisualfinish
+ clearmonbg ANIM_DEF_PARTNER
+ end
+
gBattleAnimGeneral_StatsChange::
createvisualtask AnimTask_StatsChange, 5
waitforvisualfinish
@@ -28379,13 +31256,13 @@ Status_Infestation:
loadspritegfx ANIM_TAG_SMALL_BUBBLES @circle particles
monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x7320
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(0, 25, 28)
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 30, 1
loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 0x0, 30
call InfestationVortex
call InfestationVortex
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xA, F_PAL_TARGET, 0x2, 0x9, 0x0, 0x7320
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 9, 0, RGB(0, 25, 28)
waitforvisualfinish
clearmonbg ANIM_DEF_PARTNER
end
@@ -28649,14 +31526,14 @@ gBattleAnimGeneral_SimpleHeal::
gBattleAnimGeneral_IllusionOff::
monbg ANIM_TARGET
- createvisualtask AnimTask_TransformMon, 2, 1, 0
+ createvisualtask AnimTask_TransformMon, 2, SPECIES_GFX_CHANGE_ILLUSION_OFF
waitforvisualfinish
clearmonbg ANIM_TARGET
end
gBattleAnimGeneral_FormChange::
monbg ANIM_ATTACKER
- createvisualtask AnimTask_TransformMon, 2, 1, 0
+ createvisualtask AnimTask_TransformMon, 2, SPECIES_GFX_CHANGE_FORM_CHANGE
waitforvisualfinish
clearmonbg ANIM_ATTACKER
end
@@ -28688,7 +31565,7 @@ gBattleAnimGeneral_MegaEvolution::
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
createvisualtask SoundTask_PlayNormalCry, 0
- createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
createsprite gMegaSymbolSpriteTemplate ANIM_ATTACKER, 3, 0, 0, ANIM_ATTACKER
@@ -28732,6 +31609,7 @@ MegaEvolutionSpinEffect:
return
gBattleAnimGeneral_TeraCharge::
+ createvisualtask AnimTask_HideOpponentShadows, 2 @ Hide opponent shadows so they don't flicker between battle anims
loadspritegfx ANIM_TAG_TERA_CRYSTAL
loadspritegfx ANIM_TAG_TERA_SHATTER
loadspritegfx ANIM_TAG_FOCUS_ENERGY
@@ -28753,7 +31631,6 @@ gBattleAnimGeneral_TeraCharge::
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
- createvisualtask AnimTask_TransformMon, 2, 1, 0
call TeraChargeParticles
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_ATTACKER
clearmonbg ANIM_ATK_PARTNER
@@ -28770,14 +31647,37 @@ TeraChargeParticles:
return
gBattleAnimGeneral_TeraActivate::
+ createvisualtask AnimTask_SetOpponentShadowCallbacks, 2 @ Restore shadows hidden in the charge script
+ loadspritegfx ANIM_TAG_TERA_SYMBOL
+ loadspritegfx ANIM_TAG_SPARKLE_6
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
- waitforvisualfinish
createvisualtask SoundTask_PlayNormalCry, 0
+ createsprite gTeraSymbolSpriteTemplate ANIM_ATTACKER, 41, 0, 0, ANIM_ATTACKER
+ delay 2
+ call TeraSpinEffect
+ call TeraSpinEffect
+ waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
blendoff
end
+TeraSpinEffect:
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 12, 528, 30, 13, 50, 0
+ delay 2
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 0, 480, 20, 16, -46, 0
+ delay 2
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 1, 576, 20, 8, 42, 0
+ delay 2
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 15, 400, 25, 11, -42, 0
+ delay 2
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 12, 512, 25, 16, 46, 0
+ delay 2
+ createsprite gTeraSmokeSpriteTemplate ANIM_ATTACKER, 7, 0, 1, 464, 30, 15, -50, 0
+ delay 2
+ return
+
gBattleAnimGeneral_RestoreBg::
restorebg
waitbgfadein
@@ -28809,13 +31709,13 @@ gBattleAnimGeneral_ZMoveActivate::
end
ZMoveBuffEffect:
createsprite gBlueZMoveEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x3
+ delay 3
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1 @Red Buff
- delay 0x3
+ delay 3
createsprite gGreenZMoveEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x3
+ delay 3
createsprite gYellowZMoveEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x3
+ delay 3
return
gBattleAnimGeneral_TotemFlare::
@@ -28839,13 +31739,13 @@ gBattleAnimGeneral_TotemFlare::
RainbowEndureEffect:
createsprite gBlueEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x3
+ delay 3
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1 @Red Buff
- delay 0x3
+ delay 3
createsprite gGreenEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x3
+ delay 3
createsprite gYellowEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x3
+ delay 3
return
gBattleAnimGeneral_GulpMissile:: @ Tackle anim (placeholder)
@@ -28890,7 +31790,7 @@ General_PrimalReversion_Alpha:
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
- createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
createvisualtask SoundTask_PlayNormalCry, 0
@@ -28923,7 +31823,7 @@ General_PrimalReversion_Omega:
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
- createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
createvisualtask SoundTask_PlayNormalCry, 0
@@ -28963,7 +31863,7 @@ gBattleAnimGeneral_PowerConstruct::
delay 20
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
waitforvisualfinish
- createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
createvisualtask SoundTask_PlayNormalCry, 0
@@ -29013,10 +31913,10 @@ gBattleAnimGeneral_UltraBurst::
monbg ANIM_ATTACKER
setalpha 12, 8
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_HYDRO_PUMP, 0, 12, 12, RGB2GBA(250, 240, 230)
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ADJACENT), 0x2, 0x0, 0xF, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ADJACENT), 2, 0, 15, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12 @ charge particles to attacker
- delay 0x1e
+ delay 30
loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 0xe, 0xa
createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 3, 0x0
call LightThatBurnsTheSkyGreenSparks
@@ -29033,7 +31933,7 @@ gBattleAnimGeneral_UltraBurst::
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 0, 16, RGB_WHITEALPHA
createsprite gUltraBurstSymbolSpriteTemplate, ANIM_ATTACKER, 0x0, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
- createvisualtask AnimTask_HideSwapSprite, 2, 1, 0
+ createvisualtask AnimTask_HideSwapSprite, 2
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 14
createvisualtask SoundTask_PlayNormalCry, 0
@@ -29128,7 +32028,8 @@ gBattleAnimGeneral_Rainbow::
createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 6, 0, RGB_WHITE
waitforvisualfinish
delay 30
- fadetobg BG_RAINBOW
+ goto SetRainbowBackground
+AnimGeneral_RainbowContinue:
panse_adjustnone SE_M_ABSORB_2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +1, 0
delay 90
blendoff
@@ -29136,6 +32037,14 @@ gBattleAnimGeneral_Rainbow::
waitbgfadein
clearmonbg ANIM_ATK_PARTNER
end
+SetRainbowBackground:
+ createvisualtask AnimTask_GetAttackerSide, 2
+ jumprettrue SetRainbowBgOppoentSide
+ fadetobg BG_RAINBOW_PLAYER
+ goto AnimGeneral_RainbowContinue
+SetRainbowBgOppoentSide:
+ fadetobg BG_RAINBOW_OPPONENT
+ goto AnimGeneral_RainbowContinue
gBattleAnimGeneral_SeaOfFire::
loadspritegfx ANIM_TAG_SMALL_EMBER
@@ -29225,6 +32134,16 @@ gBattleAnimGeneral_Swamp::
blendoff
end
+gBattleAnimGeneral_SwapToSubstitute::
+ createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, FALSE
+ waitforvisualfinish
+ end
+
+gBattleAnimGeneral_SwapFromSubstitute::
+ createvisualtask AnimTask_SwapMonSpriteToFromSubstitute, 2, TRUE
+ waitforvisualfinish
+ end
+
SnatchMoveTrySwapFromSubstitute:
createvisualtask AnimTask_IsAttackerBehindSubstitute, 2
jumprettrue SnatchMoveSwapSubstituteForMon
@@ -29331,15 +32250,15 @@ gBattleAnimMove_BreakneckBlitz::
playsewithpan SE_M_EARTHQUAKE, 0x0
monbg ANIM_ATTACKER
splitbgprio ANIM_ATTACKER
- delay 0x1
- createvisualtask AnimTask_BlendPalInAndOutByTag, 0x5, ANIM_TAG_HOLLOW_ORB, 0x4c00, 0xe, 0x0, 0x3
+ delay 1
+ createvisualtask AnimTask_BlendPalInAndOutByTag, 5, ANIM_TAG_HOLLOW_ORB, RGB(0, 0, 19), 14, 0, 3
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x0
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x2b
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x55
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x80
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0xaa
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0xd5
- delay 0xf
+ delay 15
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x0
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x2b
createsprite gBreakneckBlitzDanceSpriteTemplate, ANIM_ATTACKER, 2, 0x55
@@ -29355,26 +32274,26 @@ gBattleAnimMove_BreakneckBlitz::
createvisualtask AnimTask_StartSlidingBg, 0x5, 0xf700, 0x300, 0x1, 0xffff
waitbgfadein
setalpha 12, 8
- delay 0x10
+ delay 16
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10
- delay 0x23
+ delay 35
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- delay 0x8
+ delay 8
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x1, 0x1 @ 0, 0
- delay 0x1
+ delay 1
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0xa, 0xfff6, 0x1, 0x1 @ +10, -10
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- delay 0x1
+ delay 1
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0xf, 0xfff1, 0x1, 0x1 @ +15, -15
- delay 0x1
+ delay 1
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0x14, 0xffec, 0x1, 0x1 @ +20, -20
- delay 0x1
+ delay 1
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gBreakneckBlitzHitSpriteTemplate, ANIM_TARGET, 3, 0x19, 0xffe7, 0x1, 0x1 @ +25, -25
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4
@@ -29383,15 +32302,15 @@ gBattleAnimMove_BreakneckBlitz::
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
waitforvisualfinish
- delay 0x4
+ delay 4
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -512, ANIM_TARGET, 1
- delay 0xa
- delay 0x19
+ delay 10
+ delay 25
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x6
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
waitforvisualfinish
- delay 0x10
+ delay 16
blendoff
clearmonbg ANIM_DEF_PARTNER
createvisualtask AnimTask_AllBattlersVisible, 0xA
@@ -29422,66 +32341,66 @@ gBattleAnimMove_AllOutPummeling::
monbg ANIM_DEF_PARTNER
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 63, 1
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0x18, 0x0, 0x0, 0xa, 0x1, ANIM_FOOT_1, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xfffa, 0x12, 0x0, 0x0, 0xa, 0x1, ANIM_CHOP, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0x10, 0x0, 0x0, 0xa, 0x1, ANIM_FIST_1, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0x15, 0x0, 0x0, 0xa, 0x1, ANIM_FOOT_2, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0x14, 0x0, 0x0, 0xa, 0x1, ANIM_FIST_1, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x17, 0x0, 0x0, 0xa, 0x1, ANIM_CHOP, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0x11, 0x0, 0x0, 0xa, 0x1, ANIM_FOOT_1, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffb0, 0x10, 0x0, 0x0, 0xa, 0x1, ANIM_FOOT_2, 0x1
- delay 0x2
+ delay 2
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x8
+ delay 8
createsprite gAllOutPummelingOnslaughtSpriteTemplate, ANIM_ATTACKER, 2, 0xffa0, 0x15, 0x0, 0x0, 0xa, 0x1, ANIM_CHOP, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
- delay 0x10
+ delay 16
createvisualtask AnimTask_WindUpLunge, 5, ANIM_ATTACKER, -24, 8, 23, 10, 40, 10
- delay 0x23
+ delay 35
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -48, 0, 0, 4
waitforvisualfinish
- delay 0x30
+ delay 48
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x7
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x5
waitforvisualfinish
- delay 0x10
+ delay 16
blendoff
clearmonbg ANIM_DEF_PARTNER
createvisualtask AnimTask_AllBattlersVisible, 0xA
@@ -29499,32 +32418,32 @@ gBattleAnimMove_SupersonicSkystrike::
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
monbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0x8, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 8, 0, RGB_BLACK
createvisualtask AnimTask_HorizontalShake, 5, ANIM_ATTACKER, 2, 16
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x1, 0xf, 0x0, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 15, 0, RGB_WHITE
clearmonbg ANIM_DEF_PARTNER
call EndureEffect
- delay 0x8
+ delay 8
call EndureEffect
- delay 0x20
- delay 0xA
+ delay 32
+ delay 10
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
- delay 0x2
+ delay 2
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 12, 4, -16, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 16, 4, -10, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 14, 4, -18, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 12, 4, -16, 18
- delay 0x30
+ delay 48
createvisualtask AnimTask_DoomDesireLightBeam, 0x5
- delay 0x9
+ delay 9
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
- delay 0x9
+ delay 9
playsewithpan SE_M_MORNING_SUN, 0x0
- delay 0x9
+ delay 9
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET
- delay 0x19
+ delay 25
fadetobg BG_SKY
waitbgfadeout
createvisualtask AnimTask_IsTargetPlayerSide, 0x2
@@ -29541,7 +32460,7 @@ FinishSupersonicSkystrike:
setalpha 12, 8
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
createsprite gSupersonicSkystrikeFlySpriteTemplate, ANIM_ATTACKER, 2, 0x14
- delay 0x10
+ delay 16
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, ANIM_TARGET, 0
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4
@@ -29553,7 +32472,7 @@ FinishSupersonicSkystrike:
createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 16, -16, -10, 24 @ 16, -38, -10, 24
createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 14, -52, -18, 24 @ 14, -20, -18, 24
createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 1, 12, -32, -16, 24 @ 12, -36, -16, 24
- delay 0x30
+ delay 48
clearmonbg ANIM_DEF_PARTNER
blendoff
createvisualtask AnimTask_AllBattlersVisible, 0xA
@@ -29585,12 +32504,12 @@ FinishAcidDownpour:
call AcidDownpourFlareOnAttacker
call AcidDownpourFlareOnAttacker
call AcidDownpourFlareOnAttacker
- delay 0x5
+ delay 5
clearmonbg ANIM_ATTACKER
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
blendoff
- delay 0x20
+ delay 32
loopsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET, 0xd, 0x3
createsprite gAcidDownpourReversalSpriteTemplate, ANIM_ATTACKER, 2, 0x1a, 0x0
createsprite gAcidDownpourReversalSpriteTemplate, ANIM_ATTACKER, 2, 0x1a, 0x2a
@@ -29598,17 +32517,17 @@ FinishAcidDownpour:
createsprite gAcidDownpourReversalSpriteTemplate, ANIM_ATTACKER, 2, 0x1a, 0x7e
createsprite gAcidDownpourReversalSpriteTemplate, ANIM_ATTACKER, 2, 0x1a, 0xa8
createsprite gAcidDownpourReversalSpriteTemplate, ANIM_ATTACKER, 2, 0x1a, 0xd2
- delay 0x20
+ delay 32
panse SE_M_WHIRLPOOL, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
createvisualtask AnimTask_CreateSurfWave, 0x2, ANIM_SURF_PAL_SLUDGE_WAVE
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0x7, 0xd87c
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 7, (RGB(28, 3, 22) | RGB_ALPHA)
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1
call AcidDownpourFlare
call AcidDownpourFlare
- delay 0x15
+ delay 21
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -768, 21, 0, 42
- delay 0x2c
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x7, 0x0, 0xd87c
+ delay 44
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 7, 0, (RGB(28, 3, 22) | RGB_ALPHA)
invisible ANIM_TARGET
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
@@ -29621,31 +32540,31 @@ FinishAcidDownpour:
end
AcidDownpourFlare:
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_TARGET
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_TARGET
- delay 0x2
+ delay 2
return
AcidDownpourFlareOnAttacker:
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gAcidDownpourAuraSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
@@ -29657,9 +32576,9 @@ gBattleAnimMove_TectonicRage::
createsprite gDirtMoundSpriteTemplate, ANIM_ATTACKER, 1, 0x0, 0x0, 0xb4
createsprite gDirtMoundSpriteTemplate, ANIM_ATTACKER, 1, 0x0, 0x1, 0xb4
monbg_static ANIM_ATTACKER
- delay 0x1
+ delay 1
createvisualtask AnimTask_DigDownMovement, 0x2, 0x0
- delay 0x6
+ delay 6
call DigThrowDirt
call DigThrowDirt
call DigThrowDirt
@@ -29667,22 +32586,22 @@ gBattleAnimMove_TectonicRage::
createvisualtask AnimTask_TectonicRageRollout, 0x2
call DigThrowDirt
setalpha 12, 8
- delay 0x20
+ delay 32
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
monbg ANIM_TARGET
createsprite gBasicHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 0, ANIM_TARGET, 2
- delay 0x1
+ delay 1
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4
- delay 0xa
+ delay 10
waitforvisualfinish
clearmonbg ANIM_TARGET
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
invisible ANIM_TARGET
- delay 0x5
+ delay 5
invisible ANIM_ATTACKER
waitforvisualfinish
- delay 0xa
+ delay 10
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
fadetobg BG_TECTONIC_RAGE @ brown/yellow sky uppercut
unloadspritegfx ANIM_TAG_DIRT_MOUND @ dig
@@ -29697,18 +32616,18 @@ gBattleAnimMove_TectonicRage::
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xf800, 0x0, 0xffff
waitbgfadein
playsewithpan SE_FALL, SOUND_PAN_ATTACKER @;Falling sound
- delay 0x1e
+ delay 30
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0xc8, 0xffe0, 0x0, 0x64, 0x0
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0x1e, 0xffe0, 0x10, 0x5a, 0x1
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0x96, 0xffe0, 0x20, 0x3c, 0x2
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0x5a, 0xffe0, 0x30, 0x50, 0x3
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0x6e, 0xffe0, 0x40, 0x32, 0x0
createsprite gEruptionFallingRockSpriteTemplate, ANIM_ATTACKER, 40, 0x3c, 0xffe0, 0x50, 0x46, 0x1
- delay 0x16
+ delay 22
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 8, 60
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 8, 60
loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 0x10, 0xc
- delay 0x30
+ delay 48
call TectonicRageExplosion
playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_ATTACKER
createsprite gTectonicRageBlastBurnSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x0, 0x18, 0x0, 0x0, 0x0
@@ -29750,19 +32669,19 @@ gBattleAnimMove_TectonicRage::
TectonicRageExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gTectonicRageExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
@@ -29777,22 +32696,22 @@ gBattleAnimMove_ContinentalCrush::
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call ContinentalCrashBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(19, 14, 11)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call ContinentalCrashBuffEffect
- delay 0x8
+ delay 8
call ContinentalCrashBuffEffect
- delay 0x4
- delay 0xA
+ delay 4
+ delay 10
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
- delay 0x2
+ delay 2
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 12, 4, -16, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 16, 4, -10, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 14, 4, -18, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 12, 4, -16, 18
- delay 0x30
+ delay 48
createvisualtask AnimTask_GetTimeOfDay, 0x2
jumpargeq 0x0 0x0 ContinentalCrushDay
jumpargeq 0x0 0x2 ContinentalCrushAfternoon
@@ -29805,12 +32724,12 @@ ContinentalCrushDay:
ContinentalCrushAfternoon:
fadetobg BG_ROCK_FIELD_AFTERNOON
FinishContinentalCrush:
- delay 0x18
+ delay 24
invisible ANIM_TARGET
waitbgfadeout
- delay 0x5
+ delay 5
visible ANIM_ATTACKER
- delay 0x4
+ delay 4
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(19, 14, 11)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
@@ -29832,14 +32751,14 @@ FinishContinentalCrush:
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xf800, 0x0, 0xffff
waitbgfadein
loopsewithpan SE_FALL, SOUND_PAN_ATTACKER, 0x20, 0x4 @;Falling sound
- delay 0x1e
+ delay 30
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0xc8, 0xffe0, 0x0, 0x64, 0x0
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0x1e, 0xffe0, 0x10, 0x5a, 0x1
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0x96, 0xffe0, 0x20, 0x3c, 0x2
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0x5a, 0xffe0, 0x30, 0x50, 0x3
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0x6e, 0xffe0, 0x40, 0x32, 0x0
createsprite gContinentalCrushEruptionSpriteTemplate, ANIM_ATTACKER, 40, 0x3c, 0xffe0, 0x50, 0x46, 0x1
- delay 0x16
+ delay 22
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_RIGHT, 8, 28
createvisualtask AnimTask_HorizontalShake, 5, ANIM_PLAYER_LEFT, 8, 28
unloadspritegfx ANIM_TAG_ROUND_SHADOW @ fly
@@ -29847,10 +32766,10 @@ FinishContinentalCrush:
unloadspritegfx ANIM_TAG_FOCUS_ENERGY @ focus energy
unloadspritegfx ANIM_TAG_IMPACT @ hit
loadspritegfx ANIM_TAG_REALLY_BIG_ROCK
- delay 0x30
+ delay 48
createsprite gContinentalCrushBigRockStompSpriteTemplate, ANIM_TARGET, 2, 0, 0x3c, 3, ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0x7, 0x0000
- delay 0x5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 7, RGB_BLACK
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 12, -24, -16, 24 @ 12, -48, -16, 24
@@ -29861,9 +32780,9 @@ FinishContinentalCrush:
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 16, -16, -10, 24 @ 16, -38, -10, 24
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 14, -52, -18, 24 @ 14, -20, -18, 24
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 1, 12, -32, -16, 24 @ 12, -36, -16, 24
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x7, 0x0, 0x0000 @undo pal change on tgt
- delay 0x10
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 7, 0, RGB_BLACK @undo pal change on tgt
+ delay 16
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
waitforvisualfinish
@@ -29872,45 +32791,45 @@ FinishContinentalCrush:
setarg 0x7 0xffff
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitbgfadein
- delay 0x4
+ delay 4
waitforvisualfinish
end
ContinentalCrashBuffEffect:
createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gContinentalCrushFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
ContinentalCrushStockpileRocks:
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x0, 0xffc0, 0x20 @ 0,-32
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x2c, 0xffd4, 0x20 @ +44,-44
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x3c, 0x0, 0x20 @ +60,0
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x28, 0x28, 0x20 @ +40,+40
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x0, 0x38, 0x20 @ +0,+56
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0xffda, 0x26, 0x20 @ -38,+38
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0xffca, 0x0, 0x20 @ -54, +0
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0xffdc, 0xffdc, 0x20 @ -36, -36
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x0, 0xffce, 0x20 @ 0, -50
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x22, 0xffde, 0x20 @ +34, -34
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x2e, 0x0, 0x20 @ +46, +0
- delay 0x2
+ delay 2
createsprite gContinentalCrushNeedleArmSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x20, 0x20, 0x20 @ +32, +32
- delay 0x2
+ delay 2
return
@@ -29924,16 +32843,16 @@ gBattleAnimMove_SavageSpinOut::
waitforvisualfinish
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x4, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 4, RGB_BLACK
createsprite gSavageSpinOutGreenChargeSpriteTemplate, ANIM_ATTACKER, 2, 0x0
- delay 0x19
+ delay 25
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0x14
+ delay 20
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
- delay 0xf
+ delay 15
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x4, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 4, 0, RGB_BLACK
clearmonbg ANIM_ATTACKER
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
@@ -29945,18 +32864,17 @@ gBattleAnimMove_SavageSpinOut::
call gSavageSpinOutStringBlastSpriteTemplateSHOT
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE @ spider web
call gSavageSpinOutStringBlastSpriteTemplateSHOT
- delay 0xe
+ delay 14
blendoff
waitforvisualfinish
unloadspritegfx ANIM_TAG_STRING
- unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_COCOON
loadspritegfx ANIM_TAG_IMPACT @hit
- delay 0x1
+ delay 1
invisible ANIM_TARGET
- delay 0x0
+ delay 0
createvisualtask AnimTask_IsTargetPlayerSide, 0x2
- delay 0x0
+ delay 0
jumpargeq 0x7 ANIM_TARGET SavageSpinOutOnPlayer
SavageSpinOutOnOpponent:
createsprite gSavageSpinOutCacoonSpriteTemplate, ANIM_TARGET, 2, 0x0, ANIM_TARGET, 0x2, 0x0, 0x0, 0x80
@@ -29968,7 +32886,7 @@ FinishSavageSpinOut:
waitbgfadeout
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0x1000, 0x0, 0xffff @+0x1000
waitbgfadein
- delay 0x10
+ delay 16
call SlowSavageSpinOutBackgroundSpeed
call SlowSavageSpinOutBackgroundSpeed
call SlowSavageSpinOutBackgroundSpeed
@@ -29981,20 +32899,20 @@ FinishSavageSpinOut:
call SlowSavageSpinOutBackgroundSpeed
call SlowSavageSpinOutBackgroundSpeed
call SlowSavageSpinOutBackgroundSpeed @-0x1000
- delay 0x4
+ delay 4
call SavageSpinOutCrash_2 @SeismicToss2
- delay 0xa
+ delay 10
call SavageSpinOutCrash_1 @SeismicToss1
- delay 0xa
+ delay 10
call SavageSpinOutCrash_2 @SeismicToss2
- delay 0xa
+ delay 10
call SavageSpinOutCrash_1 @SeismicToss1
- delay 0xc
+ delay 12
call UnsetPsychicBg
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles - no idea why though - something to do with the background scrolling
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2 @ user fly on screen on enemy side
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
- delay 0x1E
+ delay 30
unloadspritegfx ANIM_TAG_MUD_SAND
unloadspritegfx ANIM_TAG_IMPACT @hit
loadspritegfx ANIM_TAG_CUT @cut
@@ -30005,24 +32923,24 @@ FinishSavageSpinOut:
createsprite gSavageSpinOutGreenCutSpriteTemplate, ANIM_TARGET, 2, 0x28, 0xffe0, 0x0
createsprite gSavageSpinOutGreenCutSpriteTemplate, ANIM_TARGET, 2, 0x28, 0xffd0, 0x0
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
- delay 0xc
+ delay 12
playsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSavageSpinOutWhiteExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSavageSpinOutWhiteExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE @ spider web
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSavageSpinOutWhiteExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSavageSpinOutWhiteExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSavageSpinOutWhiteExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
@@ -30031,19 +32949,19 @@ gSavageSpinOutStringBlastSpriteTemplateSHOT:
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0xe, 0xfff4, 0x0, 0xfff4, 0xf, 0x0, 0x0
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0x1a, 0x8, 0xc, 0x8, 0xf, 0x0, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0xe, 0xfff4, 0x0, 0xfff4, 0xf, 0x1, 0x0
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0x1a, 0x8, 0xc, 0x8, 0xf, 0x1, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0xe, 0xfff4, 0x0, 0xfff4, 0xf, 0x2, 0x0
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0x1a, 0x8, 0xc, 0x8, 0xf, 0x2, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0xe, 0xfff4, 0x0, 0xfff4, 0xf, 0x3, 0x0
createsprite gSavageSpinOutStringBlastSpriteTemplate, ANIM_TARGET, 2, 0x1a, 0x8, 0xc, 0x8, 0xf, 0x3, 0x0
- delay 0x3
+ delay 3
return
SavageSpinOutCrash_1:
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -10, -8, ANIM_TARGET, 1
@@ -30063,7 +32981,7 @@ SavageSpinOutCrash_2:
return
SlowSavageSpinOutBackgroundSpeed:
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xfd56, 0x0, 0xffff @-0x2aa
- delay 0x1
+ delay 1
return
@@ -30078,26 +32996,26 @@ gBattleAnimMove_NeverEndingNightmare::
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call NeverendingNightmareBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(0, 6, 16)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call NeverendingNightmareBuffEffect
- delay 0x8
+ delay 8
call NeverendingNightmareBuffEffect
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
call NeverendingNightmareAttackerRings
- delay 0x1
+ delay 1
call NeverendingNightmareAttackerRings
- delay 0x1
+ delay 1
call NeverendingNightmareAttackerRings
- delay 0xa
+ delay 10
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
call NeverendingNightmareTargetRings
- delay 0x1
+ delay 1
call NeverendingNightmareTargetRings
- delay 0x1
+ delay 1
call NeverendingNightmareTargetRings
- delay 0x1
+ delay 1
waitforvisualfinish
fadetobg BG_NEVERENDING_NIGHTMARE
waitbgfadein
@@ -30105,12 +33023,12 @@ gBattleAnimMove_NeverEndingNightmare::
playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET
call NeverendingNightmareHands
call NeverendingNightmareHands
- delay 0xa
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0x10, 0x40c0 @ fade to purple
+ delay 10
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 16, RGB(0, 6, 16) @ fade to purple
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
loadspritegfx ANIM_TAG_EXPLOSION_2
unloadspritegfx ANIM_TAG_THIN_RING
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_VERTICAL_HEX, 0x2, 0xA, 0xA, 0x580A @;Purple
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_VERTICAL_HEX, 2, 10, 10, RGB(10, 0, 22) @;Purple
call NeverendingNightmareGeyser
playsewithpan SE_M_SACRED_FIRE, SOUND_PAN_TARGET
createsprite gNeverEndingNightmareBlastBurnSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x0, 0x18, 0x0, 0x0, 0x0
@@ -30145,7 +33063,7 @@ gBattleAnimMove_NeverEndingNightmare::
createsprite gNeverEndingNightmareBlastBurnSpriteTemplate, ANIM_ATTACKER, 2, 0xffc4, 0x1e, 0x18, 0x0, 0x0, 0x0
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
call NeverendingNightmareGeyser
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x10, 0x0, 0x40c0 @ fade to normal
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 16, 0, RGB(0, 6, 16) @ fade to normal
waitforvisualfinish
restorebg
waitbgfadeout
@@ -30154,99 +33072,99 @@ gBattleAnimMove_NeverEndingNightmare::
end
NeverendingNightmareBuffEffect:
createsprite gNeverEndingNightmareFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gNeverEndingNightmareFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gNeverEndingNightmareFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gNeverEndingNightmareFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gNeverEndingNightmareFocusEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
NeverendingNightmareTargetRings:
createsprite gNeverEndingNightmareRingTargetSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x100, 0x0
- delay 0x8
+ delay 8
return
NeverendingNightmareAttackerRings:
createsprite gNeverEndingNightmareRingAttackerSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0xe
+ delay 14
return
NeverendingNightmareHands:
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x0, 0xffc0, 0x20 @ 0,-32
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x2c, 0xffd4, 0x20 @ +44,-44
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x3c, 0x0, 0x20 @ +60,0
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x28, 0x28, 0x20 @ +40,+40
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x0, 0x38, 0x20 @ +0,+56
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0xffda, 0x26, 0x20 @ -38,+38
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0xffca, 0x0, 0x20 @ -54, +0
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0xffdc, 0xffdc, 0x20 @ -36, -36
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x0, 0xffce, 0x20 @ 0, -50
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x22, 0xffde, 0x20 @ +34, -34
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x2e, 0x0, 0x20 @ +46, +0
- delay 0x2
+ delay 2
createsprite gNeverEndingNightmareHandSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0, 0x20, 0x20, 0x20 @ +32, +32
- delay 0x2
+ delay 2
return
NeverendingNightmareGeyser:
createsprite gNeverEndingNightmareExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0x0005, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfff5, 0xfff1, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0008, 0xfffb, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfffa, 0x0012, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0000, 0x0005, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0003, 0xfff5, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfff5, 0xffe1, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0008, 0xffeb, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfffa, 0x0002, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0000, 0xfff5, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0003, 0xffe5, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfff5, 0xffd1, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0008, 0xffdb, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0xfffa, 0xfff2, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareExplosionSpriteTemplate ANIM_TARGET, 4, 0x0000, 0xffe5, ANIM_TARGET, 0x0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gNeverEndingNightmareGeyserHexSpriteTemplate ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
return
@@ -30261,8 +33179,8 @@ gBattleAnimMove_CorkscrewCrash::
invisible ANIM_TARGET
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0xb, 0x6318 @fade atker to gray
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_SPIKES, 0x0, 0xC, 0xC, 0x6318 @;Gray
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, RGB(24, 24, 24) @fade atker to gray
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_SPIKES, 0, 12, 12, RGB(24, 24, 24) @;Gray
playsewithpan SE_ESCALATOR, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 79, 1
createsprite gCorkscrewCrashChargeSpriteTemplate, ANIM_ATTACKER, 2, 0x0
@@ -30273,7 +33191,7 @@ gBattleAnimMove_CorkscrewCrash::
call CorkscrewCrashMetalFlare
waitforvisualfinish
clearmonbg ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0xb, 0x0, 0x6318 @fade atker back
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 11, 0, RGB(24, 24, 24) @fade atker back
waitforvisualfinish
stopsound
invisible ANIM_ATTACKER
@@ -30288,24 +33206,24 @@ gBattleAnimMove_CorkscrewCrash::
CorkscrewCrashOnOpponent:
createsprite gCorkscrewCrashRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x88, 0x100, 0x38, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
createsprite gCorkscrewCrashLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x38, 0xfff0, 0x38, 0x15
waitforvisualfinish
visible ANIM_TARGET
- delay 0x5
+ delay 5
goto FinishCorkscrewCrash
CorkscrewCrashOnPlayer:
createsprite gCorkscrewCrashLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x08, 0xfff0, 0x0f, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
createsprite gCorkscrewCrashRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x38, 0x100, 0x38, 0x15
waitforvisualfinish
visible ANIM_TARGET
- delay 0x5
+ delay 5
FinishCorkscrewCrash:
createsprite gCorkscrewCrashStrikeSpriteTemplate, ANIM_TARGET, 2, 0x14
loadspritegfx ANIM_TAG_IMPACT @hit
- delay 0x10
+ delay 16
stopsound
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 0
@@ -30314,36 +33232,36 @@ FinishCorkscrewCrash:
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
createsprite gCorkscrewCrashCorkscrewFlyDownSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xffc0, 0x0f
- delay 0xf
+ delay 15
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 2, 48
createsprite gCorkscrewCrashCorkscrewFlyDownSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xfffe, 0x03
call CorkscrewCrashSpinningWind
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x0
+ delay 0
createsprite gCorkscrewCrashCorkscrewFlyDownSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xfffe, 0x03
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x1
+ delay 1
createsprite gCorkscrewCrashCorkscrewFlyDownSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xfffe, 0x03
- delay 0x4
+ delay 4
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- delay 0x6
+ delay 6
call CorkscrewCrashSprayRocks
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 16, RGB_WHITE
waitforvisualfinish
- delay 0x10
+ delay 16
call ResetFromWhiteScreen
waitforvisualfinish
end
@@ -30357,17 +33275,17 @@ CorkscrewCrashSpinningWind:
return
CorkscrewCrashMetalFlare:
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gCorkscrewCrashMetalBitSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
CorkscrewCrashSprayRocks:
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
@@ -30381,7 +33299,7 @@ CorkscrewCrashSprayRocks:
gBattleAnimMove_InfernoOverdrive::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge
loadspritegfx ANIM_TAG_SMALL_EMBER @fire
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0xA, 0xA, 0x1F
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 10, 10, RGB_RED
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
fadetobg BG_INFERNO_OVERDRIVE
@@ -30416,16 +33334,15 @@ FinishInfernoOverdrive:
clearmonbg ANIM_ATTACKER
createsprite gInfernoOverdriveSuperpowerSpriteTemplate, ANIM_TARGET, 3, 0x0 @ super power shot
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
- delay 0x10
+ delay 16
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 8, 0, 16, 1
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 79, 1
call InfernoOverdriveExplosion
- delay 0x6
+ delay 6
call InfernoOverdriveExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ red bg pal
- delay 0x6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 16, RGB(27, 0, 0) @ red bg pal
+ delay 6
call InfernoOverdriveExplosion
waitforvisualfinish
call ResetFromRedScreen
@@ -30433,17 +33350,17 @@ FinishInfernoOverdrive:
end
InfernoOverdriveFireSpin:
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
InfernoOverdriveExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
@@ -30453,7 +33370,7 @@ InfernoOverdriveExplosion:
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -30461,7 +33378,7 @@ InfernoOverdriveExplosion:
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -30469,7 +33386,7 @@ InfernoOverdriveExplosion:
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -30477,7 +33394,7 @@ InfernoOverdriveExplosion:
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
createsprite gInfernoOverdriveExplosionSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -30498,7 +33415,7 @@ gBattleAnimMove_HydroVortex::
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
createvisualtask AnimTask_CreateSurfWave, 0x2, 0x0
- delay 0x18
+ delay 24
panse SE_M_SURF, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
waitforvisualfinish
loadspritegfx ANIM_TAG_ROUND_SHADOW
@@ -30513,14 +33430,14 @@ gBattleAnimMove_HydroVortex::
call DiveSetUpWaterDroplets
call DiveSetUpWaterDroplets
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -768, 21, 0, 26
- delay 0x1a
+ delay 26
invisible ANIM_TARGET
waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x7
- delay 0x5
+ delay 5
fadetobg BG_WATER_PULSE
waitbgfadeout
- delay 0x5
+ delay 5
visible ANIM_ATTACKER
visible ANIM_TARGET
loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 0x14, 0x3
@@ -30536,10 +33453,10 @@ gBattleAnimMove_HydroVortex::
createsprite gHydroVortexSuperpowerSpriteTemplate, ANIM_TARGET, 3, 0x0
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
invisible ANIM_ATTACKER
- delay 0x10
+ delay 16
createsprite gHydroVortexImpactSpriteTemplate, ANIM_TARGET, 3, 0xa, 0xfff8, 0x1, 0x1
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0x10, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 16, RGB(0, 13, 23)
loadspritegfx ANIM_TAG_GUST
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 8, 60
call HydroVortexWhirlpoolHurricane
@@ -30547,7 +33464,7 @@ gBattleAnimMove_HydroVortex::
call HydroVortexWhirlpoolHurricane
call HydroVortexWhirlpoolHurricane
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x10, 0x0, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 16, 0, RGB(0, 13, 23)
waitforvisualfinish
restorebg
waitbgfadeout
@@ -30557,25 +33474,25 @@ gBattleAnimMove_HydroVortex::
HydroVortexBubbles:
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0xa, 0xa, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate, ANIM_TARGET, 2, 0xa, 0xa, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0x14, 0xffec, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate, ANIM_TARGET, 2, 0x14, 0xffec, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0xf, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0xfff1, 0xf, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0x0, 0x0, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0xfff6, 0xffec, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0xfff6, 0xffec, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0xfff8, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0x10, 0xfff8, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0x5, 0x8, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0x5, 0x8, 0x14, ANIM_TARGET
- delay 0x4
+ delay 4
createsprite gSmallBubblePairSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0x0, 0x14, ANIM_ATTACKER
createsprite gSmallBubblePairSpriteTemplate ANIM_TARGET, 2, 0xfff0, 0x0, 0x14, ANIM_TARGET
return
@@ -30585,20 +33502,20 @@ HydroVortexWhirlpoolHurricane:
createsprite gHydroVortexImpactSpriteTemplate, ANIM_TARGET, 3, 0xfff6, 0xfff8, 0x1, 0x1
createvisualtask AnimTask_AnimateGustTornadoPalette, 0x5, 0x1, 0x46
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, 0x1
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, 0x1
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, 0x1
- delay 0x2
+ delay 2
createsprite gHydroVortexImpactSpriteTemplate, ANIM_TARGET, 3, 0xa, 0xfff8, 0x1, 0x1
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, 0x1
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, 0x1
createsprite gHydroVortexHurricaneSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
createvisualtask AnimTask_AnimateGustTornadoPalette, 0x5, 0x1, 0x46
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, 0x1
- delay 0x2
+ delay 2
return
@@ -30612,30 +33529,30 @@ gBattleAnimMove_BloomDoom::
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x4, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 4, RGB_BLACK
loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 0x9, 0x3
createsprite gBloomDoomGreenChargeSpriteTemplate, ANIM_ATTACKER, 2, 0x0
- delay 0x3C
+ delay 60
blendoff
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x0
playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x4
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x8
playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0xc
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x10
playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x14
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalSpinSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x38, 0x18
playsewithpan SE_M_ATTRACT, SOUND_PAN_ATTACKER
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x4, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 4, 0, RGB_BLACK
waitforvisualfinish
unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
call BloomDoomHurricane
@@ -30665,11 +33582,11 @@ gBattleAnimMove_BloomDoom::
fadetobg BG_BLOOM_DOOM
waitbgfadein
loadspritegfx ANIM_TAG_ORBS
- delay 0x5
+ delay 5
createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 0x18, 0x10, 0x0, 0x2, 0x2, 0x0, 0x0
createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 0x40, 0x18, 0x0, 0x3, 0x1, 0x1, 0x0
createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 0x10, 0x18, 0x0, 0x2, 0x1, 0x0, 0x0
- delay 0x5
+ delay 5
createsoundtask SoundTask_LoopSEAdjustPanning, 0xf0, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1 @ shake attacker
call BloomDoomHyperBeam
@@ -30678,7 +33595,7 @@ gBattleAnimMove_BloomDoom::
call BloomDoomHyperBeam
call BloomDoomHyperBeam
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 114, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0xb, 0x33ed
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB(13, 31, 12)
call BloomDoomHyperBeam
call BloomDoomHyperBeam
call BloomDoomHyperBeam
@@ -30706,15 +33623,15 @@ gBattleAnimMove_BloomDoom::
createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 66, 0x50, 0x1e, 0x0, 0x4, 0x1, 0x1, 0x0
createsprite gAromatherapySmallFlowerSpriteTemplate, ANIM_ATTACKER, 0, 0x80, 0xc, 0x0, 0x3, 0x3, 0x0, 0x0
createsprite gAromatherapyBigFlowerSpriteTemplate, ANIM_ATTACKER, 0, 0x5a, 0x10, 0x0, 0x2, 0x1, 0x0, 0x0
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0xb, 0x0, 0x33ed
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 11, 0, RGB(13, 31, 12)
loadspritegfx ANIM_TAG_EXPLOSION @explosion
call BloomDoomPetalBlast
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x0, 0x10, 0x33ed
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 16, RGB(13, 31, 12)
call BloomDoomPetalBlast
createvisualtask AnimTask_IsTargetPartner, 0x5
jumpargeq 0x0 0x1 BloomDoomFadeScreenTargetPartner
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x1, 0x0, 0x10, 0x33ed @ green bg pal
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 1, 0, 16, RGB(13, 31, 12) @ green bg pal
BloomDoomEnding:
call BloomDoomPetalBlast
waitforvisualfinish
@@ -30722,7 +33639,7 @@ BloomDoomEnding:
call ResetFromGreenScreen
end
BloomDoomFadeScreenTargetPartner:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 0x1, 0x0, 0x10, 0x33ed @ green bg pal
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 1, 0, 16, RGB(13, 31, 12) @ green bg pal
goto BloomDoomEnding
BloomDoomHurricane:
createsprite gBloomDoomHurricaneSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
@@ -30730,68 +33647,68 @@ BloomDoomHurricane:
return
BloomDoomFlowerGeyser:
createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0xfffc, 0x10 @ -4, -0x10
- delay 0x0
+ delay 0
createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gBloomDoomFlowerGeyserSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0xfff0, 0x10
- delay 0x0
+ delay 0
return
BloomDoomHyperBeam:
createsprite gBloomDoomGreenBeamSpriteTemplate, ANIM_TARGET, 2
createsprite gBloomDoomGreenBeamSpriteTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
return
BloomDoomPetalBlast:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBloomDoomExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe0, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x16, 0xffea, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x1e, 0x0, 0x10
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBloomDoomExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x14, 0x14, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x1c, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffed, 0x13, 0x10
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBloomDoomExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffe5, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0xffee, 0xffee, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0xffe7, 0x10
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBloomDoomExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x11, 0xffef, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x17, 0x0, 0x10
- delay 0x2
+ delay 2
createsprite gBloomDoomPetalStarSpriteTemplate, ANIM_TARGET, 2, 0x1, 0x0, 0x10, 0x10, 0x10
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBloomDoomExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x2
+ delay 2
return
ResetFromGreenScreen:
createvisualtask AnimTask_AllBattlersInvisible, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x33ED @Everything from green
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 0, RGB(13, 31, 12) @Everything from green
restorebg
waitbgfadeout
setarg 0x7 0xffff
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitbgfadein
waitforvisualfinish
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x0, 0x33ED
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 0, RGB(13, 31, 12)
waitforvisualfinish
return
@@ -30806,33 +33723,33 @@ gBattleAnimMove_GigavoltHavoc::
loadspritegfx ANIM_TAG_THIN_RING
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x6, 0x0, 0x10, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 6, 0, 16, RGB_BLACK
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gGigavoltHavocChargingSpearSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 32, 0x18, 190, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 80, 0x18, 22, 12, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 156, 0x18, 121, 13, ANIM_ATTACKER, 1, 1
- delay 0xa
+ delay 10
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
- delay 0x0
- delay 0x5
+ delay 0
+ delay 5
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
- delay 0x5
+ delay 5
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0, 0x10, 0xc, 0x20, 0x14, 0x0, 0x0
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0, 0x10, 0xc, 0x60, 0x14, 0x1, 0x0
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0, 0x10, 0xc, 0xa0, 0x14, 0x0, 0x0
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x0, 0x10, 0xc, 0xe0, 0x14, 0x2, 0x0
- delay 0x5
+ delay 5
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 100, 0x18, 60, 10, ANIM_ATTACKER, 1, 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 170, 0x18, 42, 11, ANIM_ATTACKER, 1, 1
- delay 0x0
+ delay 0
createsprite gSparkElectricitySpriteTemplate, ANIM_ATTACKER, 0, 238, 0x18, 165, 10, ANIM_ATTACKER, 1, 1
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
monbg ANIM_ATTACKER
@@ -30842,72 +33759,72 @@ gBattleAnimMove_GigavoltHavoc::
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x10, 0x2c, 0x60, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x10, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x10, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x12, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x12, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x12, 0x2c, 0x80, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x12, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x14, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x14, 0x2c, 0x40, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x14, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x14, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
waitforvisualfinish
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
createsprite gGigavoltHavocLaunchSpearSpriteTemplate, ANIM_TARGET, 3, 0x0
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0, 0xfff0
- delay 0xe
+ delay 14
clearmonbg ANIM_ATTACKER
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 8, 28 @shake target
unloadspritegfx ANIM_TAG_HAVOC_SPEAR
loadspritegfx ANIM_TAG_SHOCK_3 @thunderbolt
createsprite gThunderboltOrbSpriteTemplate, ANIM_TARGET, 3, 0x2c, 0x0, 0x0, 0x3
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x0, 0x0, 0xc, 0x5bff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 0, 12, RGB(31, 31, 22)
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x20, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x20, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x20, 0x2c, 0x80, 0x28, 0x0, 0x8003
@@ -30917,7 +33834,7 @@ gBattleAnimMove_GigavoltHavoc::
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x10, 0x2c, 0xa0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x10, 0x2c, 0xe0, 0x28, 0x2, 0x8003
playsewithpan SE_M_HYPER_BEAM, SOUND_PAN_TARGET
- delay 0x19
+ delay 25
loadspritegfx ANIM_TAG_VERTICAL_HEX
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
@ call HavocSpearSparkTarget
@@ -30941,9 +33858,9 @@ gBattleAnimMove_GigavoltHavoc::
@ call HavocSpearSparkTarget
call HavocSpearGeyser
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0xc, 0x0, 0x5bff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 12, 0, RGB(31, 31, 22)
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x0, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xa
waitforvisualfinish
@@ -30979,38 +33896,38 @@ gBattleAnimMove_ShatteredPsyche::
loadspritegfx ANIM_TAG_TORN_METAL @brick break shatter
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 0x5, 0x0, 0x0, 0x0, 0x10, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_ATTACKER, 0, 0, 16, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_SetAllNonAttackersInvisiblity, 0x5, 0x1
waitforvisualfinish
createsprite gShatteredPsychePinkChargeSpriteTemplate, ANIM_ATTACKER, 2, 0x0
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0xc
+ delay 12
createsprite gShatteredPsycheRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_SUPERSONIC, SOUND_PAN_ATTACKER
- delay 0x4
+ delay 4
fadetobg BG_SHATTERED_PSYCHE
- delay 0x4
- createvisualtask AnimTask_BlendBattleAnimPalExclude, 0x5, 0x0, 0x0, 0x10, 0x0, 0x0
- delay 0x7
+ delay 4
+ createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, ANIM_ATTACKER, 0, 16, 0, RGB_BLACK
+ delay 7
playsewithpan SE_M_PSYBEAM, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
createvisualtask AnimTask_ScaleMonAndRestore, 5, -4, -4, 15, ANIM_TARGET, 1
@@ -31028,7 +33945,7 @@ ShatteredPsycheOnPlayer:
call ShatteredPsycheFlingPlayer
waitforvisualfinish
ShatteredPsycheFinish:
- delay 0x8
+ delay 8
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
restorebg
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 15, 1
@@ -31046,56 +33963,56 @@ ShatteredPsycheFlingOpponent:
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x1a, 0xfff0, 0x1, 0x1 @ 26, -16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 @ -26,-16
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0xffe6, 0x10, 0x1, 0x1 @ 26, 16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, 32, 1, 4 @ 0,32
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xffe0, 0x1, 0x1 @ 0, -32
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0, -32, 1, 4 @ 0,-32
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x20, 0x1, 0x1 @ 0, 32
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, 16, 1, 4 @ 26,16
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0xffe6, 0xfff0, 0x1, 0x1 @ -26, -16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, -32, 1, 4 @ 26,-16
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x1a, 0x10, 0x1, 0x1 @ 0, 32
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x5
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -26, 16, 1, 4 @ -26, +16
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x1a, 0xfff0, 0x1, 0x1 @ 26, -16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 26, -16, 1, 4 @ -26,-16
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0xffe6, 0x10, 0x1, 0x1 @ 26, 16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
return
@@ -31104,28 +34021,28 @@ ShatteredPsycheFlingPlayer:
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x1a, 0xfff0, 0x1, 0x1 @ 26, 16
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 32, 0, 1, 4 @ 32,0
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0xffe0, 0x0, 0x1, 0x1 @
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -32, 0, 1, 4 @ -32,0
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0x20, 0x0, 0x1, 0x1 @ 32, 0
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x4
waitforvisualfinish
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 10, 32, 1, 4 @ 10, -32
waitforvisualfinish
createsprite gShatteredPsycheReflectHitSpriteTemplate, ANIM_TARGET, 3, 0xfff6, 0x5, 0x1, 0x1 @ 10, -32
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x5
waitforvisualfinish
return
@@ -31135,7 +34052,7 @@ gBattleAnimMove_SubzeroSlammer::
loadspritegfx ANIM_TAG_ICE_CRYSTALS @ice
loadspritegfx ANIM_TAG_ICE_CUBE @glacier
loadspritegfx ANIM_TAG_EXPLOSION_2 @explosion
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_EXPLOSION_2, 0x0, 0xC, 0xC, 0x6A23
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION_2, 0, 12, 12, RGB(3, 17, 26)
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
fadetobg BG_ICE
@@ -31150,30 +34067,30 @@ SubzeroSlammerOnPlayer:
SubzeroSlammerFinish:
waitbgfadein
monbg ANIM_ATK_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0x0, 0xb, 0x7e80
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 0, 11, RGB(0, 20, 31)
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x0
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x4
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x8
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0xc
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x10
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x14
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSpinSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x38, 0x18
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
- delay 0x20
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0xb, 0x0, 0x7e80
- delay 0x20
+ delay 32
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 11, 0, RGB(0, 20, 31)
+ delay 32
createvisualtask AnimTask_FrozenIceCubeAttacker, 0x2
waitplaysewithpan SE_M_HAIL, SOUND_PAN_TARGET, 0x11
waitforvisualfinish
@@ -31182,16 +34099,16 @@ SubzeroSlammerFinish:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call SubzeroSlammerIceSwirl
call SubzeroSlammerIceSwirl
- delay 0xa
+ delay 10
clearmonbg ANIM_ATK_PARTNER
createsoundtask SoundTask_LoopSEAdjustPanning, 0xb0, 0xffc0, SOUND_PAN_TARGET, 0x4, 0x4, 0x0, 0xa
createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0x14, 0xc, 0x0, 0xc, 0x14
createsprite gIceBeamOuterCrystalSpriteTemplate, ANIM_ATTACKER, 2, 0x14, 0xfff4, 0x0, 0xfff4, 0x14
- delay 0x1
+ delay 1
call IceBeamCreateCrystals
call IceBeamCreateCrystals
call IceBeamCreateCrystals
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0x7, 0x7e80
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 0, 7, RGB(0, 20, 31)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 25, 1
call IceBeamCreateCrystals
call IceBeamCreateCrystals
@@ -31206,14 +34123,14 @@ SubzeroSlammerFinish:
call IceBeamCreateCrystals
call IceBeamCreateCrystals
call IceCrystalEffectShort
- delay 0x5
+ delay 5
monbg ANIM_DEF_PARTNER
createvisualtask AnimTask_FrozenIceCube, 0x82
playsewithpan SE_M_HAIL, SOUND_PAN_TARGET
waitforvisualfinish
loadspritegfx ANIM_TAG_TORN_METAL
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
- delay 0x3
+ delay 3
createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, 0x1, 0x0, 0x0, 0x0 @ -8, -12
createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, 0x1, 0x1, 0x0, 0x0
createsprite gBrickBreakWallShardSpriteTemplate ANIM_TARGET, 2, 0x1, 0x2, 0x0, 0x0
@@ -31222,7 +34139,7 @@ SubzeroSlammerFinish:
call SubzeroSlammerExplosion
call SubzeroSlammerExplosion
clearmonbg ANIM_DEF_PARTNER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x5, 0x7, 0x0, 0x7e80
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 5, 7, 0, RGB(0, 20, 31)
waitforvisualfinish
restorebg
waitbgfadeout
@@ -31235,50 +34152,50 @@ SubzeroSlammerExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSubzeroSlammerExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
- delay 0x3
+ delay 3
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xa, 0x14, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSubzeroSlammerExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x0
- delay 0x3
+ delay 3
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSubzeroSlammerExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xf, 0x0
- delay 0x3
+ delay 3
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSubzeroSlammerExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0x14, 0x2, 0x0
- delay 0x3
+ delay 3
createsprite gIceCrystalHitLargeSpriteTemplate, ANIM_TARGET, 2, 0xfff6, 0xfff6, 0x0
- delay 0x3
+ delay 3
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gSubzeroSlammerExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0x11, 0xfff4, 0x0
- delay 0x3
+ delay 3
createsprite gIceCrystalHitSmallSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xf, 0x0
- delay 0x3
+ delay 3
return
SubzeroSlammerIceSwirl:
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
playsewithpan SE_M_PETAL_DANCE, SOUND_PAN_ATTACKER
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gSubzeroSlammerIceSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
@@ -31289,17 +34206,17 @@ gBattleAnimMove_DevastatingDrake::
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @ shock wave
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call DevastatingDrakeBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(0, 6, 16)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call DevastatingDrakeBuffEffect
- delay 0x8
+ delay 8
call DevastatingDrakeBuffEffect
waitforvisualfinish
unloadspritegfx ANIM_TAG_FOCUS_ENERGY
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeShockwaveSpriteTemplate, ANIM_ATTACKER, 2
- delay 0x2a
+ delay 42
unloadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
monbg ANIM_ATTACKER
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
@@ -31318,11 +34235,11 @@ DevastatingDrakeOnOpponent:
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x88, 0x100, 0x38, 0x15 @left to right
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x38, 0xfff0, 0x38, 0x15 @right to left
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x08, 0x100, 0x0f, 0x15 @left to right
goto DevastatingDrakeFinish
@@ -31330,43 +34247,43 @@ DevastatingDrakeOnPlayer:
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x08, 0xfff0, 0x0f, 0x15 @right to left
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x38, 0x100, 0x38, 0x15 @left to right
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x78, 0xfff0, 0x58, 0x15 @right to left
DevastatingDrakeFinish:
call UnsetPsychicBg
waitforvisualfinish
visible ANIM_TARGET
- delay 0xa
+ delay 10
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeStrikeSpriteTemplate, ANIM_TARGET, 2, 0x14
- delay 0x10
+ delay 16
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
loadspritegfx ANIM_TAG_EXPLOSION
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_EXPLOSION, 0x0, 0xC, 0xC, 0x502B
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION, 0, 12, 12, RGB(11, 1, 20)
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 53
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x10, 0x40c0 @ fade to purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 16, RGB(0, 6, 16) @ fade to purple
call DevastatingDrakeExplosion
- delay 0x6
+ delay 6
createvisualtask AnimTask_IsTargetPartner, 0x5
jumpargeq 0x0 0x1 DevastatingDrakeFadeTargetPartner
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x6, 0x0, 0x10, 0x40c0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 6, 0, 16, RGB(0, 6, 16)
call DevastatingDrakeExplosion
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x0, 0x10, 0x0, 0x40c0 @ fade all but target back
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0, 16, 0, RGB(0, 6, 16) @ fade all but target back
DevastatingDrakeUniversalEnding:
loadspritegfx ANIM_TAG_FIRE_PLUME
loadspritegfx ANIM_TAG_VERTICAL_HEX
loadspritegfx ANIM_TAG_EXPLOSION_2 @explosion
unloadspritegfx ANIM_TAG_PURPLE_DRAKE
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_FIRE_PLUME, 0x0, 0xC, 0xC, 0x502B
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_VERTICAL_HEX, 0x0, 0xC, 0xC, 0x502B
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_EXPLOSION_2, 0x0, 0xC, 0xC, 0x502B
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_FIRE_PLUME, 0, 12, 12, RGB(11, 1, 20)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_VERTICAL_HEX, 0, 12, 12, RGB(11, 1, 20)
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_EXPLOSION_2, 0, 12, 12, RGB(11, 1, 20)
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 5, 32
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
call DevastatingDrakeGeyser
@@ -31403,100 +34320,100 @@ DevastatingDrakeUniversalEnding:
createsprite gDevastatingDrakePurpleBlastSpriteTemplate, ANIM_ATTACKER, 2, 0xffc4, 0x1e, 0x18, 0x0, 0x0, 0x0
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
call DevastatingDrakeGeyser
- delay 0x4
+ delay 4
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x10, 0x0, 0x40c0 @ fade from purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 16, 0, RGB(0, 6, 16) @ fade from purple
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0 @ reset all colours
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 0, 0 @ reset all colours
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
DevastatingDrakeFadeTargetPartner:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 0x6, 0x0, 0x10, 0x40c0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 6, 0, 16, RGB(0, 6, 16)
call DevastatingDrakeExplosion
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 0x0, 0x10, 0x0, 0x40c0 @ fade all but target back
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_ATK_PARTNER), 0, 16, 0, RGB(0, 6, 16) @ fade all but target back
goto DevastatingDrakeUniversalEnding
DevastatingDrakeBuffEffect:
createsprite gDevastatingDrakePurpleEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gDevastatingDrakePurpleEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gDevastatingDrakePurpleEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gDevastatingDrakePurpleEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gDevastatingDrakePurpleEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
DevastatingDrakeGeyser:
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0x0005, 0x1, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xfff1, 0x1, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xfffb, 0x1, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0012, 0x1, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0x0005, 0x1, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xfff5, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffe1, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffeb, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0002, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xfff5, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xffe5, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffd1, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffdb, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfffc, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0xfff2, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xffe5, ANIM_TARGET, 0x0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gDevastatingDrakeHexSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0xfff0, 0x10
return
DevastatingDrakeExplosion:
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gDevastatingDrakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
return
@@ -31514,11 +34431,11 @@ gBattleAnimMove_BlackHoleEclipse::
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call EndureEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_BLACK
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call EndureEffect
- delay 0x8
+ delay 8
call EndureEffect
waitforvisualfinish
unloadspritegfx ANIM_TAG_FOCUS_ENERGY
@@ -31530,118 +34447,117 @@ gBattleAnimMove_BlackHoleEclipse::
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseHoleUserSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, ANIM_ATTACKER, 0x0
createsprite gBlackHoleEclipseBlueRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseBlackRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseBlueRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseBlackRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
- delay 0x8
+ delay 8
waitforvisualfinish
stopsound
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x07, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 7, RGB_BLACK
loadspritegfx ANIM_TAG_WISP_ORB @will o wisp
invisible ANIM_ATTACKER
loopsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET, 0x10, 0x5
createsprite gBlackHoleEclipseWispSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x0
- delay 0x3
+ delay 3
createsprite gBlackHoleEclipseWispSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x10, 0x1
- delay 0x3
+ delay 3
createsprite gBlackHoleEclipseWispSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x10, 0x2
- delay 0x3
+ delay 3
createsprite gBlackHoleEclipseWispSpriteTemplate, ANIM_ATTACKER, 4, 0x0, 0x10, 0x3
waitforvisualfinish
fadetobg BG_BLACKHOLE_ECLIPSE
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
loadspritegfx ANIM_TAG_VERTICAL_HEX @red
createsprite gBlackHoleEclipseRedRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
- delay 0x4
+ delay 4
createsprite gBlackHoleEclipseRedRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
- delay 0x4
+ delay 4
createsprite gBlackHoleEclipseRedRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x100, 0x0
waitbgfadeout
unloadspritegfx ANIM_TAG_WISP_ORB
createsprite gBlackHoleEclipseHoleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, ANIM_TARGET, 0x0 @ eclipse at target origin
- delay 0x10
+ delay 16
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 53, -19, 1, 2 @ target down and left (instantaneously (last arg))
- delay 0x2
+ delay 2
visible ANIM_TARGET
loopsewithpan SE_M_SUPERSONIC, SOUND_PAN_TARGET, 0xa, 0x5
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 80, -1024, ANIM_TARGET, 0 @ spin target around (0x50 (time), -0x400 (rot speed))
createsprite gBlackHoleEclipseBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x30 @ target back to origin (slowly)
createsprite gBlackHoleEclipseBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x15
+ delay 21
invisible ANIM_TARGET
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseRedRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gBlackHoleEclipseHoleShrinkSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, ANIM_TARGET, 0x0
waitforvisualfinish
unloadspritegfx ANIM_TAG_THIN_RING
unloadspritegfx ANIM_TAG_ICE_CHUNK
loadspritegfx ANIM_TAG_SPARKLE_4 @detect
createsprite gTargetTwinkleSpriteTemplate, ANIM_ATTACKER, 13, 0x0, 0x0, ANIM_TARGET @detect star
- delay 0x2
+ delay 2
unloadspritegfx ANIM_TAG_VERTICAL_HEX @red
unloadspritegfx ANIM_TAG_SHADOW_BALL
unloadspritegfx ANIM_TAG_BLACK_BALL_2
- unloadspritegfx ANIM_TAG_FOCUS_ENERGY
loadspritegfx ANIM_TAG_EXPLOSION_2
call BlackHoleEclipseExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x7fff @ bg to white pal
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 16, RGB_WHITE @ bg to white pal
call BlackHoleEclipseExplosion
waitforvisualfinish
- delay 0x18
+ delay 24
invisible ANIM_TARGET
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 1, 0, ANIM_TARGET, 1 @ fix rotation
invisible ANIM_TARGET
- delay 0x1
+ delay 1
waitforvisualfinish
call ResetFromWhiteScreen
end
BlackHoleEclipseExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseRedExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseRedExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseRedExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseRedExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBlackHoleEclipseRedExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
ResetFromWhiteScreen:
createvisualtask AnimTask_AllBattlersInvisible, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x7FFF @everything from white
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 0, RGB_WHITE @everything from white
restorebg
waitbgfadeout
setarg 0x7 0xffff
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitbgfadein
waitforvisualfinish
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x0, 0x7fff
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 0, RGB_WHITE
waitforvisualfinish
return
@@ -31654,12 +34570,12 @@ gBattleAnimMove_TwinkleTackle::
waitforvisualfinish
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_ATTACKER
call TwinkleTacklePinkStars
- delay 0x8
+ delay 8
fadetobg BG_TWINKLE_TACKLE
createsprite gTwinkleTacklePinkRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
waitbgfadeout
invisible ANIM_TARGET
- delay 0x1
+ delay 1
loadspritegfx ANIM_TAG_YELLOW_STAR
createsprite gTwinkleTackleStarGrowSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
@@ -31672,7 +34588,7 @@ TwinkleTackleOnPlayer:
call OpponentTwinkling
TwinkleTackleFinish:
waitforvisualfinish
- delay 0x5
+ delay 5
visible ANIM_ATTACKER
visible ANIM_TARGET
createvisualtask AnimTask_SwayMon, 5, 0, 8, 2048, 1, ANIM_ATTACKER
@@ -31684,29 +34600,29 @@ TwinkleTackleFinish:
loadspritegfx ANIM_TAG_SPARKLE_4 @detect
loadspritegfx ANIM_TAG_IMPACT @hit
loadspritegfx ANIM_TAG_PAIN_SPLIT @pain-split
- delay 0x1
+ delay 1
createsprite gTwinkleTackleYellowImpactSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1, 0x0
call TwinkleTackleStarsTarget
playsewithpan SE_M_WATERFALL, SOUND_PAN_TARGET
- delay 0x5
+ delay 5
createvisualtask AnimTask_TwinkleTackleLaunch, 0x2, 89
delay 89
playsewithpan SE_M_DETECT, SOUND_PAN_TARGET
createsprite gTwinkleTackleTwinkleSpriteTemplate, ANIM_TARGET, 13, 0x0, 0x0, ANIM_TARGET @detect star
waitforvisualfinish
- delay 0x10
+ delay 16
restorebg
- delay 0x18
+ delay 24
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
TwinkleTacklePinkStars:
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x0, 0x0, 0x20, 0x3c
createsprite gTwinkleTacklePinkRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
- delay 0x8
+ delay 8
createsprite gTwinkleTacklePinkRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, 0x0, 0x0, 0x20, 0x3c
- delay 0x8
+ delay 8
createsprite gTwinkleTacklePinkRingSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
return
PlayerTwinkling:
@@ -31714,36 +34630,36 @@ PlayerTwinkling:
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2 @ user fly on screen on enemy side
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x12, 0x0, 0x0, 0x0, 0x20, 0x1c
- delay 0x3
+ delay 3
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x1f, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x16
+ delay 22
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x90, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x80, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x70, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x60, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x40, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffc0, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffc0, 0x0, 0x0, 0x20, 0x1c
return
OpponentTwinkling:
@@ -31751,40 +34667,40 @@ OpponentTwinkling:
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2 @ user fly on screen on enemy side
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x40, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x60, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x70, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x80, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x90, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xa0, 0xfffb, 0x0, 0x0, 0x20, 0x1c
- delay 0x5
+ delay 5
playsewithpan SE_M_MORNING_SUN, SOUND_PAN_TARGET
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0xa0, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x90, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x80, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x70, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x60, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x50, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x40, 0x2c, 0x0, 0x0, 0x20, 0x1c
- delay 0x1
+ delay 1
createsprite gTwinkleTacklePinkStarSpriteTemplate, ANIM_ATTACKER, 2, 0x30, 0x2c, 0x0, 0x0, 0x20, 0x1c
return
TwinkleTackleStars:
@@ -31812,13 +34728,13 @@ gBattleAnimMove_Catastropika::
waitforvisualfinish
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call EndureEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(31, 31, 22)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call EndureEffect
- delay 0x8
+ delay 8
call EndureEffect
- delay 0x8
+ delay 8
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
waitforvisualfinish
@@ -31847,74 +34763,74 @@ CatastropikaFinish:
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0xe0, 0x28, 0x2, 0x3
-@ delay 0x14
+@ delay 20
@ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x12, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x12, 0x2c, 0x40, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x12, 0x2c, 0x80, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x12, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
-@ delay 0x14
+@ delay 20
@ playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x40, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x80, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER @ charge
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x16, 0x2c, 0x20, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x16, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x16, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x16, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1a, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1a, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1a, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1a, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1e, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x15, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
restorebg
waitbgfadeout
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@@ -31928,17 +34844,17 @@ CatastropikaFinish:
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0x1
+ delay 1
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0x20, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0x1
+ delay 1
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0x20, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0xd
+ delay 13
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4
loadspritegfx ANIM_TAG_MUD_SAND
createsprite gDirtPlumeSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0, 12, -24, -16, 24 @ 12, -48, -16, 24
@@ -31952,10 +34868,10 @@ CatastropikaFinish:
call CatastropikaThundering
call CatastropikaThundering
call CatastropikaThundering
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff @ bg to white
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 0, 16, RGB_WHITE @ bg to white
call CatastropikaThundering
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff @ bg to white
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 16, 0, RGB_WHITE @ bg to white
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10 @fix tgt position
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
@@ -31963,17 +34879,17 @@ CatastropikaFinish:
end
CatastropikaThundering:
playsewithpan SE_M_TRI_ATTACK2, SOUND_PAN_TARGET
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
delay 2
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x10
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
delay 2
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
delay 2
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x10
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
delay 2
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0xfff0
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, -16
delay 2
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x10
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0, 16
delay 2
return
@@ -31996,12 +34912,12 @@ gBattleAnimMove_10000000VoltThunderbolt::
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x2
+ delay 2
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0x20, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x2
+ delay 2
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0x20, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
@@ -32021,65 +34937,65 @@ gBattleAnimMove_10000000VoltThunderbolt::
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x10, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x14, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x10
+ delay 16
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101 @thunder flash
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101 @thunder flash
createsprite gGrowingChargeOrbSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER @ charge
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x40, 0xffdc
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x40, 0xffec
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0x40, 0xc
- delay 0x14
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 64, -36
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 64, -20
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 64, 12
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x40, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, 0x80, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x18, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101 @thunder flash
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0xffdc
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0xffec
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0xc
- delay 0x14
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101 @thunder flash
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -64, -36
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -64, -20
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -64, 12
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x1c, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x14
+ delay 20
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101 @thunder flash
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xff90, 0xffdc
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xff90, 0xffec
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xff90, 0xc
- delay 0x14
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101 @thunder flash
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -112, -36
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -112, -20
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -112, 12
+ delay 20
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0x40, 0x28, 0x1, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0x80, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x3
- delay 0x10
+ delay 16
playsewithpan SE_M_THUNDER_WAVE, SOUND_PAN_TARGET
- createvisualtask AnimTask_InvertScreenColor, 0x2, 0x101, 0x101, 0x101 @thunder flash
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0xffdc
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0xffec
- delay 0x1
- createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0xc
+ createvisualtask AnimTask_InvertScreenColor, 2, 0x101, 0x101, 0x101 @thunder flash
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -48, -36
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -48, -20
+ delay 1
+ createsprite gLightningSpriteTemplate, ANIM_TARGET, 2, -48, 12
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x2a, 0x2c, 0x0, 0x28, 0x0, 0x3
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x2a, 0x2c, 0x40, 0x28, 0x1, 0x3
@@ -32096,11 +35012,11 @@ gBattleAnimMove_10000000VoltThunderbolt::
loadspritegfx ANIM_TAG_POISON_BUBBLE @purple
loopsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_ATTACKER, 0x5, 0xA
createvisualtask AnimTask_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
-@ createvisualtask AnimTask_FlashAnimTagWithColor, 0x2, ANIM_TAG_ORBS, 0x1, 0xc, 0x1f, 0x10, 0x0, 0x0
+@ createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call TenMillionVoltThunderboltBeamRed
call TenMillionVoltThunderboltBeamBlue
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 50, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x9, 0x07FE
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 9, RGB(30, 31, 1)
call TenMillionVoltThunderboltBeamPink
call TenMillionVoltThunderboltBeamYellow
call TenMillionVoltThunderboltBeamGreen
@@ -32129,12 +35045,12 @@ gBattleAnimMove_10000000VoltThunderbolt::
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x25, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x25, 0x2c, 0x80, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x25, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x8003
-@ delay 0x6
+@ delay 6
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x35, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x35, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x35, 0x2c, 0x80, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x35, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x8003
-@ delay 0x6
+@ delay 6
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x40, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x40, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x40, 0x2c, 0x80, 0x28, 0x0, 0x8003
@@ -32159,11 +35075,11 @@ gBattleAnimMove_10000000VoltThunderbolt::
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x80, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x00, 0x37, 0x2c, SOUND_PAN_ATTACKER, 0x28, 0x2, 0x8003
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 16, RGB_WHITE
call TenMillionVoltThunderboltSparkGeyser
waitforvisualfinish
- delay 0x10
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x10, 0x0, 0x7fff
+ delay 16
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 16, 0, RGB_WHITE
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
@@ -32207,11 +35123,11 @@ TenMillionVoltThunderboltSparkGeyser:
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
@@ -32220,23 +35136,23 @@ TenMillionVoltThunderboltSparkGeyser:
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x80, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x8
+ delay 8
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x8
+ delay 8
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
return
@@ -32254,12 +35170,12 @@ gBattleAnimMove_StokedSparksurfer::
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x20, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x2
+ delay 2
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0x20, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe0, 0x20, 0x2c, 0xe0, 0x28, 0x2, 0x3
- delay 0x2
+ delay 2
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0x20, 0x28, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0x60, 0x28, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffd0, 0x20, 0x2c, 0xa0, 0x28, 0x0, 0x3
@@ -32286,15 +35202,15 @@ StokedSparksurferFinish:
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 28, 2, 12
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 60, 1
call EndureEffect
- delay 0x8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x5, 0x0, 0x10, 0x5bff
+ delay 8
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 5, 0, 16, RGB(31, 31, 22)
call EndureEffect
- delay 0x8
+ delay 8
call EndureEffect
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_SPARK
loadspritegfx ANIM_TAG_ELECTRICITY
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0x10, 0x0, 0x5bff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 16, 0, RGB(31, 31, 22)
createsprite gVoltTackleOrbSlideSpriteTemplate, ANIM_ATTACKER, 1
playsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER
waitforvisualfinish
@@ -32309,7 +35225,7 @@ StokedSparksurferFinish:
waitforvisualfinish
createvisualtask AnimTask_VoltTackleBolt, 0x5, 0x3
playsewithpan SE_M_THUNDERBOLT, SOUND_PAN_TARGET
- delay 0x1
+ delay 1
fadetobg BG_ZMOVE_ACTIVATE
waitbgfadeout
visible ANIM_TARGET
@@ -32326,7 +35242,7 @@ StokedSparksurferFinish:
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x30, 0x2c, 0x80, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x00, 0x30, 0x2c, 0xc0, 0x28, 0x2, 0x8003
call StokedSparksurferSparkGeyser
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_TARGET | F_PAL_ATTACKER), 0x2, 0x0, 0x10, 0x5bff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_ATTACKER), 2, 0, 16, RGB(31, 31, 22)
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x40, 0x28, 0x1, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x37, 0x2c, 0x80, 0x28, 0x0, 0x8003
@@ -32334,15 +35250,15 @@ StokedSparksurferFinish:
call StokedSparksurferSparkGeyser
createvisualtask AnimTask_VoltTackleAttackerReappear, 0x5 @ attacker flicker back
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x10
- delay 0x2
+ delay 2
createsprite gElectricPuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0, 0xfff0
- delay 0x4
+ delay 4
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_TARGET | F_PAL_ATTACKER), 0x2, 0x10, 0x0, 0x5bff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_TARGET | F_PAL_ATTACKER), 2, 16, 0, RGB(31, 31, 22)
restorebg
- delay 0x18
+ delay 24
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
@@ -32355,63 +35271,63 @@ StokedSparksurferSparkGeyser:
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffea, 0x5, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x5, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x5, 0x2c, 0x80, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffd4, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x4
+ delay 4
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x0, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x40, 0x28, 0x1, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x5, 0x2c, 0x80, 0x28, 0x0, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x0, 0x28, 0x0, 0x8003
@ createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x8003
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_TARGET, 4, 0x0, 0xffbe, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x8003
- delay 0x1a
+ delay 26
return
gBattleAnimMove_ExtremeEvoboost::
loadspritegfx ANIM_TAG_LEER @leer
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 0, 16, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_AllBattlersInvisible, 0xA
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 3, 0, 0, 0 @Remove fading on everyone
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 3, 0, 0, 0 @Remove fading on everyone
waitforvisualfinish
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x18, 0xfff4
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffe8, 0xfff4
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x28, 0xfff0
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xfff8, 0xfff0
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x8, 0xfffe
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffd8, 0xfffe
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0x5
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x5
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x20, 0xfff0
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xfff0, 0xfff0
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x5, 0x0
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffd5, 0x0
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0x1c, 0x5
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffec, 0x5
- delay 0xa
+ delay 10
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xf, 0xfff4
createsprite gLeerSpriteTemplate, ANIM_ATTACKER, 2, 0xffdf, 0xfff4
@@ -32427,25 +35343,25 @@ gBattleAnimMove_ExtremeEvoboost::
loadspritegfx ANIM_TAG_WATER_ORB @blue
loadspritegfx ANIM_TAG_POISON_BUBBLE @purple
loadspritegfx ANIM_TAG_LEAF @green
- createvisualtask AnimTask_BlendParticle, 0x5, ANIM_TAG_CIRCLE_OF_LIGHT, 0x0, 0x10, 0x10, 0x5bff
+ createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CIRCLE_OF_LIGHT, 0, 16, 16, RGB(31, 31, 22)
waitforvisualfinish
playsewithpan SE_M_REVERSAL, SOUND_PAN_ATTACKER
createsprite gExtremeEvoboostRedChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPinkChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostIceChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x540, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlackChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x490, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlueChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x500, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPurpleChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x4d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostYellowChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostGreenChargeUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
waitforvisualfinish
visible ANIM_ATTACKER
loopsewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x15, 0xd
@@ -32456,62 +35372,62 @@ gBattleAnimMove_ExtremeEvoboost::
call ExtremeEvoboostColorCharge
waitforvisualfinish
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ATTACKER), 0x0, 0x0, 0x10, 0x7fff
- delay 0x18
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 0, 0, 16, RGB_WHITE
+ delay 24
call ResetFromWhiteScreen
end
ExtremeEvoboostColorCircle:
createsprite gExtremeEvoboostRedChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPinkChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostIceChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlackChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlueChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPurpleChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostYellowChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostGreenChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
return
ExtremeEvoboostColorCharge:
createsprite gExtremeEvoboostRedChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostRedStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0x37, 0x37, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPinkChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPinkStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0xffc9, 0xffc9, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostIceChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostIceStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x37, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlackChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlackStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffc9, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlueChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostBlueStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0x37, 0xffde, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPurpleChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostPurpleStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0x37, 0x22, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostYellowChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostYellowStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0xffc9, 0xffde, 0xd
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostGreenChargeCircleSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff0
- delay 0x2
+ delay 2
createsprite gExtremeEvoboostGreenStockpileSpriteTemplate, ANIM_ATTACKER, 2, 0xffc9, 0x22, 0xd
- delay 0x2
+ delay 2
return
@@ -32549,7 +35465,7 @@ PulverizingPancakeFinish:
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gFlyBallUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
- delay 0x2
+ delay 2
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 12, 4, -16, 34
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0, 16, 4, -10, 34
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 14, 4, -18, 34
@@ -32562,13 +35478,13 @@ PulverizingPancakeFinish:
waitbgfadein
loadspritegfx ANIM_TAG_WHITE_SHADOW
createvisualtask AnimTask_PulverizingPancakeWhiteShadow, 0x5, 0x33, 0x33 @first arg is duration, last arg is move speed
- delay 0x10
+ delay 16
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, 0x4, 0x2, 0x0, 0xb, 0x0000 @ target darkens
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 11, RGB_BLACK @ target darkens
call PulverizingPancakeSlowBackground @0
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
@@ -32576,22 +35492,22 @@ PulverizingPancakeFinish:
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground
call PulverizingPancakeSlowBackground @-0x1000
- delay 0x1
+ delay 1
waitbgfadein
loadspritegfx ANIM_TAG_THIN_RING @ring
unloadspritegfx ANIM_TAG_MUD_SAND @dig
loadspritegfx ANIM_TAG_ELECTRIC_ORBS @yellow
createsprite gBounceBallLandSpriteTemplate, ANIM_TARGET, 3
- delay 0x7
+ delay 7
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, 0, 0, ANIM_TARGET, 0 @big hit marker
- delay 0x0
+ delay 0
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 4, 44
createsprite gPulverizingPancakeYellowRingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x100, 0x0
- delay 0x5
+ delay 5
loadspritegfx ANIM_TAG_EXPLOSION @explosion
call PulverizingPancakeExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff @ everything goes white
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 16, RGB_WHITE @ everything goes white
call PulverizingPancakeExplosion
waitforvisualfinish
call ResetFromWhiteScreen
@@ -32602,30 +35518,30 @@ PulverizingPancakeDiggingRun:
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 14, 4, -18, 18
createsprite gDirtPlumeSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 1, 12, 4, -16, 18
playsewithpan SE_M_DIG, SOUND_PAN_ATTACKER
- delay 0x5
+ delay 5
return
PulverizingPancakeSlowBackground:
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xfd56, 0x0, 0xffff @-0x2aa
- delay 0x1
+ delay 1
return
PulverizingPancakeExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gPulverizingPancakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gPulverizingPancakeYellowRingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x100, 0x0
createsprite gPulverizingPancakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gPulverizingPancakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gPulverizingPancakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gPulverizingPancakeYellowRingSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x100, 0x0
createsprite gPulverizingPancakeExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
@@ -32642,14 +35558,14 @@ gBattleAnimMove_GenesisSupernova::
jumpargeq 0x7 ANIM_TARGET GenesisSupernovaOnPlayer
GenesisSupernovaOnOpponent:
call GenesisSupernovaBuffEffectPlayer_1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0xb, 0xd87c
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, (RGB(28, 3, 22) | RGB_ALPHA)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 112, 1
call GenesisSupernovaBuffEffectPlayer_2
call GenesisSupernovaBuffEffectPlayer_1
goto GenesisSupernovaFinish
GenesisSupernovaOnPlayer:
call GenesisSupernovaBuffOpponent_1
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0x0, 0xb, 0xd87c
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 0, 11, (RGB(28, 3, 22) | RGB_ALPHA)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 112, 1
call GenesisSupernovaBuffOpponent_2
call GenesisSupernovaBuffOpponent_1
@@ -32658,7 +35574,7 @@ GenesisSupernovaFinish:
call GenesisSupernovaReversalWave
call GenesisSupernovaReversalWave
call GenesisSupernovaReversalWave
- delay 0x15
+ delay 21
unloadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge
monbg ANIM_ATTACKER
@@ -32669,29 +35585,29 @@ GenesisSupernovaFinish:
call GenesisSupernovaFlare
call GenesisSupernovaFlare
call GenesisSupernovaFlare
- delay 0x4
+ delay 4
unloadspritegfx ANIM_TAG_BLUE_ORB @reversal
loadspritegfx ANIM_TAG_WISP_ORB @will-o-wisp
loadspritegfx ANIM_TAG_METEOR @superpower
loadspritegfx ANIM_TAG_SPARKLE_2 @sparkles
createsprite gGenesisSupernovaSuperpowerSpriteTemplate, ANIM_TARGET, 3, 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x0, 0xb, 0x0, 0xd87c
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 0, 11, 0, (RGB(28, 3, 22) | RGB_ALPHA)
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendParticle, 0x2, ANIM_TAG_SPARKLE_2, 0x0, 0x0, 0xc, 0x7fff
- delay 0x8
+ createvisualtask AnimTask_BlendParticle, 2, ANIM_TAG_SPARKLE_2, 0, 0, 12, RGB_WHITE
+ delay 8
invisible ANIM_TARGET
loadspritegfx ANIM_TAG_EXPLOSION @explosion
unloadspritegfx ANIM_TAG_METEOR @superpower
call GenesisSupernovaBubbleExplosion
call GenesisSupernovaBubbleExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 0, 16, RGB_WHITE
call GenesisSupernovaBubbleExplosion
waitforvisualfinish
- delay 0x10
- createvisualtask AnimTask_BlendParticle, 0x2, ANIM_TAG_SPARKLE_2, 0x0, 0xc, 0x0, 0x7fff
+ delay 16
+ createvisualtask AnimTask_BlendParticle, 2, ANIM_TAG_SPARKLE_2, 0, 12, 0, RGB_WHITE
clearmonbg ANIM_ATTACKER
blendoff
- delay 0x0
+ delay 0
call ResetFromWhiteScreen
waitforvisualfinish
end
@@ -32700,24 +35616,24 @@ GenesisSupernovaBubbleExplosion:
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0xa, 0xa, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0x14, 0xffec, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, ANIM_TARGET, 0x0, 0x20, 0x3c
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xf, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xffec, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
- delay 0x6
+ delay 6
createsprite gGenesisSupernovaBubbleSpriteTemplate, ANIM_TARGET, 2, 0x10, 0xfff8, 0x0
createsprite gGenesisSupernovaExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe0, 0xffe8, ANIM_TARGET, 0x1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
@@ -32725,37 +35641,37 @@ GenesisSupernovaBubbleExplosion:
GenesisSupernovaBuffEffectPlayer_1:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x24, 0x80, 0x24, 0x30, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x10, 0x80, 0x10, 0x35, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x45, 0x80, 0x45, 0x3a, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x60, 0x80, 0x60, 0x30, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x30, 0x80, 0x30, 0x3c, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x55, 0x80, 0x55, 0x33, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
GenesisSupernovaBuffEffectPlayer_2:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x29, 0x80, 0x29, 0x31, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x73, 0x80, 0x73, 0x32, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x4a, 0x80, 0x4a, 0x3c, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x64, 0x80, 0x64, 0x33, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x2c, 0x80, 0x2c, 0x3d, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaOrbRiseSpriteTemplate, ANIM_ATTACKER, 50, 0x6c, 0x80, 0x6c, 0x30, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
GenesisSupernovaReversalWave:
@@ -32766,52 +35682,52 @@ GenesisSupernovaReversalWave:
return
GenesisSupernovaFlare:
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
return
GenesisSupernovaBuffOpponent_1:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0x94, 0x40, 0x94, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0x80, 0x40, 0x80, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xb5, 0x40, 0xb5, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xd0, 0x40, 0xd0, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xa0, 0x40, 0xa0, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xc5, 0x40, 0xc5, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
GenesisSupernovaBuffOpponent_2:
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0x99, 0x40, 0x99, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xe3, 0x40, 0xe3, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xba, 0x40, 0xba, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xd4, 0x40, 0xd4, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0x9c, 0x40, 0x9c, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gGenesisSupernovaSpinUpSpriteTemplate, ANIM_ATTACKER, 50, 0xdc, 0x40, 0xdc, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
@@ -32827,22 +35743,22 @@ gBattleAnimMove_SinisterArrowRaid::
createsprite gArrowRaidFlyUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
waitforvisualfinish
unloadspritegfx ANIM_TAG_ROUND_SHADOW
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x10, 0x388C @ bg to purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 16, RGB(12, 4, 14) @ bg to purple
waitforvisualfinish
visible ANIM_ATTACKER
playsewithpan SE_M_WHIRLPOOL, SOUND_PAN_TARGET
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gArrowRaidArrowUpSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
waitforvisualfinish
invisible ANIM_ATTACKER
loadspritegfx ANIM_TAG_BIRD @sky attack
@@ -32853,48 +35769,48 @@ gBattleAnimMove_SinisterArrowRaid::
SinisterArrowRaidOnOpponent:
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x88, 0x100, 0x38, 0x15 @left to right
- delay 0x5
+ delay 5
createsprite gArrowRaidRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x8a, 0x100, 0x3a, 0x15 @left to right
- delay 0x1
+ delay 1
createsprite gArrowRaidRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x8c, 0x100, 0x3c, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x86, 0x100, 0x36, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x84, 0x100, 0x34, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightUpSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x88, 0x100, 0x38, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER @[x0] [y0] [xf] [yf]
createsprite gArrowRaidFlyLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x38, 0xfff0, 0x38, 0x15 @right to left
- delay 0x5
+ delay 5
createsprite gArrowRaidLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x36, 0xfff0, 0x36, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x3a, 0xfff0, 0x3a, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x37, 0xfff0, 0x37, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x3c, 0xfff0, 0x3c, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftUpSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x38, 0xfff0, 0x38, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x08, 0x100, 0x0f, 0x15 @left to right
- delay 0x5
+ delay 5
createsprite gArrowRaidRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x0a, 0x100, 0x11, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x0c, 0x100, 0x13, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x06, 0x100, 0xd, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x04, 0x100, 0xb, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightDownSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x08, 0x100, 0xf, 0x15
waitforvisualfinish
call SinisterArrowRaidFlyStrike
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 3, 75
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0x10, 0x40c0 @ defender to purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 0, 16, RGB(0, 6, 16) @ defender to purple
call SinisterArrowRaidStrikeOpponent
call SinisterArrowRaidOpponentExplosion
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
@@ -32905,48 +35821,48 @@ SinisterArrowRaidOnOpponent:
SinisterArrowRaidOnPlayer:
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x08, 0xfff0, 0x0f, 0x15 @right to left
- delay 0x5
+ delay 5
createsprite gArrowRaidFaceUpLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x0a, 0xfff0, 0x11, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidFaceUpLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x0c, 0xfff0, 0x13, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidFaceUpLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x06, 0xfff0, 0xd, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidFaceUpLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x04, 0xfff0, 0xb, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidFaceUpLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x08, 0xfff0, 0xf, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x38, 0x100, 0x38, 0x15 @left to right
- delay 0x5
+ delay 5
createsprite gArrowRaidRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x36, 0x100, 0x36, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x3a, 0x100, 0x3a, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x37, 0x100, 0x37, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x3c, 0x100, 0x3c, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidRightSpriteTemplate, ANIM_ATTACKER, 50, 0xfff0, 0x38, 0x100, 0x38, 0x15
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_VITAL_THROW, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyLeftSpriteTemplate, ANIM_ATTACKER, 50, 0x0120, 0x78, 0xfff0, 0x58, 0x15 @right to left
- delay 0x5
+ delay 5
createsprite gArrowRaidLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x100, 0x8a, 0xfff0, 0x3a, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x100, 0x8c, 0xfff0, 0x3c, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x100, 0x86, 0xfff0, 0x36, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x100, 0x84, 0xfff0, 0x34, 0x15
- delay 0x1
+ delay 1
createsprite gArrowRaidLeftDownSpriteTemplate, ANIM_ATTACKER, 50, 0x100, 0x88, 0xfff0, 0x38, 0x15
waitforvisualfinish
call SinisterArrowRaidFlyStrike
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 3, 75
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x0, 0x10, 0x40c0 @ defender to purple
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 0, 16, RGB(0, 6, 16) @ defender to purple
call SinisterArrowRaidArrowsStrikePlayer
call SinisterArrowRaidPlayerExplosion
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
@@ -32954,173 +35870,173 @@ SinisterArrowRaidOnPlayer:
call SinisterArrowRaidFinalExplosion
@ finish
SinisterArrowRaidFinish:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x4, 0x10, 0x0, 0x40c0 @ return tgt to normal
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 4, 16, 0, RGB(0, 6, 16) @ return tgt to normal
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x10, 0x00, 0x388C @ bg to nrml
- delay 0x5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 16, 0, RGB(12, 4, 14) @ bg to nrml
+ delay 5
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
SinisterArrowRaidFlyStrike:
visible ANIM_TARGET
- delay 0xa
+ delay 10
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
createsprite gArrowRaidFlyStrikeSpriteTemplate, ANIM_TARGET, 2, 0x14
waitforvisualfinish
- delay 0x5
+ delay 5
return
SinisterArrowRaidStrikeOpponent:
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x95, 0xfff0, 0xb5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x75, 0xfff0, 0x95, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xa5, 0xfff0, 0xc5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x6f, 0xfff0, 0x8f, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x7b, 0xfff0, 0x9b, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xa2, 0xfff0, 0xc2, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x82, 0xfff0, 0xa2, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x87, 0xfff0, 0xa7, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x72, 0xfff0, 0x92, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x8b, 0xfff0, 0xab, 0x40, 0x4
- delay 0x1
+ delay 1
return
SinisterArrowRaidOpponentExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x95, 0xfff0, 0xb5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x75, 0xfff0, 0x95, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xa5, 0xfff0, 0xc5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x6f, 0xfff0, 0x8f, 0x40, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x7b, 0xfff0, 0x9b, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xa2, 0xfff0, 0xc2, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x82, 0xfff0, 0xa2, 0x40, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x87, 0xfff0, 0xa7, 0x40, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x72, 0xfff0, 0x92, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x85, 0xfff0, 0xa5, 0x40, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x8b, 0xfff0, 0xab, 0x40, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
return
SinisterArrowRaidArrowsStrikePlayer:
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x5, 0xfff0, 0x55, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffe5, 0xfff0, 0x35, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x15, 0xfff0, 0x65, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffdf, 0xfff0, 0x2f, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffeb, 0xfff0, 0x3b, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x12, 0xfff0, 0x62, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff2, 0xfff0, 0x42, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff7, 0xfff0, 0x47, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffe2, 0xfff0, 0x32, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_HORN_ATTACK, SOUND_PAN_TARGET
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xfff0, 0x4b, 0x90, 0x4
- delay 0x1
+ delay 1
return
SinisterArrowRaidPlayerExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x5, 0xfff0, 0x55, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffe5, 0xfff0, 0x35, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x15, 0xfff0, 0x65, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffdf, 0xfff0, 0x2f, 0x90, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffeb, 0xfff0, 0x3b, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0x12, 0xfff0, 0x62, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff2, 0xfff0, 0x42, 0x90, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff7, 0xfff0, 0x47, 0x90, 0x4
- delay 0x1
+ delay 1
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xffe2, 0xfff0, 0x32, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfff5, 0xfff0, 0x45, 0x90, 0x4
- delay 0x1
+ delay 1
createsprite gArrowRaidArrowOnslaughtSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xfff0, 0x4b, 0x90, 0x4
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x1
+ delay 1
return
SinisterArrowRaidFinalExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gArrowRaidExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
@@ -33136,7 +36052,7 @@ gBattleAnimMove_MaliciousMoonsault::
setalpha 12, 8
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
createsprite gVerticalDipSpriteTemplate, ANIM_ATTACKER, 2, 0x6, 0x1, 0x0
- delay 0x1
+ delay 1
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0x0, 0x18, 0x0, 0x0, 0x0
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0xffec, 0xfff6, 0x18, 0x0, 0x0, 0x0
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 66, 0x0, 0xfff0, 0x18, 0x0, 0x0, 0x0
@@ -33146,7 +36062,7 @@ gBattleAnimMove_MaliciousMoonsault::
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x18, 0x0, 0x0, 0x0
createsprite gFirePlumeSpriteTemplate, ANIM_ATTACKER, 2, 0xffec, 0xa, 0x18, 0x0, 0x0, 0x0
waitforvisualfinish
- delay 0x0
+ delay 0
monbg ANIM_ATTACKER
playsewithpan SE_M_SACRED_FIRE2, SOUND_PAN_TARGET
call MaliciousMoonsaultFireSpin
@@ -33157,18 +36073,18 @@ gBattleAnimMove_MaliciousMoonsault::
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gMaliciousMoonsaultRedFlySpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x150
call MaliciousMoonsaultFireSpin
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x5, 0x0, 0xa, 0x0000 @ target darkens
- delay 0x1a
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 5, 0, 10, RGB_BLACK @ target darkens
+ delay 26
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gMaliciousMoonsaultRedBounceSpriteTemplate, ANIM_TARGET, 3
- delay 0x7
+ delay 7
createsprite gMaliciousMoonsaultRedImpactSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1, 0x0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -256, 21, 0, 4
call MaliciousMoonsaultExplosion
- delay 0x6
+ delay 6
call MaliciousMoonsaultExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x1, 0x0, 0x10, 0x001b @ fade all to red
- delay 0x6
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 1, 0, 16, RGB(27, 0, 0) @ fade all to red
+ delay 6
call MaliciousMoonsaultExplosion
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
waitforvisualfinish
@@ -33177,29 +36093,29 @@ gBattleAnimMove_MaliciousMoonsault::
end
MaliciousMoonsaultFireSpin:
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2f, 0x490, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x30, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x500, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x540, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x4d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2f, 0x490, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x500, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x30, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x4d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x540, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x1
+ delay 1
return
MaliciousMoonsaultExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
@@ -33209,7 +36125,7 @@ MaliciousMoonsaultExplosion:
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMaliciousMoonsaultExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -33217,7 +36133,7 @@ MaliciousMoonsaultExplosion:
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMaliciousMoonsaultExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -33225,7 +36141,7 @@ MaliciousMoonsaultExplosion:
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMaliciousMoonsaultExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -33233,7 +36149,7 @@ MaliciousMoonsaultExplosion:
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMaliciousMoonsaultExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
createsprite gMaliciousMoonsaultFireblastSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
@@ -33256,11 +36172,11 @@ gBattleAnimMove_OceanicOperetta::
loadspritegfx ANIM_TAG_WATER_ORB @blue
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call OceanicOperettaBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_WHITE
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call OceanicOperettaBuffEffect
- delay 0x8
+ delay 8
call OceanicOperettaBuffEffect
waitforvisualfinish
unloadspritegfx ANIM_TAG_FOCUS_ENERGY
@@ -33269,164 +36185,164 @@ gBattleAnimMove_OceanicOperetta::
waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 0x2
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x6, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 6, RGB(0, 13, 23)
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT
loadspritegfx ANIM_TAG_THIN_RING
invisible ANIM_ATTACKER
createsprite gOceanOperaBlueChargeSpriteTemplate, ANIM_ATTACKER, 2, 0x0 @charge
- delay 0x2
+ delay 2
createvisualtask AnimTask_ShakeMon, 5, ANIM_ATTACKER, 0, 2, 80, 1
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
playsewithpan SE_M_GRASSWHISTLE, SOUND_PAN_ATTACKER
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gOceanOperaBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, 0x0, 0x0
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gWhirlpoolSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x1a
+ delay 26
visible ANIM_TARGET
loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 0x14, 0x5
createsprite gOceanOperaMovingOrbsSpriteTemplate, ANIM_ATTACKER, 50, 0x0, 0x0, 0x0, 0x0, 0x60, 0x0 @mist ball
- delay 0x5c
+ delay 92
visible ANIM_ATTACKER
- delay 0x0
+ delay 0
loopsewithpan SE_M_CRABHAMMER, SOUND_PAN_TARGET, 0x14, 0x1
createsprite gOceanOperaBlueOrbsSpriteTemplate, ANIM_ATTACKER, 50, 0x0, ANIM_TARGET, 0x0, 0x0, 0x0, 0x35
- delay 0x5
+ delay 5
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
createsprite gOceanOperaExpandingRingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
- delay 0x4
+ delay 4
createsprite gOceanOperaExpandingRingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
- delay 0x4
+ delay 4
createsprite gOceanOperaExpandingRingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
- delay 0x4
+ delay 4
createsprite gOceanOperaExpandingRingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
- delay 0x4
+ delay 4
createsprite gOceanOperaExpandingRingSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0
- delay 0x10
+ delay 16
loadspritegfx ANIM_TAG_EXPLOSION @explosion
loadspritegfx ANIM_TAG_SPARKLE_2 @sparkle
loadspritegfx ANIM_TAG_RAIN_DROPS @rain
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 8, 64
call OceanicOperettaExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_TARGET, 0x2, 0x0, 0xb, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_TARGET, 2, 0, 11, RGB(0, 13, 23)
createvisualtask AnimTask_CreateRaindrops, 0x2, 0x0, 0x3, 0x78
call OceanicOperettaExplosion
call OceanicOperettaExplosion
playsewithpan SE_M_RAIN_DANCE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_CreateRaindrops, 0x2, 0x0, 0x3, 0x78
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_TARGET, 0x2, 0xb, 0x0, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_TARGET, 2, 11, 0, RGB(0, 13, 23)
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x6, 0x0, 0x5da0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 6, 0, RGB(0, 13, 23)
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
OceanicOperettaBuffEffect:
createsprite gOceanOperaBlueFlareSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gOceanOperaBlueFlareSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gOceanOperaBlueFlareSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gOceanOperaBlueFlareSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gOceanOperaBlueFlareSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
OceanicOperettaExplosion:
createsprite gOceanOperaSparkleSpriteTemplate, ANIM_ATTACKER, 51, 0xfff1, 0x0, ANIM_TARGET, 0x0, 0x20, 0x3c
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gOceanOperaExplosionSpriteTemplate, ANIM_ATTACKER, 51, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gOceanOperaExplosionSpriteTemplate, ANIM_ATTACKER, 51, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gOceanOperaExplosionSpriteTemplate, ANIM_ATTACKER, 51, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gOceanOperaSparkleSpriteTemplate, ANIM_ATTACKER, 51, 0xc, 0xfffb, ANIM_TARGET, 0x0, 0x20, 0x3c
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gOceanOperaExplosionSpriteTemplate, ANIM_ATTACKER, 51, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gOceanOperaExplosionSpriteTemplate, ANIM_ATTACKER, 51, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
@@ -33455,18 +36371,18 @@ SplinteredStormshardsFinishFade:
SplinteredStormshardsByPlayer:
loopsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET, 0x10, 0xc
call SplinteredStormshardsPlayer_Rising1
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
call SplinteredStormshardsPlayer_Rising1
call SplinteredStormshardsPlayer_Rising2
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x60, 0x80, 0x60, 0x30, 0x30
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(31, 31, 22)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
- delay 0x2
+ delay 2
call SplinteredStormshardsPlayer_Rising2
call SplinteredStormshardsPlayer_Rising1
delay 16
@@ -33476,25 +36392,25 @@ SplinteredStormshardsByPlayer:
loadspritegfx ANIM_TAG_EXPLOSION @explosion
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4 @lunge forward
- delay 0x2
+ delay 2
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0 @superpower
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 96, 1 @shake target up and down
createsprite gSplinteredShardsSplinterOpponentSteepSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0x18, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gSplinteredShardsSplinterOpponentShallowSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0x1, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
call SplinteredStormshardsExplosionOpponent
call SplinteredStormshardsExplosionOpponent
SplinteredStormshardsEnd:
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 0, 16, RGB_WHITE
call SplinteredStormshardsBrownExplode
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x10, 0x0, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 16, 0, RGB_WHITE
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
@@ -33506,48 +36422,48 @@ SplinteredStormshardsExplosionOpponent:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterOpponentSteepSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x20, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterOpponentShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x0, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterOpponentShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0xfff8, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterOpponentSteepSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x20, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterOpponentShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x0, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
return
SplinteredStormshardsByOpponent:
loopsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET 0x10 0xc
call SplinteredStormshardsOpponent_Rising1
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
createsprite gSplinteredShardsFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
call SplinteredStormshardsOpponent_Rising1
call SplinteredStormshardsOpponent_Rising2
visible ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xd0, 0x40, 0xd0, 0x0, 0x30
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(31, 31, 22)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
- delay 0x2
+ delay 2
call SplinteredStormshardsOpponent_Rising2
call SplinteredStormshardsOpponent_Rising1
delay 16
@@ -33556,17 +36472,17 @@ SplinteredStormshardsByOpponent:
loadspritegfx ANIM_TAG_EXPLOSION @explosion
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4 @lunge forward
- delay 0x2
+ delay 2
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0 @superpower
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 96, 1 @shake target up and down
createsprite gSplinteredShardsSplinterPlayerShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x18, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gSplinteredShardsSplinterPlayerSteepSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x30, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
- delay 0x4
+ delay 4
+ delay 4
call SplinteredStormshardsExplosionOnPlayer
call SplinteredStormshardsExplosionOnPlayer
goto SplinteredStormshardsEnd
@@ -33574,106 +36490,106 @@ SplinteredStormshardsExplosionOnPlayer:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterPlayerShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x20, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterPlayerSteepSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x35, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterPlayerShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x1c, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterPlayerShallowSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x16, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
createsprite gSplinteredShardsSplinterPlayerSteepSpriteTemplate, ANIM_TARGET, 2, 0xffd0, 0x2d, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
playsewithpan SE_M_ROCK_THROW, SOUND_PAN_TARGET
- delay 0x2
+ delay 2
return
SplinteredStormshardsBrownExplode:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSplinteredShardsExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
SplinteredStormshardsPlayer_Rising1:
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x24, 0x80, 0x24, 0x30, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x10, 0x80, 0x10, 0x35, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x45, 0x80, 0x45, 0x3a, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x60, 0x80, 0x60, 0x30, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x30, 0x80, 0x30, 0x3c, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x55, 0x80, 0x55, 0x33, 0x30
- delay 0x2
+ delay 2
return
SplinteredStormshardsPlayer_Rising2:
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x29, 0x80, 0x29, 0x31, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x73, 0x80, 0x73, 0x32, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x4a, 0x80, 0x4a, 0x3c, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x64, 0x80, 0x64, 0x33, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x2c, 0x80, 0x2c, 0x3d, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x6c, 0x80, 0x6c, 0x30, 0x30
- delay 0x2
+ delay 2
return
SplinteredStormshardsOpponent_Rising1:
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x94, 0x40, 0x94, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x80, 0x40, 0x80, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xb5, 0x40, 0xb5, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xd0, 0x40, 0xd0, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xa0, 0x40, 0xa0, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xc5, 0x40, 0xc5, 0x0, 0x30
- delay 0x2
+ delay 2
return
SplinteredStormshardsOpponent_Rising2:
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x99, 0x40, 0x99, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xe3, 0x40, 0xe3, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xba, 0x40, 0xba, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xd4, 0x40, 0xd4, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0x9c, 0x40, 0x9c, 0x0, 0x30
- delay 0x2
+ delay 2
createsprite gSplinteredShardsRisingSpearSpriteTemplate, ANIM_ATTACKER, 50, 0xdc, 0x40, 0xdc, 0x0, 0x30
- delay 0x2
+ delay 2
return
@@ -33688,55 +36604,55 @@ gBattleAnimMove_LetsSnuggleForever::
createsprite gSnuggleForeverHeartSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x14
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x1, 0x1, 0x0
- delay 0x7
+ delay 7
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x3, 0x3, 0x80
- delay 0x8
+ delay 8
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x2, 0x0, 0x80
- delay 0x7
+ delay 7
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1, 0x1, 0x0
- delay 0x8
+ delay 8
playsewithpan SE_M_CHARM, SOUND_PAN_ATTACKER
- delay 0x7
+ delay 7
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x1, 0x0, 0x3, 0x0
- delay 0x7
+ delay 7
fadetobg BG_SNUGGLE_FOREVER
waitbgfadeout
invisible ANIM_ATTACKER
- delay 0x1
+ delay 1
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
- delay 0x10
+ delay 16
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
waitforvisualfinish
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
- delay 0x10
+ delay 16
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
waitforvisualfinish
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
- delay 0x10
+ delay 16
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 2, 50, 1
call LetsSnuggleForeverTears
- delay 0x8
+ delay 8
call LetsSnuggleForeverTears
- delay 0x8
+ delay 8
call LetsSnuggleForeverTears
- delay 0x8
+ delay 8
call LetsSnuggleForeverTears
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 16, RGB_BLACK
waitforvisualfinish
loadspritegfx ANIM_TAG_SPARKLE_4 @detect
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gSnuggleForeverEyesSpriteTemplate, ANIM_ATTACKER, 13, 0xa, 0xfff2
createsprite gSnuggleForeverEyesSpriteTemplate, ANIM_ATTACKER, 13, 0xfff6, 0xfff2
- delay 0x20
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x1, 0x0, 0x10, 0x579D
+ delay 32
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 1, 0, 16, RGB(29, 28, 21)
createvisualtask AnimTask_GrowTarget, 0x5
- delay 0x5
+ delay 5
loadspritegfx ANIM_TAG_IMPACT @hit
loadspritegfx ANIM_TAG_PAIN_SPLIT @painsplit
loadspritegfx ANIM_TAG_DUCK @duck
@@ -33754,17 +36670,17 @@ gBattleAnimMove_LetsSnuggleForever::
createvisualtask AnimTask_TranslateMonElliptical, 0x2, 0x0, 0xffee, 0x6, 0x6, 0x4
createvisualtask AnimTask_TranslateMonElliptical, 0x2, 0x1, 0x12, 0x6, 0x6, 0x4
call LetsSnuggleForeverStars_1
- delay 0x0
+ delay 0
call LetsSnuggleForeverImpacts
call LetsSnuggleForeverStars_2
- delay 0x0
+ delay 0
call LetsSnuggleForeverImpacts
call LetsSnuggleForeverStars_1
- delay 0x0
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x2, 0x0, 0x10, 0x7fff
+ delay 0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 2, 0, 16, RGB_WHITE
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
call LetsSnuggleForeverStars_2
- delay 0x0
+ delay 0
call LetsSnuggleForeverImpacts
invisible ANIM_TARGET
stopsound
@@ -33775,17 +36691,17 @@ LetsSnuggleForeverTears:
playsewithpan SE_M_TAIL_WHIP, SOUND_PAN_TARGET
createsprite gTearDropSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x0
createsprite gTearDropSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x1
- delay 0x8
+ delay 8
createsprite gTearDropSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x2
createsprite gTearDropSpriteTemplate, ANIM_TARGET, 2, ANIM_TARGET, 0x3
return
LetsSnuggleForeverImpacts:
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, -12, ANIM_TARGET, 0
- delay 0x8
+ delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -12, 8, ANIM_TARGET, 0
- delay 0x8
+ delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 12, 0, ANIM_TARGET, 0
- delay 0x8
+ delay 8
return
LetsSnuggleForeverStars_1:
createsprite gSnuggleForeverStarSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0xfff8, 0xa0, 0xffe0
@@ -33831,20 +36747,18 @@ gBattleAnimMove_ClangorousSoulblaze::
playsewithpan SE_SHINY, SOUND_PAN_ATTACKER
createsprite gClangorousSoulRedRingTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, 0x0, 0x0
waitforvisualfinish
- unloadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST
- unloadspritegfx ANIM_TAG_SPARKLE_2 @stars
loadspritegfx ANIM_TAG_ROUND_SHADOW @ fly
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gClangoorousSoulblazeWhiteFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
- delay 0x2
+ delay 2
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0xFFE0, 0x1, 0xffff
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, -768, 10, 0, 42
createsprite gSlideMonToOffsetPartnerSpriteTemplate, ANIM_ATTACKER, 2, ANIM_DEF_PARTNER, 0xfd00, 0xa, 0x0, 0x2a
- delay 0x20
+ delay 32
createvisualtask AnimTask_StartSlidingBg, 0x5, 0x0, 0x20, 0x1, 0xffff
- delay 0xC
+ delay 12
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x1, 0x0, 0x4, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 1, 0, 4, RGB_BLACK
loadspritegfx ANIM_TAG_CIRCLE_OF_LIGHT @charge
visible ANIM_ATTACKER
monbg ANIM_ATTACKER
@@ -33865,20 +36779,20 @@ gBattleAnimMove_ClangorousSoulblaze::
clearmonbg ANIM_ATTACKER
invisible ANIM_ATTACKER
invisible ANIM_ATK_PARTNER
- delay 0x0
+ delay 0
monbg ANIM_TARGET
playsewithpan SE_M_GIGA_DRAIN, SOUND_PAN_ATTACKER
createsprite gClangoorousSoulblazePulseSpriteTemplate, ANIM_ATTACKER, 2, 0x10, 0x0, 0x0, 0x0, 0x1d, 0x0
createsprite gSlowFlyingMusicNotesSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0x0, 0x0 @music note
- delay 0x5
+ delay 5
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 2, 60
createvisualtask AnimTask_HorizontalShake, 5, ANIM_DEF_PARTNER, 2, 60
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
call ClangorousSoulblazePulse_4
loadspritegfx ANIM_TAG_EXPLOSION
createvisualtask AnimTask_IsTargetPlayerSide, 0x2
@@ -33886,148 +36800,148 @@ gBattleAnimMove_ClangorousSoulblaze::
ClangorousSoulblazeOnPlayer:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0xfff0, ANIM_ATTACKER, 0x1
- delay 0x5
+ delay 5
call ClangorousSoulblazePulse_5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_ATTACKER, 0x1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x20, 0xffe0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x20, 0x0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x30, 0xffe0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x30, 0xfff0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x35, 0x0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x40, 0x10, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x40, 0x0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x45, 0xfff0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x50, 0x10, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x50, 0xffe0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x60, 0xfff0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x60, 0xffe0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 0, 16, RGB_WHITE
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x65, 0xfff0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x65, 0xffe0, ANIM_ATTACKER, 0x1
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x0, 0x0, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_ATTACKER, 3, 0x10, 0x10, ANIM_TARGET, 0x1
goto FINISH_SOULBLAZE
ClangorousSoulblazeOnOpponent:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x15, ANIM_ATTACKER, 0x1
- delay 0x5
+ delay 5
call ClangorousSoulblazePulse_5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x0, ANIM_ATTACKER, 0x1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x20, 0x25, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x20, 0x5, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x30, 0x25, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x30, 0x15, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x35, 0x0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x40, 0xa, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x40, 0x0, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x45, 0x10, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x50, 0x30, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x50, 0x25, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x60, 0x40, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x60, 0x45, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x7fff
+ delay 5
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 0, 16, RGB_WHITE
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x65, 0x35, ANIM_ATTACKER, 0x1
call ClangorousSoulblazePulse_3
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x65, 0x40, ANIM_ATTACKER, 0x1
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_4
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_5
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_1
- delay 0x5
+ delay 5
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
call ClangorousSoulblazePulse_2
- delay 0x5
+ delay 5
createsprite gExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
FINISH_SOULBLAZE:
waitforvisualfinish
clearmonbg ANIM_TARGET
- delay 0x5
+ delay 5
call ResetFromWhiteScreen
blendoff
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x10
@@ -34037,32 +36951,32 @@ FINISH_SOULBLAZE:
ClangorousSoulblazeEnergySwirl:
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x180, 0x32, 0x8, 0x32, ANIM_ATTACKER
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x2
+ delay 2
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x20, 0xf0, 0x28, 0xb, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1a0, 0x28, 0x4, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1f, 0x120, 0x2d, 0x6, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x1c, 0x1c0, 0x2d, 0xb, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gClangoorousSoulblazePurpleSwirlSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x21, 0x1d0, 0x32, 0xa, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
return
ClangorousSoulblazeBuffEffect:
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createsprite gClangorousSoulBlueBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gClangorousSoulPurpleBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x0, 0x0, 0x20, 0x3c
- delay 0x4
+ delay 4
createsprite gClangorousSoulWhiteBuffTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, 0x0, 0x0, 0x20, 0x3c
return
ClangorousSoulblazePulse_1:
@@ -34105,33 +37019,33 @@ gBattleAnimMove_GuardianOfAlola::
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -256, 15, 0, 4
call GuardianOfAlolaRocksPlayer
- delay 0xa
+ delay 10
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x10
call GuardianOfAlolaRocksPlayer
waitforvisualfinish
- delay 0xa
+ delay 10
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -256, 15, 0, 4
call GuardianOfAlolaRocksPlayer
- delay 0xa
+ delay 10
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 0x0, 0x10
call GuardianOfAlolaRocksPlayer
waitforvisualfinish
- delay 0xa
- delay 0x10
+ delay 10
+ delay 16
call GuardianOfAlolaRocksPlayer
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_ATTACKER, 0x2, 0xC, 0xC, 0x277f @;Yellow
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 2, 12, 12, RGB(31, 27, 9) @;Yellow
createvisualtask AnimTask_NightShadeClone, 0x5, 0x75
- delay 0x10
+ delay 16
call GuardianOfAlolaRocksPlayer
- delay 0x10
+ delay 16
call GuardianOfAlolaRocksPlayer
- delay 0x10
+ delay 16
loadspritegfx ANIM_TAG_HORSESHOE_SIDE_FIST
call GuardianOfAlolaRocksPlayer
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x3, 0x0, 0xb, 0x0000
- delay 0x1
- createvisualtask AnimTask_BlendParticle, 0x2, ANIM_TAG_HORSESHOE_SIDE_FIST, 0x0, 0xC, 0xc, 0x277f
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 11, RGB_BLACK
+ delay 1
+ createvisualtask AnimTask_BlendParticle, 2, ANIM_TAG_HORSESHOE_SIDE_FIST, 0, 12, 12, RGB(31, 27, 9)
fadetobg BG_FISSURE
waitbgfadeout
call GuardianOfAlolaRocksPlayer
@@ -34139,8 +37053,8 @@ gBattleAnimMove_GuardianOfAlola::
waitbgfadein
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
createsprite gGuardianOfAlolaFistSpriteTemplate, ANIM_TARGET, 3, 0x0, 0xffd0, 0x1f
- delay 0x24
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x0, 0xb, 0x0, 0x0000
+ delay 36
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 11, 0, RGB_BLACK
playsewithpan SE_M_EXPLOSION, SOUND_PAN_TARGET
createvisualtask AnimTask_HorizontalShake, 3, ANIM_TARGET, 10, 0x25
loopsewithpan SE_M_ROCK_THROW SOUND_PAN_TARGET 0x10 0x9
@@ -34157,7 +37071,7 @@ gBattleAnimMove_GuardianOfAlola::
call GuardianOfAlolaRockGeyser
call GuardianOfAlolaRockGeyser
call GuardianOfAlolaRocksTarget
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x3, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, (F_PAL_BG | F_PAL_BATTLERS_2), 3, 0, 16, RGB_WHITE
call GuardianOfAlolaRockGeyser
call GuardianOfAlolaRockGeyser
call GuardianOfAlolaRockGeyser
@@ -34180,13 +37094,13 @@ GuardianOfAlolaRocksTarget:
return
GuardianOfAlolaRockGeyser:
createsprite gGuardianOfAlolaDirtGeyserSpriteTemplate, ANIM_TARGET, 2, 0, 0xfffc, 0x10 @ -4, -0x10
- delay 0x0
+ delay 0
createsprite gGuardianOfAlolaDirtGeyserSpriteTemplate, ANIM_TARGET, 2, 0, 0x100D, 0x10
- delay 0x0
+ delay 0
createsprite gGuardianOfAlolaDirtGeyserSpriteTemplate, ANIM_TARGET, 2, 0, 0x4, 0x10
- delay 0x0
+ delay 0
createsprite gGuardianOfAlolaDirtGeyserSpriteTemplate, ANIM_TARGET, 2, 0, 0xfff0, 0x10
- delay 0x0
+ delay 0
return
@@ -34196,15 +37110,15 @@ gBattleAnimMove_SearingSunrazeSmash::
invisible ANIM_TARGET
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0xe, 0x001b
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 14, RGB(27, 0, 0)
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call SearingSunrazeSmashFlare
- delay 0x8
+ delay 8
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_WHITE
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call SearingSunrazeSmashFlare
- delay 0x8
+ delay 8
call SearingSunrazeSmashFlare
waitforvisualfinish
unloadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy
@@ -34215,28 +37129,28 @@ gBattleAnimMove_SearingSunrazeSmash::
loadspritegfx ANIM_TAG_AIR_WAVE_2 @white/grey
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
createsprite gSearingSunrazeSmashGrowWormholeSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x10
+ delay 16
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 53, -19, 1, 2
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_METEOR @superpower
visible ANIM_TARGET
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 80, -1024, ANIM_TARGET, 0 @ spin up target
call SearingSunrazeSmashRingsInward
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x30 @ target back to origin (slowly)
call SearingSunrazeSmashRingsInward
- delay 0xD
+ delay 13
invisible ANIM_TARGET
createsprite gSearingSunrazeSmashBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gSearingSunrazeSmashWhiteRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x6
+ delay 6
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4 @lunge forward
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
invisible ANIM_ATTACKER
createsprite gGrowingSuperpowerTemplate, ANIM_TARGET, 3, 0x0 @superpower
createsprite gSearingSunrazeSmashBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_ATTACKER
fadetobg BG_COSMIC
waitbgfadeout
@@ -34261,7 +37175,7 @@ gBattleAnimMove_SearingSunrazeSmash::
loadspritegfx ANIM_TAG_ROUND_SHADOW @fly
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashRedFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ATTACKER), 0x3, 0x0, 0xF, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 0, 15, RGB_BLACK
waitforvisualfinish
playsewithpan SE_ORB, SOUND_PAN_ATTACKER
unloadspritegfx ANIM_TAG_ROUND_SHADOW @fly
@@ -34285,42 +37199,40 @@ gBattleAnimMove_SearingSunrazeSmash::
loadspritegfx ANIM_TAG_CUT @cut
createsprite gSunsteelStrikeSuperpowerTemplate, ANIM_TARGET, 2, 0x14
SearingSunrazeSmashImpact:
- delay 0x8
- delay 0x1
+ delay 8
+ delay 1
unloadspritegfx ANIM_TAG_GOLD_RING @beam
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 4, 60
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x20, 0xffe0, 0x0
- delay 0x2
+ delay 2
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x20, 0xffe0, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x1c, 0xffe0, 0x0
- delay 0x2
+ delay 2
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x1c, 0xffe0, 0x1
- delay 0x2
+ delay 2
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x2c, 0xffe0, 0x0
- delay 0x2
+ delay 2
playsewithpan SE_M_CUT, SOUND_PAN_TARGET
createsprite gSearingSunrazeSmashWhiteCutSpriteTemplate, ANIM_TARGET, 2, 0x2c, 0xffe0, 0x1
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_CROSS_IMPACT @x
- delay 0x0
+ delay 0
unloadspritegfx ANIM_TAG_METEOR @superpower
- unloadspritegfx ANIM_TAG_DRAGON_ASCENT @dragon ascent 1
- unloadspritegfx ANIM_TAG_DRAGON_ASCENT_FOE @dragon ascent 2
createsprite gSearingSunrazeSmashCrossImpactSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1, 0x24
playsewithpan SE_M_LEER, SOUND_PAN_TARGET
visible ANIM_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ATTACKER), 0x3, 0xF, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ATTACKER), 3, 15, 0, RGB_BLACK
visible ANIM_ATTACKER
playsewithpan SE_M_MEGA_KICK, SOUND_PAN_ATTACKER
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x10, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 16, RGB_BLACK
createsprite gSearingSunrazeSmashShockwaveSpriteTemplate, ANIM_TARGET, 2 @ charge out and in
- delay 0x1c
+ delay 28
invisible ANIM_TARGET
unloadspritegfx ANIM_TAG_CUT @cut
unloadspritegfx ANIM_TAG_CROSS_IMPACT @x
@@ -34328,35 +37240,35 @@ SearingSunrazeSmashImpact:
call SearingSunrazeSmashInferno
call SearingSunrazeSmashInferno
call SearingSunrazeSmashInferno
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x4, 0x0, 0x10, 0x001b @full red
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 4, 0, 16, RGB(27, 0, 0) @full red
call SearingSunrazeSmashInferno
call SearingSunrazeSmashInferno
call SearingSunrazeSmashInferno
waitforvisualfinish
- delay 0x10
+ delay 16
call ResetFromRedScreen
end
SearingSunrazeSmashFlare:
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x0, 0x0, 0x20, 0x3c
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gGrantingStarsSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, 0x0, 0x0, 0x20, 0x3c
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gEndureEnergySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
SearingSunrazeSmashRingsInward:
createsprite gSearingSunrazeSmashBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gSearingSunrazeSmashWhiteRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gSearingSunrazeSmashBlueRingInwardsSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
return
SearingSunrazeSmashInferno:
playsewithpan SE_M_FLAME_WHEEL2, SOUND_PAN_ATTACKER
@@ -34365,56 +37277,56 @@ SearingSunrazeSmashInferno:
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x3
+ delay 3
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0xfffe, 0x0
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x3
+ delay 3
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xa, 0x0, 0xfffe
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0xfffe, 0x0
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x2, 0x0
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0xfffe, 0x2
createsprite gFireBlastCrossSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xf, 0x2, 0x2
- delay 0x3
+ delay 3
return
SearingSunrazeSmashCharge:
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2f, 0x490, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x30, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x500, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x540, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x4d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2f, 0x490, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x510, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x2c, 0x500, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x30, 0x4e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x4d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x1
+ delay 1
createsprite gFireSpinSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x31, 0x540, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x1
+ delay 1
return
ResetFromRedScreen:
createvisualtask AnimTask_AllBattlersInvisible, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x1B @Everything from red
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 0, RGB(27, 0, 0) @Everything from red
restorebg
waitbgfadeout
setarg 0x7 0xffff
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitbgfadein
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0x0, 0x33ED
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 0, RGB(13, 31, 12)
waitforvisualfinish
return
@@ -34428,15 +37340,15 @@ gBattleAnimMove_MenacingMoonrazeMaelstrom::
invisible ANIM_TARGET
createvisualtask AnimTask_AllBattlersInvisibleExceptAttackerAndTarget, 0xA
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BG, 0x0, 0x0, 0xe, 0x40c0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BG, 0, 0, 14, RGB(0, 6, 16)
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call MenacingMoonrazeMaelstromFlare
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 12, RGB_BLACK
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call MenacingMoonrazeMaelstromFlare
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
- delay 0x8
+ delay 8
call MenacingMoonrazeMaelstromFlare
waitforvisualfinish
unloadspritegfx ANIM_TAG_SPARKLE_2 @sparkles
@@ -34444,28 +37356,28 @@ gBattleAnimMove_MenacingMoonrazeMaelstrom::
loadspritegfx ANIM_TAG_AIR_WAVE_2 @white/grey
playsewithpan SE_M_NIGHTMARE, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromWormholeSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x10
+ delay 16
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 53, -19, 1, 2 @ target down and left (instantaneously (last arg))
- delay 0x2
+ delay 2
loadspritegfx ANIM_TAG_METEOR @superpower
visible ANIM_TARGET
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 80, -1024, ANIM_TARGET, 0 @ spin up target
call MenacingMoonrazeMaelstromRingsInward
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, ANIM_TARGET, 0x0, 0x30 @ target back to origin (slowly)
call MenacingMoonrazeMaelstromRingsInward
- delay 0xD
+ delay 13
invisible ANIM_TARGET
createsprite gMoonrazeMaelstromBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gMoonrazeMaelstromWhiteRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x6
+ delay 6
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 0x4, 0x4 @lunge forward
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
- delay 0x2
+ delay 2
invisible ANIM_ATTACKER
createsprite gMoonrazeMaelstromSuperpowerSpriteTemplate, ANIM_TARGET, 3, 0x0 @superpower
createsprite gMoonrazeMaelstromBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
playsewithpan SE_M_BRICK_BREAK, SOUND_PAN_ATTACKER
fadetobg BG_COSMIC
waitbgfadeout
@@ -34481,7 +37393,7 @@ MenacingMoonrazeMaelstromFinish:
invisible ANIM_TARGET
waitbgfadein
visible ANIM_ATTACKER
- delay 0x2
+ delay 2
visible ANIM_TARGET
waitforvisualfinish
loadspritegfx ANIM_TAG_POISON_BUBBLE @poison bubble
@@ -34503,7 +37415,7 @@ MenacingMoonrazeMaelstromFinish:
call MenacingMoonrazeMaelstromBeam
call MenacingMoonrazeMaelstromBeam
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 60, 1
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, F_PAL_TARGET, 0x4, 0x0, 0xc, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, F_PAL_TARGET, 4, 0, 12, RGB_BLACK
call MenacingMoonrazeMaelstromBeam
call MenacingMoonrazeMaelstromBeam
call MenacingMoonrazeMaelstromBeam
@@ -34538,7 +37450,7 @@ MenacingMoonrazeMaelstromFinish:
createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 76, 1
call MenacingMoonrazeMaelstromExplosion
call MenacingMoonrazeMaelstromExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x0, 0x10, 0x7fff
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 0, 16, RGB_WHITE
call MenacingMoonrazeMaelstromExplosion
waitforvisualfinish
call ResetFromWhiteScreen
@@ -34546,67 +37458,67 @@ MenacingMoonrazeMaelstromFinish:
MenacingMoonrazeMaelstromExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gMoonrazeMaelstromExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
MenacingMoonrazeMaelstromFlare:
createsprite gMoonrazeMaelstromBlackSparklesSpriteTemplate, ANIM_ATTACKER, 2, 0xfff1, 0x0, 0x0, 0x0, 0x20, 0x3c
createsprite gMoonrazeMaelstromBlueBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gMoonrazeMaelstromBlueBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gMoonrazeMaelstromBlackSparklesSpriteTemplate, ANIM_ATTACKER, 2, 0xc, 0xfffb, 0x0, 0x0, 0x20, 0x3c
createsprite gMoonrazeMaelstromBlackBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gMoonrazeMaelstromBlackBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gMoonrazeMaelstromBlackBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
MenacingMoonrazeMaelstromRingsInward:
createsprite gMoonrazeMaelstromBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gMoonrazeMaelstromWhiteRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
createsprite gMoonrazeMaelstromBlueRingSpriteTemplate, ANIM_ATTACKER, 40, 0x0, 0x0, ANIM_TARGET, 0x0
- delay 0x8
+ delay 8
return
MenacingMoonrazeMaelstromChargeUp:
createsprite gMoonrazeMaelstromPurpleBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x210, 0x1e, 0xd, 0x32, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x20, 0x1e0, 0x14, 0x10, 0xffd2, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromPurpleBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x200, 0x19, 0x10, 0x2e, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x1d0, 0x1e, 0xf, 0xffce, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromPurpleBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x21, 0x240, 0x14, 0x8, 0x2a, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromBlackOrbsSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1f, 0x190, 0x19, 0xb, 0xffd6, ANIM_ATTACKER
- delay 0x2
+ delay 2
createsprite gMoonrazeMaelstromPurpleBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
MenacingMoonrazeMaelstromBeam:
createsprite gMoonrazeMaelstromBeamSpriteTemplate, ANIM_TARGET, 2
createsprite gMoonrazeMaelstromBeamSpriteTemplate, ANIM_TARGET, 2
- delay 0x1
+ delay 1
return
@@ -34620,20 +37532,20 @@ gBattleAnimMove_LightThatBurnsTheSky::
loadspritegfx ANIM_TAG_FOCUS_ENERGY
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call EndureEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB(31, 31, 22)
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call EndureEffect
- delay 0x8
+ delay 8
call EndureEffect
- delay 0x8
+ delay 8
unloadspritegfx ANIM_TAG_FOCUS_ENERGY
monbg ANIM_ATTACKER
setalpha 12, 8
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ADJACENT), 0x2, 0x0, 0xF, 0x0000
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ADJACENT), 2, 0, 15, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_ElectricChargingParticles, 2, ANIM_ATTACKER, 60, 2, 12 @ charge particles to attacker
- delay 0x1e
+ delay 30
loopsewithpan SE_M_CHARGE, SOUND_PAN_ATTACKER, 0xe, 0xa
createsprite gSuperpowerOrbSpriteTemplate, ANIM_TARGET, 3, 0x0
call LightThatBurnsTheSkyGreenSparks
@@ -34645,8 +37557,8 @@ gBattleAnimMove_LightThatBurnsTheSky::
call LightThatBurnsTheSkyGreenSparks
call LightThatBurnsTheSkyGreenSparks
call LightThatBurnsTheSkyGreenSparks
- delay 0xe
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x2, 0x0, 0x4, 0x0000
+ delay 14
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 2, 0, 4, RGB_BLACK
clearmonbg ANIM_ATTACKER
blendoff
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
@@ -34654,17 +37566,17 @@ gBattleAnimMove_LightThatBurnsTheSky::
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffe0, 0xfff0, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0x1
+ delay 1
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0x20, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffd0, 0xffe4, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0x1
+ delay 1
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0x20, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0x60, 0x8, 0x1, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0xa0, 0x8, 0x0, 0x3
createsprite gSparkElectricityFlashingSpriteTemplate, ANIM_ATTACKER, 2, 0xffc0, 0xffd8, 0x25, 0x2c, 0xe0, 0x8, 0x2, 0x3
- delay 0x6
+ delay 6
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 3, 60
unloadspritegfx ANIM_TAG_LEAF @green
unloadspritegfx ANIM_TAG_ELECTRIC_ORBS @charge
@@ -34673,19 +37585,19 @@ gBattleAnimMove_LightThatBurnsTheSky::
loadspritegfx ANIM_TAG_STRAIGHT_BEAM
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
monbg ANIM_TARGET
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x6, 0x0, 0x10, 0x43FF @;Light yellow
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 6, 0, 16, RGB(31, 31, 16) @;Light yellow
call PhotonGeyserBeam
call LightThatBurnsTheSkyGeyser
call LightThatBurnsTheSkyBlast_1
call LightThatBurnsTheSkyGeyser
call LightThatBurnsTheSkyBlast_2
call LightThatBurnsTheSkyGeyser
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x4, 0x0, 0x10, 0x43FF
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 4, 0, 16, RGB(31, 31, 16)
call LightThatBurnsTheSkyBlast_3
clearmonbg ANIM_TARGET
waitforvisualfinish
- delay 0x10
- createvisualtask AnimTask_BlendBattleAnimPal, 0x2, (F_PAL_BG | F_PAL_BATTLERS_2), 0x0, 0x10, 0x0, 0x43FF
+ delay 16
+ createvisualtask AnimTask_BlendBattleAnimPal, 2, (F_PAL_BG | F_PAL_BATTLERS_2), 0, 16, 0, RGB(31, 31, 16)
restorebg
waitbgfadeout
end
@@ -34722,38 +37634,38 @@ LightThatBurnsTheSkyBlast_3:
LightThatBurnsTheSkyGeyser:
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0x0005, 0x1, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xfff1, 0x1, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xfffb, 0x1, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0012, 0x1, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0x0005, 0x1, 0x0
playsewithpan SE_M_SELF_DESTRUCT, SOUND_PAN_TARGET
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xfff5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffe1, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffeb, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0x0002, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xfff5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0003, 0xffe5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfff5, 0xffd1, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0008, 0xffdb, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0xfffa, 0xfff2, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
createsprite gLightThatBurnsTheSkyExplosionSpriteTemplate, ANIM_TARGET, 4, 0x0000, 0xffe5, ANIM_TARGET, 0x0
- delay 0x0
+ delay 0
return
LightThatBurnsTheSkyGreenSparks:
createsprite gLightThatBurnsTheSkyGreenSparkSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x30, 0x2c, 0x0, 0x28, 0x0, 0x3
@@ -34764,7 +37676,7 @@ LightThatBurnsTheSkyGreenSparks:
createsprite gLightThatBurnsTheSkyGreenSparkSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x15, 0x2c, 0x40, 0x28, 0x1, 0x3
createsprite gLightThatBurnsTheSkyGreenSparkSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x15, 0x2c, 0x80, 0x28, 0x0, 0x3
createsprite gLightThatBurnsTheSkyGreenSparkSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, 0x15, 0x2c, 0x0, 0x28, 0x2, 0x3
- delay 0x10
+ delay 16
return
@@ -34786,7 +37698,7 @@ gBattleAnimMove_SoulStealing7StarStrike::
createsprite gSoulStealBlastburnSpriteTemplate, ANIM_ATTACKER, 66, 0x14, 0xa, 0x18, 0x0, 0x0, 0x0
createsprite gSoulStealBlastburnSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x10, 0x18, 0x0, 0x0, 0x0
createsprite gSoulStealBlastburnSpriteTemplate, ANIM_ATTACKER, 2, 0xffec, 0xa, 0x18, 0x0, 0x0, 0x0
- delay 0x5
+ delay 5
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gSoulStealBlackFlySpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x0, 0xd, 0x150
waitforvisualfinish
@@ -34797,58 +37709,58 @@ gBattleAnimMove_SoulStealing7StarStrike::
loadspritegfx ANIM_TAG_FOCUS_ENERGY @focus energy
playsewithpan SE_M_DRAGON_RAGE, SOUND_PAN_ATTACKER
call SoulStealingSevenStarStrikeBuffEffect
- delay 0x8
+ delay 8
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_ATTACKER, 2, 2, 0, 11, RGB_BLACK
createvisualtask AnimTask_ShakeMon2, 2, ANIM_ATTACKER, 1, 0, 32, 1
call SoulStealingSevenStarStrikeBuffEffect
- delay 0x8
+ delay 8
call SoulStealingSevenStarStrikeBuffEffect
- delay 0x4
+ delay 4
visible ANIM_TARGET
waitforvisualfinish
unloadspritegfx ANIM_TAG_FIRE_PLUME
loadspritegfx ANIM_TAG_PAIN_SPLIT @pain split
createvisualtask AnimTask_ShakeMon, 5, ANIM_TARGET, 0, 4, 37, 1
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x14, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0x0, ANIM_TARGET, 0x2, 0x0, 0x0, 0x30
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x10, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0x0, ANIM_TARGET, 0x12, 0x0, 0x0, 0x2c
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
- delay 0x4
+ delay 4
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x08, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0xffeb, 0xfff8, 0x2, 0x0, 0x0, 0x28
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x12, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0xfffb, 0xfff4, 0x2, 0x0, 0x0, 0x24
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x15, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0x5, 0xfff8, 0x2, 0x0, 0x0, 0x20
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x0c, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0xfff0, 0x1, 0x2, 0x0, 0x0, 0x1c
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x13, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x1, 0x2, 0x0, 0x0, 0x18
playsewithpan SE_M_JUMP_KICK, SOUND_PAN_TARGET
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x0e, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0xfff0, 0x10, 0x2, 0x0, 0x0, 0x14
createsprite gSoulStealBlueFistSpriteTemplate, ANIM_TARGET, 2, 0xffc0, 0x12, 0x0, 0x0, 0xa, 0x1, 0x0, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealBlueStarSpriteTemplate, ANIM_TARGET, 4, 0x0, 0x10, 0x2, 0x0, 0x0, 0x10
- delay 0x4
+ delay 4
playsewithpan SE_M_FLY, SOUND_PAN_ATTACKER
createsprite gSoulStealBlackFlySpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0xd, 0x150
- delay 0x20
+ delay 32
unloadspritegfx ANIM_TAG_PAIN_SPLIT
unloadspritegfx ANIM_TAG_ROUND_SHADOW
unloadspritegfx ANIM_TAG_HANDS_AND_FEET
@@ -34857,9 +37769,9 @@ gBattleAnimMove_SoulStealing7StarStrike::
playsewithpan SE_M_DOUBLE_TEAM, SOUND_PAN_ATTACKER
setarg 0x7 0x0 @;Clear arg 7 so task works properly in Link battles
createvisualtask AnimTask_SnatchOpposingMonMove, 0x2
- delay 0x1c
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_TARGET, 0x0, 0x0, 0x10, 0x0000
- delay 0x1
+ delay 28
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 0, 0, 16, RGB_BLACK
+ delay 1
createsprite gSoulStealZStarSpriteTemplate, ANIM_TARGET, 2, 0x0, 0x0, 0x1, 0x24
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
createsprite gWillOWispFireSpriteTemplate, ANIM_TARGET, 2, 0x0
@@ -34873,72 +37785,71 @@ gBattleAnimMove_SoulStealing7StarStrike::
call SoulStealingSevenStarStrikeBlueParalysis
waitforvisualfinish
visible ANIM_ATTACKER
- unloadspritegfx ANIM_TAG_ROUND_SHADOW
loadspritegfx ANIM_TAG_SPARKLE_4 @ detect
loadspritegfx ANIM_TAG_EXPLOSION @ explosion
playsewithpan SE_M_DETECT, SOUND_PAN_ATTACKER
createsprite gTargetTwinkleSpriteTemplate, ANIM_TARGET, 13, 0x0, 0x0, ANIM_TARGET @detect star
- delay 0xa
+ delay 10
createvisualtask AnimTask_HorizontalShake, 5, ANIM_TARGET, 8, 32
call SoulStealingSevenStarStrikeExplosion
call SoulStealingSevenStarStrikeExplosion
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 0x2, 0x0, 0x10, 0x0 @everything to black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_ALL_BUT_DEF), 2, 0, 16, RGB_BLACK @everything to black
call SoulStealingSevenStarStrikeExplosion
waitforvisualfinish
blendoff
restorebg
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, (F_PAL_BG | F_PAL_BATTLERS_2), 0x2, 0x10, 0x0, 0x0 @everything from black
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, (F_PAL_BG | F_PAL_BATTLERS_2), 2, 16, 0, RGB_BLACK @everything from black
waitforvisualfinish
- createvisualtask AnimTask_BlendBattleAnimPal, 0xa, F_PAL_BATTLERS_2, 0x2, 0x0, 0x0, 0x0
+ createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_BATTLERS_2, 2, 0, 0, RGB_BLACK
waitforvisualfinish
createvisualtask AnimTask_AllBattlersVisible, 0xA
waitforvisualfinish
end
SoulStealingSevenStarStrikeBuffEffect:
createsprite gSoulStealIceBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xffe8, 0x1a, 0x2
- delay 0x4
+ delay 4
createsprite gSoulStealIceBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xe, 0x1c, 0x1
- delay 0x4
+ delay 4
createsprite gSoulStealIceBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfffb, 0xa, 0x2
- delay 0x4
+ delay 4
createsprite gSoulStealIceBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0x1c, 0x1a, 0x3
- delay 0x4
+ delay 4
createsprite gSoulStealIceBuffSpriteTemplate, ANIM_ATTACKER, 2, 0x0, 0xfff4, 0x0, 0x1
return
SoulStealingSevenStarStrikeBlueParalysis:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0x5, 0x0, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0xfffb, 0xa, 0x5, 0x1
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0xf, 0x14, 0x5, 0x2
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0xfff1, 0xfff6, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0x19, 0x0, 0x5, 0x1
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0xfff8, 0x8, 0x5, 0x2
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0x2, 0xfff8, 0x5, 0x0
- delay 0x2
+ delay 2
createsprite gSoulStealBlueParalyzeSpriteTemplate, ANIM_TARGET, 2, 0xffec, 0xf, 0x5, 0x1
return
SoulStealingSevenStarStrikeExplosion:
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x0, 0x0, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x18, 0xffe8, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0xfff0, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0xffe8, 0xfff4, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
playsewithpan SE_M_EXPLOSION, SOUND_PAN_ATTACKER
createsprite gSoulStealExplosionSpriteTemplate, ANIM_TARGET, 3, 0x10, 0x10, ANIM_TARGET, 0x1
- delay 0x6
+ delay 6
return
@@@@@@@@@@ MAX MOVES @@@@@@@@@@
@@ -35114,7 +38025,7 @@ gBattleAnimMove_GMaxGoldRush::
@@@ DYNAMAX AND MAX RAIDS
gBattleAnimGeneral_DynamaxGrowth:: @ PORTED FROM CFRU
- createvisualtask SoundTask_PlayCryWithEcho, 2, ANIM_ATTACKER, 2
+ createvisualtask SoundTask_PlayDynamaxCry, 0
delay 8
createvisualtask AnimTask_DynamaxGrowth, 0x5, 0x1, 0x0
waitforvisualfinish
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index 2b9f5e36e447..6a3e29d17fc9 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -14,26 +14,15 @@
#include "constants/game_stat.h"
#include "constants/trainers.h"
#include "constants/species.h"
+#include "constants/generational_changes.h"
.include "asm/macros.inc"
.include "asm/macros/battle_script.inc"
.include "constants/constants.inc"
.section script_data, "aw", %progbits
-BattleScript_DamageToQuarterTargetHP::
- attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- typecalc
- clearmoveresultflags MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
- damagetoquartertargethp
- goto BattleScript_HitFromAtkAnimation
-
BattleScript_EffectFickleBeam::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
ficklebeamdamagecalculation
goto BattleScript_HitFromCritCalc
@@ -75,17 +64,13 @@ BattleScript_LowerAtkSpAtk::
jumpifstat BS_EFFECT_BATTLER, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_LowerAtkSpAtkDoAnim
jumpifstat BS_EFFECT_BATTLER, CMP_EQUAL, STAT_SPATK, MIN_STAT_STAGE, BattleScript_LowerAtkSpAtkEnd
BattleScript_LowerAtkSpAtkDoAnim::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_EFFECT_BATTLER, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_LowerAtkSpAtkTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_LowerAtkSpAtkTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_LowerAtkSpAtkTrySpAtk, BIT_SPATK
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_LowerAtkSpAtkTrySpAtk::
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_LowerAtkSpAtkEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_LowerAtkSpAtkEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_LowerAtkSpAtkEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_LowerAtkSpAtkEnd:
@@ -94,35 +79,24 @@ BattleScript_LowerAtkSpAtkEnd:
BattleScript_EffectSpicyExtract::
attackcanceler
jumpifsubstituteblocks BattleScript_ButItFailed
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE BattleScript_SpicyExtract_CheckShouldSkipAttackAnim
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_SpicyExtract_CheckShouldSkipAttackAnim
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_SpicyExtract_CheckShouldSkipAttackAnim
goto BattleScript_ButItFailed
BattleScript_SpicyExtract_CheckShouldSkipAttackAnim:
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0, BattleScript_SpicyExtract_RaiseAtk
- attackstring
- ppreduce
- bicword gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT
goto BattleScript_SpicyExtract_SkipAttackAnim
BattleScript_SpicyExtract_RaiseAtk:
- attackstring
- ppreduce
attackanimation
waitanimation
BattleScript_SpicyExtract_SkipAttackAnim:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectSpicyExtractDefenseDown
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectSpicyExtractDefenseDown
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectSpicyExtractDefenseDown
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectSpicyExtractDefenseDown:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_DEF, 2, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectSpicyExtract_End
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_EffectSpicyExtract_End
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectSpicyExtract_End
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectSpicyExtract_End:
@@ -130,9 +104,7 @@ BattleScript_EffectSpicyExtract_End:
BattleScript_EffectTidyUp::
attackcanceler
- attackstring
pause B_WAIT_TIME_MED
- ppreduce
waitstate
saveattacker
savetarget
@@ -151,31 +123,27 @@ BattleScript_EffectTidyUpDoMoveAnimation::
restoretarget
goto BattleScript_EffectDragonDanceFromStatUp
-BattleScript_EffectUpperHand::
- attackcanceler
- tryupperhand BattleScript_FailedFromAtkString
- goto BattleScript_HitFromAccCheck
-
BattleScript_EffectShedTail::
attackcanceler
- attackstring
- ppreduce
waitstate
- jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
+ jumpifvolatile BS_ATTACKER, VOLATILE_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
setsubstitute
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteString
- orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
attackanimation
waitanimation
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_SHEDITSTAIL
waitmessage B_WAIT_TIME_LONG
moveendto MOVEEND_ATTACKER_VISIBLE
moveendfrom MOVEEND_TARGET_VISIBLE
- goto BattleScript_MoveSwitchOpenPartyScreen
+ call BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim
+ switchinanim BS_ATTACKER, FALSE, TRUE
+ waitstate
+ switchineffects BS_ATTACKER
+ end
BattleScript_EffectPsychicNoise::
printstring STRINGID_PKMNPREVENTEDFROMHEALING
@@ -184,68 +152,62 @@ BattleScript_EffectPsychicNoise::
BattleScript_EffectFilletAway::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_FilletAwayTryAttack
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_FilletAwayTryAttack
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ButItFailed
BattleScript_FilletAwayTryAttack::
halvehp BattleScript_ButItFailed
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK | BIT_SPEED, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayTrySpAtk, BIT_SPATK | BIT_SPEED
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_FilletAwayTrySpAtk::
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayTrySpeed, BIT_SPEED
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_FilletAwayTrySpeed::
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_FilletAwayEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_FilletAwayEnd::
clearmoveresultflags MOVE_RESULT_NO_EFFECT
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
goto BattleScript_MoveEnd
BattleScript_EffectDoodle::
attackcanceler
- attackstring
- ppreduce
trycopyability BS_ATTACKER, BattleScript_ButItFailed
+ saveattacker
attackanimation
waitanimation
setbyte gBattleCommunication, 0
goto BattleScript_EffectDoodle_AfterCopy
BattleScript_EffectDoodle_CopyAbility:
- trycopyability BS_ATTACKER, BattleScript_MoveEnd
+ trycopyability BS_ATTACKER, BattleScript_EffectDoodleMoveEnd
BattleScript_EffectDoodle_AfterCopy:
-.if B_ABILITY_POP_UP == TRUE
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
recordability BS_ATTACKER
printstring STRINGID_PKMNCOPIEDFOE
waitmessage B_WAIT_TIME_LONG
switchinabilities BS_ATTACKER
- jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0x0, BattleScript_MoveEnd
+ jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, 0x0, BattleScript_EffectDoodleMoveEnd
addbyte gBattleCommunication, 1
- jumpifnoally BS_ATTACKER, BattleScript_MoveEnd
+ jumpifnoally BS_ATTACKER, BattleScript_EffectDoodleMoveEnd
setallytonextattacker BattleScript_EffectDoodle_CopyAbility
+BattleScript_EffectDoodleMoveEnd:
+ restoreattacker
goto BattleScript_MoveEnd
BattleScript_EffectGlaiveRush::
call BattleScript_EffectHit_Ret
jumpifmoveresultflags MOVE_RESULT_DOESNT_AFFECT_FOE, BattleScript_TryFaintMon
- setglaiverush
+ setvolatile BS_ATTACKER, VOLATILE_GLAIVE_RUSH, 2
goto BattleScript_TryFaintMon
BattleScript_SyrupBombActivates::
@@ -257,7 +219,7 @@ BattleScript_SyrupBombEndTurn::
flushtextbox
playanimation BS_ATTACKER, B_ANIM_SYRUP_BOMB_SPEED_DROP
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_SyrupBombTurnDmgEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CHECK_PREVENTION | STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_SyrupBombTurnDmgEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_SyrupBombTurnDmgEnd:
@@ -267,7 +229,6 @@ BattleScript_EffectChillyReception::
printstring STRINGID_PKMNTELLCHILLINGRECEPTIONJOKE
waitmessage B_WAIT_TIME_LONG
attackcanceler
- ppreduce
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_SUN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalSun
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_RAIN_PRIMAL, BattleScript_EffectChillyReceptionBlockedByPrimalRain
jumpifhalfword CMP_COMMON_BITS, gBattleWeather, B_WEATHER_STRONG_WINDS, BattleScript_EffectChillyReceptionBlockedByStrongWinds
@@ -280,7 +241,6 @@ BattleScript_EffectChillyReception::
call BattleScript_MoveWeatherChangeRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionPlayAnimation:
- attackstring
attackanimation
waitanimation
return
@@ -297,8 +257,8 @@ BattleScript_EffectChillyReceptionBlockedByStrongWinds:
call BattleScript_MysteriousAirCurrentBlowsOnRet
goto BattleScript_MoveSwitch
BattleScript_EffectChillyReceptionTrySwitchWeatherFailed:
- jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_FailedFromAtkString
- jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_FailedFromAtkString
+ jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
+ jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
call BattleScript_EffectChillyReceptionPlayAnimation
return
@@ -326,11 +286,19 @@ BattleScript_MoveSwitch:
printstring STRINGID_PKMNWENTBACK
waitmessage B_WAIT_TIME_SHORT
BattleScript_MoveSwitchOpenPartyScreen::
+ call BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim
+ switchinanim BS_ATTACKER, FALSE, FALSE
+ waitstate
+ switchineffects BS_ATTACKER
+BattleScript_MoveSwitchEnd:
+ end
+
+BattleScript_MoveSwitchOpenPartyScreenReturnWithNoAnim:
openpartyscreen BS_ATTACKER, BattleScript_MoveSwitchEnd
- switchoutabilities BS_ATTACKER
waitstate
- switchhandleorder BS_ATTACKER, 2
returntoball BS_ATTACKER, FALSE
+ switchoutabilities BS_ATTACKER
+ switchhandleorder BS_ATTACKER, 2
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
@@ -338,18 +306,12 @@ BattleScript_MoveSwitchOpenPartyScreen::
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON
- switchinanim BS_ATTACKER, FALSE, TRUE
- waitstate
- switchineffects BS_ATTACKER
-BattleScript_MoveSwitchEnd:
- end
+ return
BattleScript_EffectPledge::
attackcanceler
setpledge BattleScript_HitFromAccCheck
- attackstring
pause B_WAIT_TIME_MED
- ppreduce
printstring STRINGID_WAITINGFORPARTNERSMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -420,23 +382,17 @@ BattleScript_MoveEffectSaltCure::
BattleScript_SaltCureExtraDamage::
playanimation BS_ATTACKER, B_ANIM_SALT_CURE_DAMAGE, NULL
waitanimation
- call BattleScript_HurtTarget_NoString
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_TARGETISHURTBYSALTCURE
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_HP_THRESHOLD
end2
-BattleScript_HurtTarget_NoString:
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- return
-
BattleScript_EffectCorrosiveGas::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifsubstituteblocks BattleScript_CorrosiveGasFail
jumpifcantloseitem BS_TARGET, BattleScript_CorrosiveGasFail
attackanimation
@@ -457,8 +413,6 @@ BattleScript_CorrosiveGasFail:
BattleScript_EffectTakeHeart::
attackcanceler
- attackstring
- ppreduce
curestatuswithmove BattleScript_CalmMindTryToRaiseStats
attackanimation
waitanimation
@@ -471,8 +425,6 @@ BattleScript_EffectTakeHeart::
BattleScript_EffectRevivalBlessing::
attackcanceler
- attackstring
- ppreduce
tryrevivalblessing BattleScript_ButItFailed
attackanimation
waitanimation
@@ -505,19 +457,13 @@ BattleScript_SpikesActivates::
BattleScript_EffectAttackUpUserAlly::
jumpifnoally BS_ATTACKER, BattleScript_EffectAttackUp
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_EffectAttackUpUserAlly_Works
jumpifstat BS_ATTACKER_PARTNER, CMP_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_ButItFailed
BattleScript_EffectAttackUpUserAlly_Works:
attackanimation
waitanimation
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAttackUpUserAlly_TryAlly
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectAttackUpUserAllyUser_PrintString
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-BattleScript_EffectAttackUpUserAllyUser_PrintString:
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAttackUpUserAlly_TryAlly
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectAttackUpUserAlly_TryAlly:
@@ -527,15 +473,13 @@ BattleScript_EffectAttackUpUserAlly_End:
BattleScript_EffectAttackUpUserAlly_TryAlly_:
jumpifblockedbysoundproof BS_ATTACKER_PARTNER, BattleScript_EffectAttackUpUserAlly_TryAllyBlocked
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAttackUpUserAlly_End
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectAttackUpUserAlly_AllyAnim
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAttackUpUserAlly_End
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectAttackUpUserAlly_AllyString
pause B_WAIT_TIME_SHORTEST
printstring STRINGID_TARGETSTATWONTGOHIGHER
waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectAttackUpUserAlly_End
-BattleScript_EffectAttackUpUserAlly_AllyAnim:
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+BattleScript_EffectAttackUpUserAlly_AllyString:
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_EffectAttackUpUserAlly_End
@@ -549,8 +493,6 @@ BattleScript_EffectAttackUpUserAlly_TryAllyBlocked:
BattleScript_EffectTeatime::
attackcanceler
- attackstring
- ppreduce
jumpifteanoberry BattleScript_ButItFailed
@ at least one battler is affected
attackanimation
@@ -561,10 +503,8 @@ BattleScript_TeatimeLoop:
jumpifelectricabilityaffected BS_TARGET, ABILITY_VOLT_ABSORB, BattleScript_Teatimesorb
jumpifelectricabilityaffected BS_TARGET, ABILITY_MOTOR_DRIVE, BattleScript_Teatimemotor
jumpifteainvulnerable BS_TARGET, BattleScript_Teatimevul @ in semi-invulnerable state OR held item is not a Berry
- orword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries
consumeberry BS_TARGET, TRUE @ consume the berry, then restore the item from changedItems
- bicword gHitMarker, HITMARKER_DISABLE_ANIMATION | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
setbyte sBERRY_OVERRIDE, FALSE
removeitem BS_TARGET
moveendto MOVEEND_NEXT_TARGET
@@ -578,9 +518,9 @@ BattleScript_Teatimevul:
goto BattleScript_MoveEnd
BattleScript_Teatimesorb:
call BattleScript_AbilityPopUpTarget
- tryhealquarterhealth BS_TARGET BattleScript_Teatimesorb_end
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ tryhealquarterhealth BS_TARGET, BattleScript_Teatimesorb_end
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
BattleScript_Teatimesorb_end:
@@ -590,9 +530,8 @@ BattleScript_Teatimesorb_end:
goto BattleScript_MoveEnd
BattleScript_Teatimerod:
call BattleScript_AbilityPopUpTarget
- playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -602,9 +541,8 @@ BattleScript_Teatimerod:
goto BattleScript_MoveEnd
BattleScript_Teatimemotor:
call BattleScript_AbilityPopUpTarget
- playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_BY_TWO
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TeatimeBuffer
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_TeatimeBuffer
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -651,7 +589,7 @@ BattleScript_AffectionBasedStatus_HealFrostbiteString:
printstring STRINGID_ATTACKERHEALEDITSFROSTBITE
BattleScript_AffectionBasedStatusHeal_Continue:
waitmessage B_WAIT_TIME_LONG
- clearstatus BS_ATTACKER
+ clearstatus
waitstate
updatestatusicon BS_ATTACKER
waitstate
@@ -667,17 +605,13 @@ BattleScript_ShellTrapSetUp::
BattleScript_EffectShellTrap::
attackcanceler
jumpifshelltrap BS_ATTACKER, BattleScript_HitFromAccCheck
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_MoveEnd
- ppreduce
printstring STRINGID_SHELLTRAPDIDNTWORK
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectCourtChange::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
swapsidestatuses
attackanimation
waitanimation
@@ -686,7 +620,6 @@ BattleScript_EffectCourtChange::
goto BattleScript_MoveEnd
BattleScript_BeakBlastSetUp::
- setbeakblast
flushtextbox
playanimation BS_ATTACKER, B_ANIM_BEAK_BLAST_SETUP, NULL
printstring STRINGID_HEATUPBEAK
@@ -701,13 +634,11 @@ BattleScript_BeakBlastBurn::
BattleScript_EffectSkyDrop::
attackcanceler
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_SkyDropTurn2
- ppreduce
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
+ jumpifvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS, BattleScript_SkyDropTurn2
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifsubstituteblocks BattleScript_ButItFailed
jumpiftargetally BattleScript_ButItFailed
- jumpifunder200 BS_TARGET, BattleScript_SkyDropWork
+ jumpifunder200 BattleScript_SkyDropWork
pause B_WAIT_TIME_SHORT
printstring STRINGID_TARGETTOOHEAVY
waitmessage B_WAIT_TIME_LONG
@@ -719,7 +650,6 @@ BattleScript_SkyDropWork:
goto BattleScript_MoveEnd
BattleScript_SkyDropTurn2:
call BattleScript_TwoTurnMovesSecondTurnRet
- attackstring
clearskydrop BattleScript_SkyDropChangedTarget
jumpiftype BS_TARGET, TYPE_FLYING, BattleScript_SkyDropFlyingType
goto BattleScript_HitFromCritCalc
@@ -728,8 +658,8 @@ BattleScript_SkyDropFlyingType:
printstring STRINGID_ITDOESNTAFFECT
waitmessage B_WAIT_TIME_LONG
makevisible BS_ATTACKER
- jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_SkyDropFlyingAlreadyConfused
- jumpifstatus2 BS_TARGET, STATUS2_LOCK_CONFUSE, BattleScript_SkyDropFlyingConfuseLock
+ jumpifvolatile BS_TARGET, VOLATILE_CONFUSION, BattleScript_SkyDropFlyingAlreadyConfused
+ jumpifvolatile BS_TARGET, VOLATILE_LOCK_CONFUSE, BattleScript_SkyDropFlyingConfuseLock
goto BattleScript_MoveEnd
BattleScript_SkyDropChangedTarget:
pause B_WAIT_TIME_SHORT
@@ -740,23 +670,20 @@ BattleScript_SkyDropChangedTarget:
goto BattleScript_MoveEnd
BattleScript_SkyDropFlyingConfuseLock:
- seteffectprimary MOVE_EFFECT_CONFUSION
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_CONFUSION
BattleScript_SkyDropFlyingAlreadyConfused:
- clearstatusfromeffect BS_TARGET, MOVE_EFFECT_THRASH
- jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_MoveEnd
+ clearvolatile BS_TARGET, VOLATILE_LOCK_CONFUSE
+ jumpifvolatile BS_TARGET, VOLATILE_CONFUSION, BattleScript_MoveEnd
setbyte BS_ATTACKER, BS_TARGET
goto BattleScript_ThrashConfuses
BattleScript_EffectFling::
attackcanceler
- jumpifcantfling BS_ATTACKER, BattleScript_FailedFromAtkString
setlastuseditem BS_ATTACKER
accuracycheck BattleScript_FlingMissed, ACC_CURR_MOVE
- attackstring
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNFLUNG
waitmessage B_WAIT_TIME_SHORT
- ppreduce
critcalc
damagecalc
adjustdamage
@@ -766,31 +693,25 @@ BattleScript_EffectFling::
effectivenesssound
hitanimation BS_TARGET
waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
+ datahpupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
critmessage
waitmessage B_WAIT_TIME_MED
resultmessage
waitmessage B_WAIT_TIME_MED
jumpiflastuseditemberry BattleScript_EffectFlingConsumeBerry
- jumpifability BS_TARGET, ABILITY_SHIELD_DUST, BattleScript_FlingBlockedByShieldDust
- jumpiflastuseditemholdeffect HOLD_EFFECT_FLAME_ORB, 0, BattleScript_FlingFlameOrb
- jumpiflastuseditemholdeffect HOLD_EFFECT_FLINCH, 0, BattleScript_FlingFlinch
- jumpiflastuseditemholdeffect HOLD_EFFECT_LIGHT_BALL, 0, BattleScript_FlingLightBall
- jumpiflastuseditemholdeffect HOLD_EFFECT_MENTAL_HERB, 0, BattleScript_FlingMentalHerb
- jumpiflastuseditemholdeffect HOLD_EFFECT_TYPE_POWER, TYPE_POISON, BattleScript_FlingPoisonBarb
- jumpiflastuseditemholdeffect HOLD_EFFECT_TOXIC_ORB, 0, BattleScript_FlingToxicOrb
- jumpiflastuseditemholdeffect HOLD_EFFECT_WHITE_HERB, 0, BattleScript_FlingWhiteHerb
+ tryflingholdeffect
goto BattleScript_FlingEnd
+
BattleScript_EffectFlingConsumeBerry:
- savebattleritem BS_TARGET
- battleritemtolastuseditem BS_TARGET
+ savebattleritem
+ battleritemtolastuseditem
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
orword gHitMarker, HITMARKER_DISABLE_ANIMATION
- consumeberry BS_TARGET, TRUE
+ consumeberry BS_TARGET, FALSE
bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
setbyte sBERRY_OVERRIDE, 0
- restorebattleritem BS_TARGET
+ restorebattleritem
BattleScript_FlingEnd:
tryfaintmon BS_TARGET
trysymbiosis BS_ATTACKER
@@ -798,77 +719,32 @@ BattleScript_FlingEnd:
BattleScript_FlingFailConsumeItem::
removeitem BS_ATTACKER
- goto BattleScript_FailedFromAtkString
+ goto BattleScript_ButItFailed
BattleScript_FlingBlockedByShieldDust::
printstring STRINGID_ITEMWASUSEDUP
waitmessage B_WAIT_TIME_LONG
goto BattleScript_FlingEnd
-BattleScript_FlingFlameOrb:
- seteffectsecondary MOVE_EFFECT_BURN
- goto BattleScript_FlingEnd
-BattleScript_FlingFlinch:
- seteffectsecondary MOVE_EFFECT_FLINCH
- goto BattleScript_FlingEnd
-BattleScript_FlingLightBall:
- seteffectsecondary MOVE_EFFECT_PARALYSIS
- goto BattleScript_FlingEnd
-BattleScript_FlingMentalHerb:
- curecertainstatuses BS_TARGET
- savetarget
- copybyte gBattlerAttacker, gBattlerTarget
- playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL
- printfromtable gMentalHerbCureStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_ATTACKER
- restoretarget
- goto BattleScript_FlingEnd
-BattleScript_FlingPoisonBarb:
- seteffectsecondary MOVE_EFFECT_POISON
- goto BattleScript_FlingEnd
-BattleScript_FlingToxicOrb:
- seteffectsecondary MOVE_EFFECT_TOXIC
- goto BattleScript_FlingEnd
-BattleScript_FlingWhiteHerb:
- tryresetnegativestatstages BS_TARGET
- swapattackerwithtarget
- printstring STRINGID_PKMNSTATUSNORMAL
- waitmessage B_WAIT_TIME_MED
- swapattackerwithtarget
- goto BattleScript_FlingEnd
-
BattleScript_FlingMissed:
removeitem BS_ATTACKER
- attackstring
- ppreduce
goto BattleScript_MoveMissedPause
-BattleScript_EffectAuraWheel:: @ Aura Wheel can only be used by Morpeko
- jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_FULL_BELLY, BattleScript_EffectHit
- jumpifspecies BS_ATTACKER, SPECIES_MORPEKO_HANGRY, BattleScript_EffectHit
- goto BattleScript_PokemonCantUseTheMove
-
BattleScript_EffectClangorousSoul::
attackcanceler
- attackstring
- ppreduce
- cutonethirdhpraisestats BattleScript_ButItFailed
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_BIDE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
+ cutonethirdhpandraisestats BattleScript_ButItFailed
attackanimation
waitanimation
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
call BattleScript_AllStatsUp
goto BattleScript_MoveEnd
BattleScript_EffectOctolock::
attackcanceler
- jumpifsubstituteblocks BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- trysetoctolock BS_TARGET, BattleScript_ButItFailed
+ jumpifsubstituteblocks BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ trysetoctolock BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_CANTESCAPEBECAUSEOFCURRENTMOVE
@@ -876,14 +752,13 @@ BattleScript_EffectOctolock::
goto BattleScript_MoveEnd
BattleScript_OctolockEndTurn::
- playstatchangeanimation BS_TARGET, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctolockTryLowerSpDef
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctolockTryLowerSpDef, BIT_SPDEF
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_OctolockTryLowerSpDef:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctlockTurnDmgEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_OctlockTurnDmgEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_OctlockTurnDmgEnd:
@@ -891,27 +766,21 @@ BattleScript_OctlockTurnDmgEnd:
BattleScript_EffectPoltergeist::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- checkpoltergeist BS_TARGET, BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ setpoltergeistmessage BattleScript_ButItFailed
printstring STRINGID_ABOUTTOUSEPOLTERGEIST
waitmessage B_WAIT_TIME_LONG
goto BattleScript_HitFromCritCalc
BattleScript_EffectTarShot::
attackcanceler
- jumpifsubstituteblocks BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- cantarshotwork BattleScript_FailedFromAtkString
- attackstring
- ppreduce
+ jumpifsubstituteblocks BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ cantarshotwork BattleScript_ButItFailed
setstatchanger STAT_SPEED, 1, TRUE
attackanimation
waitanimation
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TryTarShot
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TryTarShot
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TryTarShot:
@@ -922,15 +791,14 @@ BattleScript_TryTarShot:
BattleScript_EffectNoRetreat::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- trynoretreat BS_TARGET, BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ jumpifvolatile BS_TARGET, VOLATILE_NO_RETREAT, BattleScript_ButItFailed
+ setvolatile BS_TARGET, VOLATILE_NO_RETREAT
attackanimation
waitanimation
call BattleScript_AllStatsUp
- jumpifstatus2 BS_TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_MoveEnd
- seteffectprimary MOVE_EFFECT_PREVENT_ESCAPE | MOVE_EFFECT_AFFECTS_USER
+ jumpifvolatile BS_TARGET, VOLATILE_ESCAPE_PREVENTION, BattleScript_MoveEnd
+ seteffectprimary BS_TARGET, BS_TARGET, MOVE_EFFECT_PREVENT_ESCAPE
printstring STRINGID_CANTESCAPEDUETOUSEDMOVE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -941,8 +809,8 @@ BattleScript_BothCanNoLongerEscape::
return
BattleScript_EffectHyperspaceFury::
- jumpifspecies BS_ATTACKER, SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
- jumpifspecies BS_ATTACKER, SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
+ jumpifspecies SPECIES_HOOPA_UNBOUND, BattleScript_EffectHit
+ jumpifspecies SPECIES_HOOPA_CONFINED, BattleScript_ButHoopaCantUseIt
goto BattleScript_PokemonCantUseTheMove
BattleScript_ButHoopaCantUseIt:
@@ -982,9 +850,6 @@ BattleScript_MoveEffectLightScreen::
BattleScript_EffectStuffCheeks::
attackcanceler
- attackstring
- ppreduce
- jumpifnotberry BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
setbyte sBERRY_OVERRIDE, 1
@@ -994,10 +859,7 @@ BattleScript_EffectStuffCheeks::
setbyte sBERRY_OVERRIDE, 0
removeitem BS_ATTACKER
setstatchanger STAT_DEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StuffCheeksEnd
- setgraphicalstatchangevalues
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StuffCheeksEnd @ cant raise def
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_StuffCheeksEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_StuffCheeksEnd:
@@ -1005,25 +867,21 @@ BattleScript_StuffCheeksEnd:
BattleScript_EffectDecorate::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, 12, BattleScript_DecorateBoost
- jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPATK, 12, BattleScript_DecorateBoost
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_DecorateBoost
+ jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_DecorateBoost
goto BattleScript_ButItFailed
BattleScript_DecorateBoost:
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0x0
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_DecorateBoostSpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_DecorateBoostSpAtk, BIT_SPATK
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_DecorateBoostSpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DecorateBoostSpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1031,8 +889,6 @@ BattleScript_DecorateBoostSpAtk:
BattleScript_EffectCoaching::
attackcanceler
- attackstring
- ppreduce
jumpifnoally BS_ATTACKER, BattleScript_ButItFailed
copybyte gBattlerTarget, gBattlerAttacker
setallytonexttarget EffectCoaching_CheckAllyStats
@@ -1045,16 +901,14 @@ EffectCoaching_CheckAllyStats:
BattleScript_CoachingWorks:
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, 0x0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_CoachingBoostDef
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_CoachingBoostDef, BIT_DEF
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_CoachingBoostDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoachingBoostDef:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoveEnd
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_MoveEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1062,9 +916,7 @@ BattleScript_CoachingBoostDef:
BattleScript_EffectJungleHealing::
attackcanceler
- attackstring
- ppreduce
- jumpifteamhealthy BS_ATTACKER, BattleScript_ButItFailed
+ jumpifteamhealthy BattleScript_ButItFailed
attackanimation
waitanimation
copybyte gBattlerTarget, gBattlerAttacker
@@ -1072,13 +924,11 @@ BattleScript_EffectJungleHealing::
JungleHealing_RestoreTargetHealth:
copybyte gBattlerAttacker, gBattlerTarget
tryhealquarterhealth BS_TARGET, BattleScript_JungleHealing_TryCureStatus
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
BattleScript_JungleHealing_TryCureStatus:
- jumpifmove MOVE_LIFE_DEW, BattleScript_JungleHealingTryRestoreAlly @ life dew only heals
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_JungleHealingCureStatus
goto BattleScript_JungleHealingTryRestoreAlly
BattleScript_JungleHealingCureStatus:
@@ -1093,18 +943,39 @@ BattleScript_JungleHealingTryRestoreAlly:
setallytonexttarget JungleHealing_RestoreTargetHealth
goto BattleScript_MoveEnd
-BattleScript_EffectRelicSong::
- call BattleScript_EffectHit_Ret
- tryfaintmon BS_TARGET
- moveendall
- tryrelicsong
- end
+BattleScript_EffectLifeDew::
+ attackcanceler
+ jumpiffullhp BS_ATTACKER, BattleScript_EffectLifeDewCheckPartner
+ copybyte gBattlerTarget, gBattlerAttacker
+ attackanimation
+ waitanimation
+ call BattleScript_EffectLifeDewHealing
+ jumpifabsent BS_ATTACKER_PARTNER, BattleScript_EffectLifeDewEnd
+ jumpiffullhp BS_ATTACKER_PARTNER, BattleScript_EffectLifeDewEnd
+ setallytonexttarget BattleScript_EffectLifeDewNextTarget
+BattleScript_EffectLifeDewNextTarget:
+ call BattleScript_EffectLifeDewHealing
+BattleScript_EffectLifeDewEnd:
+ goto BattleScript_MoveEnd
+
+BattleScript_EffectLifeDewCheckPartner:
+ jumpifabsent BS_ATTACKER_PARTNER, BattleScript_ButItFailed
+ jumpiffullhp BS_ATTACKER_PARTNER, BattleScript_ButItFailed
+ attackanimation
+ waitanimation
+ setallytonexttarget BattleScript_EffectLifeDewNextTarget
+
+BattleScript_EffectLifeDewHealing:
+ tryhealquarterhealth BS_TARGET, BattleScript_EffectLifeDewEnd
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
+ printstring STRINGID_PKMNREGAINEDHEALTH
+ waitmessage B_WAIT_TIME_LONG
+ return
BattleScript_EffectAllySwitch::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryallyswitch BattleScript_ButItFailed
attackanimation
waitanimation
@@ -1116,9 +987,7 @@ BattleScript_EffectAllySwitch::
BattleScript_EffectFairyLock::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
trysetfairylock BattleScript_ButItFailed
attackanimation
waitanimation
@@ -1126,14 +995,6 @@ BattleScript_EffectFairyLock::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_FailIfNotArgType::
- attackcanceler
- attackstring
- ppreduce
- jumpifnotcurrentmoveargtype BS_ATTACKER, BattleScript_ButItFailed
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- goto BattleScript_HitFromCritCalc
-
BattleScript_RemoveFireType::
printstring STRINGID_ATTACKERLOSTFIRETYPE
waitmessage B_WAIT_TIME_LONG
@@ -1156,8 +1017,6 @@ BattleScript_DefDown_Ret:
BattleScript_EffectPurify::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifstatus BS_TARGET, STATUS1_ANY, BattleScript_PurifyWorks
goto BattleScript_ButItFailed
@@ -1168,45 +1027,41 @@ BattleScript_PurifyWorks:
updatestatusicon BS_TARGET
printstring STRINGID_ATTACKERCUREDTARGETSTATUS
waitmessage B_WAIT_TIME_LONG
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_ATTACKER
+ tryhealhalfhealth BS_ATTACKER, BattleScript_AlreadyAtFullHp
goto BattleScript_RestoreHp
BattleScript_EffectStrengthSap::
setstatchanger STAT_ATK, 1, TRUE
attackcanceler
- jumpifsubstituteblocks BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ jumpifsubstituteblocks BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, MIN_STAT_STAGE, BattleScript_StrengthSapTryLower
pause B_WAIT_TIME_SHORT
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
+ setmoveresultflags MOVE_RESULT_MISSED @ TODO: Is this even necessary?
goto BattleScript_MoveEnd
BattleScript_StrengthSapTryLower:
- getstatvalue BS_TARGET, STAT_ATK
+ getstatvalue STAT_ATK
jumpiffullhp BS_ATTACKER, BattleScript_StrengthSapMustLower
+BattleScript_StrengthSapAnimation:
attackanimation
waitanimation
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StrengthSapHp
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StrengthSapHp
-BattleScript_StrengthSapLower:
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_StrengthSapHp
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_StrengthSapHp
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@ Drain HP without lowering a stat
BattleScript_StrengthSapHp:
jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_StrengthSapManipulateDmg
- jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveEnd
+ jumpifvolatile BS_ATTACKER, VOLATILE_HEAL_BLOCK, BattleScript_MoveEnd
jumpiffullhp BS_ATTACKER, BattleScript_MoveEnd
BattleScript_StrengthSapManipulateDmg:
manipulatedamage DMG_BIG_ROOT
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
jumpifability BS_TARGET, ABILITY_LIQUID_OOZE, BattleScript_StrengthSapLiquidOoze
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNENERGYDRAINED
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -1214,18 +1069,16 @@ BattleScript_StrengthSapLiquidOoze:
call BattleScript_AbilityPopUpTarget
manipulatedamage DMG_CHANGE_SIGN
setbyte cMULTISTRING_CHOOSER, B_MSG_ABSORB_OOZE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printfromtable gAbsorbDrainStringIds
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_StrengthSapMustLower:
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_MoveEnd
- attackanimation
- waitanimation
- goto BattleScript_StrengthSapLower
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_MoveEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_MoveEnd
+ goto BattleScript_StrengthSapAnimation
BattleScript_MoveEffectIncinerate::
printstring STRINGID_INCINERATEBURN
@@ -1257,9 +1110,7 @@ BattleScript_CoreEnforcerRet:
BattleScript_EffectLaserFocus::
attackcanceler
- attackstring
- ppreduce
- setuserstatus3 STATUS3_LASER_FOCUS, BattleScript_ButItFailed
+ trysetvolatile BS_ATTACKER, VOLATILE_LASER_FOCUS, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_LASERFOCUS
@@ -1271,23 +1122,21 @@ BattleScript_VCreateStatLoss::
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_VCreateStatAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MIN_STAT_STAGE, BattleScript_VCreateStatLossRet
BattleScript_VCreateStatAnim:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_VCreateTrySpDef, BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VCreateTrySpDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VCreateTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_VCreateTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VCreateTrySpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VCreateTrySpeed:
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, BattleScript_VCreateStatLossRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VCreateStatLossRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_VCreateStatLossRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VCreateStatLossRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VCreateStatLossRet:
@@ -1295,22 +1144,19 @@ BattleScript_VCreateStatLossRet:
BattleScript_SpectralThiefSteal::
setbyte sB_ANIM_TURN, 1
- playmoveanimation BS_ATTACKER, MOVE_SPECTRAL_THIEF
+ playmoveanimation MOVE_SPECTRAL_THIEF
waitanimation
setbyte sB_ANIM_TURN, 0
printstring STRINGID_SPECTRALTHIEFSTEAL
waitmessage B_WAIT_TIME_LONG
setbyte sB_ANIM_ARG2, 0
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
spectralthiefprintstats
flushtextbox
goto BattleScript_EffectSpectralThiefFromDamage
BattleScript_EffectSpectralThief::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
tryspectralthiefsteal BattleScript_SpectralThiefSteal
BattleScript_EffectSpectralThiefFromDamage:
@@ -1324,25 +1170,19 @@ BattleScript_EffectSpectralThiefFromDamage:
BattleScript_EffectPartingShot::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_EffectPartingShotTryAtk
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
BattleScript_EffectPartingShotTryAtk:
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotTrySpAtk, BIT_SPATK
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectPartingShotTrySpAtk:
- playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectPartingShotSwitch
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectPartingShotSwitch:
@@ -1351,11 +1191,9 @@ BattleScript_EffectPartingShotSwitch:
BattleScript_EffectPowder::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
- attackstring
- ppreduce
- jumpifstatus2 BS_TARGET, STATUS2_POWDER, BattleScript_ButItFailed
- setpowder BS_TARGET
+ accuracycheck BattleScript_MoveMissedPause, NO_ACC_CALC_CHECK_LOCK_ON
+ jumpifvolatile BS_TARGET, VOLATILE_POWDER, BattleScript_ButItFailed
+ setvolatile BS_TARGET, VOLATILE_POWDER
attackanimation
waitanimation
printstring STRINGID_COVEREDINPOWDER
@@ -1364,33 +1202,28 @@ BattleScript_EffectPowder::
BattleScript_EffectAromaticMist::
attackcanceler
- attackstring
- ppreduce
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_ButItFailed
jumpiftargetally BattleScript_EffectAromaticMistWorks
goto BattleScript_ButItFailed
BattleScript_EffectAromaticMistWorks:
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AromaticMistAnim
- pause B_WAIT_TIME_SHORTEST
- printstring STRINGID_TARGETSTATWONTGOHIGHER
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_EffectAromaticMistEnd
-BattleScript_AromaticMistAnim:
+ statbuffchange BS_TARGET, STAT_CHANGE_ONLY_CHECKING, BattleScript_EffectAromaticMistWontGoHigher
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectAromaticMistEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectAromaticMistEnd:
goto BattleScript_MoveEnd
+BattleScript_EffectAromaticMistWontGoHigher:
+ pause B_WAIT_TIME_SHORTEST
+ printstring STRINGID_TARGETSTATWONTGOHIGHER
+ waitmessage B_WAIT_TIME_LONG
+ setmoveresultflags MOVE_RESULT_MISSED @ TODO: Is this even necessary?
+ goto BattleScript_EffectAromaticMistEnd
BattleScript_EffectMagneticFlux::
attackcanceler
- attackstring
- ppreduce
setbyte gBattleCommunication, 0
BattleScript_EffectMagneticFluxStart:
jumpifability BS_TARGET, ABILITY_MINUS, BattleScript_EffectMagneticFluxCheckStats
@@ -1404,18 +1237,16 @@ BattleScript_EffectMagneticFluxTryDef:
attackanimation
waitanimation
BattleScript_EffectMagneticFluxSkipAnim:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxTrySpDef
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxTrySpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectMagneticFluxTrySpDef
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMagneticFluxTrySpDef:
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectMagneticFluxLoop
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMagneticFluxLoop
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectMagneticFluxLoop
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1428,8 +1259,6 @@ BattleScript_EffectMagneticFluxEnd:
BattleScript_EffectGearUp::
attackcanceler
- attackstring
- ppreduce
setbyte gBattleCommunication, 0
BattleScript_EffectGearUpStart:
jumpifability BS_TARGET, ABILITY_MINUS, BattleScript_EffectGearUpCheckStats
@@ -1443,18 +1272,16 @@ BattleScript_EffectGearUpTryAtk:
attackanimation
waitanimation
BattleScript_EffectGearUpSkipAnim:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpTrySpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpTrySpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectGearUpTrySpAtk
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectGearUpTrySpAtk:
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpLoop
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectGearUpLoop
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectGearUpLoop
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectGearUpLoop
addbyte gBattleCommunication, 1
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1468,16 +1295,12 @@ BattleScript_EffectGearUpEnd:
BattleScript_EffectAcupressure::
attackcanceler
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_EffectAcupressureTry
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_PrintMoveMissed
+ jumpifvolatile BS_TARGET, VOLATILE_SUBSTITUTE, BattleScript_MoveMissedPause
BattleScript_EffectAcupressureTry:
- attackstring
- ppreduce
- tryaccupressure BS_TARGET, BattleScript_ButItFailed
+ tryacupressure BattleScript_ButItFailed
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- statbuffchange MOVE_EFFECT_CERTAIN, BattleScript_MoveEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_CERTAIN, BattleScript_MoveEnd
printstring STRINGID_DEFENDERSSTATROSE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -1489,10 +1312,8 @@ BattleScript_MoveEffectFeint::
BattleScript_EffectThirdType::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- trysetthirdtype BS_TARGET, BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ trythirdtype BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_THIRDTYPEADDED
@@ -1501,32 +1322,32 @@ BattleScript_EffectThirdType::
BattleScript_EffectFlowerShield::
attackcanceler
- attackstring
- ppreduce
savetarget
selectfirstvalidtarget
-BattleScript_FlowerShieldIsAnyGrass:
+BattleScript_FlowerShieldIsAnyValidTarget:
+ jumpifvolatile BS_TARGET, VOLATILE_SEMI_INVULNERABLE, BattleScript_FlowerShieldCheckNextTarget
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_FlowerShieldLoopStart
- jumpifnexttargetvalid BattleScript_FlowerShieldIsAnyGrass
+BattleScript_FlowerShieldCheckNextTarget:
+ jumpifnexttargetvalid BattleScript_FlowerShieldIsAnyValidTarget
goto BattleScript_RestoreTargetButItFailed
BattleScript_FlowerShieldLoopStart:
selectfirstvalidtarget
BattleScript_FlowerShieldLoop:
movevaluescleanup
+ jumpifvolatile BS_TARGET, VOLATILE_SEMI_INVULNERABLE, BattleScript_FlowerShieldMoveTargetEnd
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_FlowerShieldLoop2
goto BattleScript_FlowerShieldMoveTargetEnd
BattleScript_FlowerShieldLoop2:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlowerShieldDoAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_FlowerShieldMoveTargetEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_FlowerShieldMoveTargetEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_FlowerShieldDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_FlowerShieldMoveTargetEnd
pause 21
goto BattleScript_FlowerShieldString
BattleScript_FlowerShieldDoAnim:
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_FlowerShieldMoveTargetEnd
BattleScript_FlowerShieldString:
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -1534,12 +1355,11 @@ BattleScript_FlowerShieldMoveTargetEnd:
moveendto MOVEEND_NEXT_TARGET
jumpifnexttargetvalid BattleScript_FlowerShieldLoop
restoretarget
+ moveendfrom MOVEEND_ITEM_EFFECTS_ATTACKER_1
end
BattleScript_EffectRototiller::
attackcanceler
- attackstring
- ppreduce
getrototillertargets BattleScript_ButItFailed
@ at least one battler is affected
attackanimation
@@ -1551,18 +1371,16 @@ BattleScript_RototillerLoop:
jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_RototillerCheckAffected
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_RototillerCantRaiseMultipleStats
BattleScript_RototillerCheckAffected:
- jumpifnotrototilleraffected BS_TARGET, BattleScript_RototillerNoEffect
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, 0
+ jumpifnotrototilleraffected BattleScript_RototillerNoEffect
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerTrySpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerTrySpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_RototillerTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RototillerTrySpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RototillerMoveTargetEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_RototillerMoveTargetEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_RototillerMoveTargetEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RototillerMoveTargetEnd:
@@ -1586,23 +1404,20 @@ BattleScript_RototillerNoEffect:
BattleScript_EffectBestow::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, NO_ACC_CALC_CHECK_LOCK_ON
jumpifsubstituteblocks BattleScript_ButItFailed
trybestow BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_BESTOWITEMGIVING
waitmessage B_WAIT_TIME_LONG
+ tryactivateitem BS_TARGET, ACTIVATION_ON_USABLE_AGAIN
trysymbiosis BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectAfterYou::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryafteryou BattleScript_ButItFailed
attackanimation
waitanimation
@@ -1611,25 +1426,17 @@ BattleScript_EffectAfterYou::
goto BattleScript_MoveEnd
BattleScript_MoveEffectFlameBurst::
- tryfaintmon BS_TARGET
- copybyte sBATTLER, sSAVED_BATTLER
printstring STRINGID_BURSTINGFLAMESHIT
waitmessage B_WAIT_TIME_LONG
- savetarget
- copybyte gBattlerTarget, sSAVED_BATTLER
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- tryfaintmon BS_TARGET
- restoretarget
- goto BattleScript_MoveEnd
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ tryfaintmon BS_SCRIPTING
+ return
BattleScript_EffectPowerTrick::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- powertrick BS_ATTACKER
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ powertrick
attackanimation
waitanimation
printstring STRINGID_PKMNSWITCHEDATKANDDEF
@@ -1638,9 +1445,7 @@ BattleScript_EffectPowerTrick::
BattleScript_EffectPsychoShift::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifstatus BS_ATTACKER, STATUS1_ANY, BattleScript_EffectPsychoShiftCanWork
goto BattleScript_ButItFailed
BattleScript_EffectPsychoShiftCanWork:
@@ -1662,43 +1467,19 @@ BattleScript_EffectPsychoShiftCanWork:
BattleScript_EffectSynchronoise::
attackcanceler
- attackstring
- ppreduce
- selectfirstvalidtarget
-BattleScript_SynchronoiseLoop:
- movevaluescleanup
- jumpifcantusesynchronoise BattleScript_SynchronoiseNoEffect
- accuracycheck BattleScript_SynchronoiseMissed, ACC_CURR_MOVE
- critcalc
- damagecalc
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
+ pause B_WAIT_TIME_MED
+ trysynchronoise BattleScript_MoveEnd
+ accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
+ goto BattleScript_HitFromCritCalc
+
+BattleScript_ItDoesntAffectFoe::
+ savetarget
+ copybyte gBattlerTarget, sBATTLER
+ printstring STRINGID_ITDOESNTAFFECT
+ waitmessage B_WAIT_TIME_SHORT
flushtextbox
- tryfaintmon BS_TARGET
-BattleScript_SynchronoiseMoveTargetEnd:
- moveendto MOVEEND_NEXT_TARGET
- jumpifnexttargetvalid BattleScript_SynchronoiseLoop
- end
-BattleScript_SynchronoiseMissed:
- pause B_WAIT_TIME_SHORT
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_SynchronoiseMoveTargetEnd
-BattleScript_SynchronoiseNoEffect:
- pause B_WAIT_TIME_SHORT
- printstring STRINGID_NOEFFECTONTARGET
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_SynchronoiseMoveTargetEnd
+ restoretarget
+ return
BattleScript_MoveEffectSmackDown::
printstring STRINGID_FELLSTRAIGHTDOWN
@@ -1712,28 +1493,33 @@ BattleScript_EffectHitEnemyHealAlly::
BattleScript_EffectDefog::
setstatchanger STAT_EVASION, 1, TRUE
attackcanceler
+ jumpifgenconfiglowerthan CONFIG_DEFOG_EFFECT_CLEARING, GEN_5, BattleScript_DefogAfterSubstituteCheck
jumpifsubstituteblocks BattleScript_DefogIfCanClearHazards
+BattleScript_DefogAfterSubstituteCheck:
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_EVASION, MIN_STAT_STAGE, BattleScript_DefogWorks
BattleScript_DefogIfCanClearHazards:
- trydefog FALSE, BattleScript_FailedFromAtkString
+ trydefog FALSE, BattleScript_ButItFailed
BattleScript_DefogWorks:
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_DefogTryHazardsWithAnim
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefogDoAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_DefogTryHazardsWithAnim
- pause B_WAIT_TIME_SHORT
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ jumpifgenconfiglowerthan CONFIG_DEFOG_EFFECT_CLEARING, GEN_5, BattleScript_DefogWorksAfterSubstituteCheck
+ jumpifsubstituteblocks BattleScript_DefogTryHazardsWithAnim
+BattleScript_DefogWorksAfterSubstituteCheck:
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_DefogTryHazardsWithAnim
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DefogDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_DefogTryHazardsWithAnim
+ pause B_WAIT_TIME_SHORT
+ setmoveresultflags MOVE_RESULT_MISSED @ TODO: Is this even necessary?
goto BattleScript_DefogPrintString
BattleScript_DefogDoAnim::
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ call BattleScript_SwapFromSubstitute
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_DefogTryHazards
+ call BattleScript_SwapToSubstitute
BattleScript_DefogPrintString::
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
-BattleScript_DefogTryHazards::
+BattleScript_DefogTryHazards:
copybyte gEffectBattler, gBattlerAttacker
trydefog TRUE, NULL
copybyte gBattlerAttacker, gEffectBattler
@@ -1743,23 +1529,15 @@ BattleScript_DefogTryHazardsWithAnim:
waitanimation
goto BattleScript_DefogTryHazards
-BattleScript_EffectCopycat::
- attackcanceler
- attackstring
- pause 5
- trycopycat BattleScript_CopycatFail
- attackanimation
- waitanimation
- jumptocalledmove TRUE
-BattleScript_CopycatFail:
- ppreduce
- goto BattleScript_ButItFailed
+BattleScript_MoveEffectDefog::
+ saveattacker
+ trydefog TRUE, NULL
+ restoreattacker
+ return
BattleScript_EffectInstruct::
attackcanceler
- attackstring
- ppreduce
- pause 5
+ pause B_WAIT_TIME_SHORT
tryinstruct BattleScript_ButItFailed
attackanimation
waitanimation
@@ -1772,54 +1550,30 @@ BattleScript_EffectInstruct::
BattleScript_EffectAutotomize::
setstatchanger STAT_SPEED, 2, FALSE
attackcanceler
- attackstring
- ppreduce
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AutotomizeAttackAnim
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_AutotomizeWeightLoss
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AutotomizeAttackAnim
pause B_WAIT_TIME_SHORT
goto BattleScript_AutotomizePrintString
BattleScript_AutotomizeAttackAnim::
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AutotomizeWeightLoss
BattleScript_AutotomizePrintString::
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AutotomizeWeightLoss::
jumpifmovehadnoeffect BattleScript_MoveEnd
- tryautotomize BS_ATTACKER, BattleScript_MoveEnd
+ tryautotomize BattleScript_MoveEnd
printstring STRINGID_BECAMENIMBLE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectFinalGambit::
- attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- critcalc
- typecalc
- clearmoveresultflags MOVE_RESULT_SUPER_EFFECTIVE | MOVE_RESULT_NOT_VERY_EFFECTIVE
- dmgtocurrattackerhp
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- setadditionaleffects
- tryfaintmon BS_TARGET
- jumpifmovehadnoeffect BattleScript_MoveEnd
+BattleScript_FinalGambit::
setatkhptozero
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
- goto BattleScript_MoveEnd
+ return
BattleScript_TryHitSwitchTarget::
forcerandomswitch BattleScript_HitSwitchTargetForceRandomSwitchFailed
@@ -1835,34 +1589,28 @@ BattleScript_HitSwitchTargetForceRandomSwitchFailed:
BattleScript_EffectToxicThread::
setstatchanger STAT_SPEED, 1, TRUE
attackcanceler
- jumpifsubstituteblocks BattleScript_FailedFromAtkString
- jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_SPEED, MIN_STAT_STAGE, BattleScript_ToxicThreadWorks
- jumpifstatus BS_TARGET, STATUS1_PSN_ANY, BattleScript_FailedFromAtkString
-BattleScript_ToxicThreadWorks:
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_ToxicThreadDoAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_ToxicThreadTryPsn
+ jumpifsubstituteblocks BattleScript_ButItFailed
+ checknonvolatiletrigger MOVE_EFFECT_POISON, BattleScript_EffectStatDownFromAccCheck
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ attackanimation
+ waitanimation
+ setstatchanger STAT_SPEED, 1, TRUE
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_ToxicThreadTryPsn
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ToxicThreadDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_ToxicThreadTryPsn
pause B_WAIT_TIME_SHORT
goto BattleScript_ToxicThreadPrintString
BattleScript_ToxicThreadDoAnim::
- attackanimation
- waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_ToxicThreadTryPsn
BattleScript_ToxicThreadPrintString::
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ToxicThreadTryPsn::
- seteffectprimary MOVE_EFFECT_POISON
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_POISON
goto BattleScript_MoveEnd
BattleScript_EffectVenomDrench::
attackcanceler
- attackstring
- ppreduce
jumpifstatus BS_TARGET, STATUS1_PSN_ANY, BattleScript_EffectVenomDrenchCanBeUsed
goto BattleScript_ButItFailed
BattleScript_EffectVenomDrenchCanBeUsed:
@@ -1873,26 +1621,21 @@ BattleScript_VenomDrenchDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK | BIT_SPEED, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpAtk, BIT_SPATK | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VenomDrenchTryLowerSpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VenomDrenchTryLowerSpAtk::
- playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchTryLowerSpeed
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchTryLowerSpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VenomDrenchTryLowerSpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VenomDrenchTryLowerSpeed::
- playstatchangeanimation BS_TARGET, BIT_SPEED, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_VenomDrenchEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_VenomDrenchEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VenomDrenchEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VenomDrenchEnd::
@@ -1900,27 +1643,21 @@ BattleScript_VenomDrenchEnd::
BattleScript_EffectNobleRoar::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_NobleRoarDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPATK, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
BattleScript_NobleRoarDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarTryLowerSpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarTryLowerSpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_NobleRoarTryLowerSpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_NobleRoarTryLowerSpAtk::
- playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_NobleRoarEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_NobleRoarEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_NobleRoarEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_NobleRoarEnd::
@@ -1928,8 +1665,6 @@ BattleScript_NobleRoarEnd::
BattleScript_EffectShellSmash::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ShellSmashTryDef
@@ -1938,80 +1673,64 @@ BattleScript_EffectShellSmash::
BattleScript_ShellSmashTryDef::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_CERTAIN, BattleScript_ShellSmashTrySpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShellSmashTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpDef:
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_ShellSmashTryAttack
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTryAttack
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_CERTAIN, BattleScript_ShellSmashTryAttack
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShellSmashTryAttack
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTryAttack:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_ATK | BIT_SPEED, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpAtk, BIT_SPATK | BIT_SPEED,
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShellSmashTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShellSmashTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashTrySpeed:
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShellSmashEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ShellSmashEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShellSmashEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShellSmashEnd:
goto BattleScript_MoveEnd
-BattleScript_EffectLastResort::
- attackcanceler
- attackstring
- ppreduce
- jumpifcantuselastresort BS_ATTACKER, BattleScript_ButItFailed
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- goto BattleScript_HitFromCritCalc
-
BattleScript_EffectGrowth::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_GrowthDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_GrowthDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0
- jumpifweatheraffected BS_ATTACKER, B_WEATHER_SUN, BattleScript_GrowthAtk2
+ jumpifweatheraffected B_WEATHER_SUN, BattleScript_GrowthAtk2
setstatchanger STAT_ATK, 1, FALSE
goto BattleScript_GrowthAtk
BattleScript_GrowthAtk2:
setstatchanger STAT_ATK, 2, FALSE
BattleScript_GrowthAtk:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthTrySpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_GrowthTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GrowthTrySpAtk::
- jumpifweatheraffected BS_ATTACKER, B_WEATHER_SUN, BattleScript_GrowthSpAtk2
+ jumpifweatheraffected B_WEATHER_SUN, BattleScript_GrowthSpAtk2
setstatchanger STAT_SPATK, 1, FALSE
goto BattleScript_GrowthSpAtk
BattleScript_GrowthSpAtk2:
setstatchanger STAT_SPATK, 2, FALSE
BattleScript_GrowthSpAtk:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GrowthEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_GrowthEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_GrowthEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GrowthEnd:
@@ -2019,9 +1738,7 @@ BattleScript_GrowthEnd:
BattleScript_EffectSoak::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifability BS_TARGET, ABILITY_MULTITYPE, BattleScript_ButItFailed
jumpifability BS_TARGET, ABILITY_RKS_SYSTEM, BattleScript_ButItFailed
jumpifsubstituteblocks BattleScript_ButItFailed
@@ -2034,9 +1751,7 @@ BattleScript_EffectSoak::
BattleScript_EffectReflectType::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryreflecttype BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2046,9 +1761,7 @@ BattleScript_EffectReflectType::
BattleScript_EffectElectrify::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryelectrify BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2058,30 +1771,25 @@ BattleScript_EffectElectrify::
BattleScript_EffectShiftGear::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ShiftGearDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_ShiftGearDoMoveAnim:
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, 10, BattleScript_ShiftGearSpeedBy1
- playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, STAT_CHANGE_BY_TWO
setstatchanger STAT_SPEED, 2, FALSE
goto BattleScript_ShiftGearDoSpeed
BattleScript_ShiftGearSpeedBy1:
- playstatchangeanimation BS_ATTACKER, BIT_SPEED | BIT_ATK, 0
setstatchanger STAT_SPEED, 1, FALSE
BattleScript_ShiftGearDoSpeed:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearTryAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearTryAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearTryAtk, BIT_ATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShiftGearTryAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShiftGearTryAtk:
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_ShiftGearEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ShiftGearEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_ShiftGearEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ShiftGearEnd:
@@ -2089,31 +1797,27 @@ BattleScript_ShiftGearEnd:
BattleScript_EffectCoil::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_CoilDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CoilDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ACC, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_CoilDoMoveAnim:
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_ACC, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryDef, BIT_DEF | BIT_ACC
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CoilTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoilTryDef:
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryAcc
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilTryAcc
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CoilTryAcc, BIT_ACC
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CoilTryAcc
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoilTryAcc:
setstatchanger STAT_ACC, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CoilEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CoilEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CoilEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CoilEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CoilEnd:
@@ -2121,31 +1825,27 @@ BattleScript_CoilEnd:
BattleScript_EffectQuiverDance::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_QuiverDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_QuiverDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_QuiverDanceDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpDef, BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_QuiverDanceTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_QuiverDanceTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_QuiverDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_QuiverDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_QuiverDanceEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_QuiverDanceEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_QuiverDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_QuiverDanceEnd::
@@ -2153,64 +1853,48 @@ BattleScript_QuiverDanceEnd::
BattleScript_EffectVictoryDance::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_VictoryDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_VictoryDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_VictoryDanceDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceTryDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VictoryDanceTryDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceTryDef, BIT_DEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VictoryDanceTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VictoryDanceTryDef::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VictoryDanceTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VictoryDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VictoryDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_VictoryDanceEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_VictoryDanceEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_VictoryDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_VictoryDanceEnd::
goto BattleScript_MoveEnd
-BattleScript_EffectMeFirst::
- attackcanceler
- attackstring
- trymefirst BattleScript_FailedFromPpReduce
- attackanimation
- waitanimation
- jumptocalledmove TRUE
-
BattleScript_EffectAttackSpAttackUp::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AttackSpAttackUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_AttackSpAttackUpDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPATK, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpTrySpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AttackSpAttackUpTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackSpAttackUpTrySpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackSpAttackUpEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AttackSpAttackUpEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AttackSpAttackUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackSpAttackUpEnd:
@@ -2218,24 +1902,20 @@ BattleScript_AttackSpAttackUpEnd:
BattleScript_EffectAttackAccUp::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AttackAccUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ACC, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_AttackAccUpDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_ACC, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpTryAcc
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpTryAcc
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpTryAcc, BIT_ACC
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AttackAccUpTryAcc
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackAccUpTryAcc::
setstatchanger STAT_ACC, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_AttackAccUpEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AttackAccUpEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AttackAccUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackAccUpEnd:
@@ -2246,9 +1926,7 @@ BattleScript_EffectGrassyTerrain::
BattleScript_EffectElectricTerrain::
BattleScript_EffectPsychicTerrain::
attackcanceler
- attackstring
- ppreduce
- setremoveterrain BattleScript_ButItFailed
+ setterrain BattleScript_ButItFailed
attackanimation
waitanimation
printfromtable gTerrainStringIds
@@ -2259,8 +1937,6 @@ BattleScript_EffectPsychicTerrain::
BattleScript_EffectTopsyTurvy::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_ATK, 6, BattleScript_EffectTopsyTurvyWorks
jumpifstat BS_TARGET, CMP_NOT_EQUAL, STAT_DEF, 6, BattleScript_EffectTopsyTurvyWorks
@@ -2272,16 +1948,14 @@ BattleScript_EffectTopsyTurvy::
BattleScript_EffectTopsyTurvyWorks:
attackanimation
waitanimation
- invertstatstages BS_TARGET
+ invertstatstages
printstring STRINGID_TOPSYTURVYSWITCHEDSTATS
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectIonDeluge::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
orword gFieldStatuses, STATUS_FIELD_ION_DELUGE
attackanimation
waitanimation
@@ -2291,9 +1965,7 @@ BattleScript_EffectIonDeluge::
BattleScript_EffectQuash::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryquash BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2303,66 +1975,37 @@ BattleScript_EffectQuash::
BattleScript_EffectHealPulse::
attackcanceler
- attackstring
- ppreduce
- jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents @ stops pollen puff
- jumpifstatus3 BS_TARGET, STATUS3_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
+ jumpifvolatile BS_ATTACKER, VOLATILE_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents @ stops pollen puff
+ jumpifvolatile BS_TARGET, VOLATILE_HEAL_BLOCK, BattleScript_MoveUsedHealBlockPrevents
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifsubstituteblocks BattleScript_ButItFailed
tryhealpulse BattleScript_AlreadyAtFullHp
attackanimation
waitanimation
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectEntrainment::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
tryentrainment BattleScript_ButItFailed
attackanimation
waitanimation
- setlastusedability BS_TARGET
+ switchinabilities BS_TARGET
printstring STRINGID_PKMNACQUIREDABILITY
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
-
-BattleScript_EffectSimpleBeam::
- attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- setabilitysimple BS_TARGET, BattleScript_ButItFailed
- attackanimation
- waitanimation
-.if B_ABILITY_POP_UP == TRUE
- copybyte gBattlerAbility, gBattlerTarget
- call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
- recordability BS_TARGET
- printstring STRINGID_PKMNACQUIREDSIMPLE
- waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
flushtextbox
- tryendneutralizinggas BS_TARGET
+ tryendneutralizinggas
goto BattleScript_MoveEnd
-BattleScript_EffectSuckerPunch::
- attackcanceler
- suckerpunchcheck BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- goto BattleScript_HitFromAtkString
-
BattleScript_EffectLuckyChant::
attackcanceler
- attackstring
- ppreduce
- setluckychant BS_ATTACKER, BattleScript_ButItFailed
+ setluckychant BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_SHIELDEDFROMCRITICALHITS
@@ -2371,10 +2014,8 @@ BattleScript_EffectLuckyChant::
BattleScript_EffectMetalBurst::
attackcanceler
- metalburstdamagecalculator BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ metalburstdamagecalculator BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
clearmoveresultflags MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
adjustdamage
@@ -2382,16 +2023,18 @@ BattleScript_EffectMetalBurst::
BattleScript_EffectHealingWish::
attackcanceler
- jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_FailedFromAtkString
- attackstring
- ppreduce
+ jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
- instanthpdrop BS_ATTACKER
+ instanthpdrop
setatkhptozero
tryfaintmon BS_ATTACKER
storehealingwish BS_ATTACKER
-.if B_HEALING_WISH_SWITCH <= GEN_4
+ jumpifgenconfiglowerthan CONFIG_HEALING_WISH_SWITCH, GEN_5, BattleScript_EffectHealingWishGen4
+BattleScript_EffectHealingWishEnd:
+ moveendall
+ end
+BattleScript_EffectHealingWishGen4:
openpartyscreen BS_ATTACKER, BattleScript_EffectHealingWishEnd
waitstate
switchhandleorder BS_ATTACKER, 2
@@ -2400,22 +2043,22 @@ BattleScript_EffectHealingWish::
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
trytoclearprimalweather
+ tryrevertweatherform
+ flushtextbox
+ tryendneutralizinggas
flushtextbox
printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, FALSE, TRUE
waitstate
switchineffects BS_ATTACKER
-.endif
-BattleScript_EffectHealingWishEnd:
- moveendall
- end
+ goto BattleScript_EffectHealingWishEnd
BattleScript_HealingWishActivates::
setbyte cMULTISTRING_CHOOSER, 0
goto BattleScript_EffectHealingWishRestore
BattleScript_LunarDanceActivates::
setbyte cMULTISTRING_CHOOSER, 1
- restorepp BS_ATTACKER
+ restoremovepp
BattleScript_EffectHealingWishRestore:
printfromtable gHealingWishStringIds
waitmessage B_WAIT_TIME_LONG
@@ -2423,9 +2066,9 @@ BattleScript_EffectHealingWishRestore:
waitanimation
dmgtomaxattackerhp
manipulatedamage DMG_CHANGE_SIGN
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
- clearstatus BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ clearstatus
waitstate
updatestatusicon BS_ATTACKER
waitstate
@@ -2433,31 +2076,25 @@ BattleScript_EffectHealingWishRestore:
waitmessage B_WAIT_TIME_LONG
return
-BattleScript_EffectWorrySeed::
+BattleScript_EffectOverwriteAbility::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- tryworryseed BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ tryoverwriteability BattleScript_ButItFailed
attackanimation
waitanimation
-.if B_ABILITY_POP_UP == TRUE
copybyte gBattlerAbility, gBattlerTarget
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
recordability BS_TARGET
printstring STRINGID_PKMNACQUIREDABILITY
waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
tryrevertweatherform
flushtextbox
- tryendneutralizinggas BS_TARGET
+ tryendneutralizinggas
goto BattleScript_MoveEnd
BattleScript_EffectPowerSplit::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
averagestats STAT_ATK
averagestats STAT_SPATK
@@ -2469,8 +2106,6 @@ BattleScript_EffectPowerSplit::
BattleScript_EffectGuardSplit::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
averagestats STAT_DEF
averagestats STAT_SPDEF
@@ -2482,8 +2117,6 @@ BattleScript_EffectGuardSplit::
BattleScript_EffectHeartSwap::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_ATK
swapstatstages STAT_DEF
@@ -2500,8 +2133,6 @@ BattleScript_EffectHeartSwap::
BattleScript_EffectPowerSwap::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_ATK
swapstatstages STAT_SPATK
@@ -2513,8 +2144,6 @@ BattleScript_EffectPowerSwap::
BattleScript_EffectGuardSwap::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstatstages STAT_DEF
swapstatstages STAT_SPDEF
@@ -2526,8 +2155,6 @@ BattleScript_EffectGuardSwap::
BattleScript_EffectSpeedSwap::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
swapstats STAT_SPEED
attackanimation
@@ -2538,9 +2165,7 @@ BattleScript_EffectSpeedSwap::
BattleScript_EffectTelekinesis::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, NO_ACC_CALC_CHECK_LOCK_ON
settelekinesis BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2550,8 +2175,6 @@ BattleScript_EffectTelekinesis::
BattleScript_EffectStealthRock::
attackcanceler
- attackstring
- ppreduce
setstealthrock BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2561,8 +2184,6 @@ BattleScript_EffectStealthRock::
BattleScript_EffectStickyWeb::
attackcanceler
- attackstring
- ppreduce
setstickyweb BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2572,9 +2193,8 @@ BattleScript_EffectStickyWeb::
BattleScript_EffectGastroAcid::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ jumpifvolatile BS_TARGET, VOLATILE_GASTRO_ACID, BattleScript_ButItFailed
setgastroacid BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2583,13 +2203,11 @@ BattleScript_EffectGastroAcid::
trytoclearprimalweather
tryrevertweatherform
flushtextbox
- tryendneutralizinggas BS_TARGET
+ tryendneutralizinggas
goto BattleScript_MoveEnd
BattleScript_EffectToxicSpikes::
attackcanceler
- attackstring
- ppreduce
settoxicspikes BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2599,9 +2217,9 @@ BattleScript_EffectToxicSpikes::
BattleScript_EffectMagnetRise::
attackcanceler
- attackstring
- ppreduce
- setuserstatus3 STATUS3_MAGNET_RISE, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_ROOT, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_SMACK_DOWN, BattleScript_ButItFailed
+ trysetvolatile BS_ATTACKER, VOLATILE_MAGNET_RISE, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNLEVITATEDONELECTROMAGNETISM
@@ -2610,8 +2228,6 @@ BattleScript_EffectMagnetRise::
BattleScript_EffectTrickRoom::
attackcanceler
- attackstring
- ppreduce
setroom
attackanimation
waitanimation
@@ -2636,8 +2252,6 @@ BattleScript_RoomServiceLoop_NextBattler:
BattleScript_EffectWonderRoom::
BattleScript_EffectMagicRoom::
attackcanceler
- attackstring
- ppreduce
setroom
attackanimation
waitanimation
@@ -2647,9 +2261,7 @@ BattleScript_EffectMagicRoom::
BattleScript_EffectAquaRing::
attackcanceler
- attackstring
- ppreduce
- setuserstatus3 STATUS3_AQUA_RING, BattleScript_ButItFailed
+ setvolatile BS_ATTACKER, VOLATILE_AQUA_RING
attackanimation
waitanimation
printstring STRINGID_PKMNSURROUNDEDWITHVEILOFWATER
@@ -2658,9 +2270,7 @@ BattleScript_EffectAquaRing::
BattleScript_EffectEmbargo::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
setembargo BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2670,8 +2280,6 @@ BattleScript_EffectEmbargo::
BattleScript_EffectTailwind::
attackcanceler
- attackstring
- ppreduce
settailwind BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2700,23 +2308,23 @@ BattleScript_TryTailwindAbilitiesLoop_WindRider:
BattleScript_TryTailwindAbilitiesLoop_WindPower:
call BattleScript_AbilityPopUp
- setcharge BS_TARGET
+ setvolatile BS_TARGET, VOLATILE_CHARGE_TIMER, 2
printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER
waitmessage B_WAIT_TIME_LONG
goto BattleScript_TryTailwindAbilitiesLoop_Increment
BattleScript_EffectMiracleEye::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- setmiracleeye BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
+ setvolatile BS_TARGET, VOLATILE_MIRACLE_EYE
goto BattleScript_IdentifiedFoe
BattleScript_EffectGravity::
+ call BattleScript_EffectGravityInternal
+ goto BattleScript_MoveEnd
+
+BattleScript_EffectGravityInternal:
attackcanceler
- attackstring
- ppreduce
setgravity BattleScript_ButItFailed
attackanimation
waitanimation
@@ -2727,43 +2335,39 @@ BattleScript_EffectGravitySuccess::
selectfirstvalidtarget
BattleScript_GravityLoop:
movevaluescleanup
- jumpifstatus3 BS_TARGET, STATUS3_ON_AIR | STATUS3_MAGNET_RISE | STATUS3_TELEKINESIS, BattleScript_GravityLoopDrop
+ jumpfifsemiinvulnerable BS_TARGET, STATE_ON_AIR, BattleScript_GravityLoopDrop
+ jumpifvolatile BS_TARGET, VOLATILE_MAGNET_RISE, BattleScript_GravityLoopDrop
+ jumpifvolatile BS_TARGET, VOLATILE_TELEKINESIS, BattleScript_GravityLoopDrop
goto BattleScript_GravityLoopEnd
BattleScript_GravityLoopDrop:
- bringdownairbornebattler BS_TARGET
+ gravityonairbornemons
printstring STRINGID_GRAVITYGROUNDING
waitmessage B_WAIT_TIME_LONG
BattleScript_GravityLoopEnd:
moveendcase MOVEEND_TARGET_VISIBLE
jumpifnexttargetvalid BattleScript_GravityLoop
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectRoost::
attackcanceler
- attackstring
- ppreduce
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
+ tryhealhalfhealth BS_TARGET, BattleScript_AlreadyAtFullHp
setroost
goto BattleScript_PresentHealTarget
BattleScript_EffectCaptivate::
setstatchanger STAT_SPATK, 2, TRUE
attackcanceler
- attackstring
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
jumpifcaptivateaffected BattleScript_CaptivateCheckAcc
goto BattleScript_ButItFailed
BattleScript_CaptivateCheckAcc:
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
- goto BattleScript_StatDownFromAttackString
+ goto BattleScript_EffectStatDownFromStatBuffChange
BattleScript_EffectHealBlock::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
sethealblock BattleScript_ButItFailed
attackanimation
@@ -2782,8 +2386,6 @@ BattleScript_HitEscapeSwitch:
BattleScript_EffectPlaceholder::
attackcanceler
- attackstring
- ppreduce
pause 5
printstring STRINGID_NOTDONEYET
goto BattleScript_MoveEnd
@@ -2791,10 +2393,7 @@ BattleScript_EffectPlaceholder::
BattleScript_EffectHit::
attackcanceler
BattleScript_HitFromAccCheck::
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-BattleScript_HitFromAtkString::
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
BattleScript_HitFromCritCalc::
critcalc
damagecalc
@@ -2810,9 +2409,7 @@ BattleScript_MoveEnd::
BattleScript_EffectHit_Ret::
attackcanceler
BattleScript_EffectHit_RetFromAccCheck::
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
BattleScript_EffectHit_RetFromCritCalc::
critcalc
damagecalc
@@ -2823,8 +2420,8 @@ BattleScript_Hit_RetFromAtkAnimation::
effectivenesssound
hitanimation BS_TARGET
waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
+ datahpupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
@@ -2834,26 +2431,15 @@ BattleScript_Hit_RetFromAtkAnimation::
BattleScript_EffectNaturalGift::
attackcanceler
- attackstring
- ppreduce
jumpifnotberry BS_ATTACKER, BattleScript_ButItFailed
jumpifword CMP_COMMON_BITS, gFieldStatuses, STATUS_FIELD_MAGIC_ROOM, BattleScript_ButItFailed
jumpifability BS_ATTACKER, ABILITY_KLUTZ, BattleScript_ButItFailed
- jumpifstatus3 BS_ATTACKER, STATUS3_EMBARGO, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_EMBARGO, BattleScript_ButItFailed
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
- call BattleScript_EffectHit_RetFromCritCalc
- jumpifmovehadnoeffect BattleScript_EffectNaturalGiftEnd
- checkparentalbondcounter 2, BattleScript_EffectNaturalGiftEnd
- removeitem BS_ATTACKER
-BattleScript_EffectNaturalGiftEnd:
- tryfaintmon BS_TARGET
- goto BattleScript_MoveEnd
+ call BattleScript_HitFromCritCalc
BattleScript_MakeMoveMissed::
setmoveresultflags MOVE_RESULT_MISSED
-BattleScript_PrintMoveMissed::
- attackstring
- ppreduce
BattleScript_MoveMissedPause::
pause B_WAIT_TIME_SHORT
BattleScript_MoveMissed::
@@ -2862,18 +2448,19 @@ BattleScript_MoveMissed::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectDarkVoid::
-.if B_DARK_VOID_FAIL >= GEN_7
- jumpifspecies BS_ATTACKER, SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus
- goto BattleScript_PokemonCantUseTheMove
-.endif
-
BattleScript_TerrainPreventsEnd2::
pause B_WAIT_TIME_SHORT
printfromtable gTerrainPreventsStringIds
waitmessage B_WAIT_TIME_LONG
end2
+BattleScript_ImmunityProtectedEnd2::
+ call BattleScript_AbilityPopUp
+ pause B_WAIT_TIME_SHORT
+ printstring STRINGID_ITDOESNTAFFECT
+ waitmessage B_WAIT_TIME_LONG
+ end2
+
BattleScript_ElectricTerrainPrevents::
pause B_WAIT_TIME_SHORT
printstring STRINGID_ELECTRICTERRAINPREVENTS
@@ -2924,14 +2511,6 @@ BattleScript_AromaVeilProtects:
setmoveresultflags MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
-BattleScript_PastelVeilProtects:
- pause B_WAIT_TIME_SHORT
- call BattleScript_AbilityPopUp
- printstring STRINGID_PASTELVEILPROTECTED
- waitmessage B_WAIT_TIME_LONG
- setmoveresultflags MOVE_RESULT_FAILED
- goto BattleScript_MoveEnd
-
BattleScript_AbilityProtectsDoesntAffectRet::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
@@ -2944,7 +2523,7 @@ BattleScript_AbilityProtectsDoesntAffect::
setmoveresultflags MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
-BattleScript_InsomniaProtects:
+BattleScript_InsomniaProtects::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSTAYEDAWAKEUSING
@@ -2953,20 +2532,13 @@ BattleScript_InsomniaProtects:
goto BattleScript_MoveEnd
BattleScript_AlreadyAsleep::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYASLEEP
waitmessage B_WAIT_TIME_LONG
setmoveresultflags MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
-BattleScript_WasntAffected::
- pause B_WAIT_TIME_SHORT
- printstring STRINGID_PKMNWASNTAFFECTED
- waitmessage B_WAIT_TIME_LONG
- setmoveresultflags MOVE_RESULT_FAILED
- goto BattleScript_MoveEnd
-
BattleScript_CantMakeAsleep::
pause B_WAIT_TIME_SHORT
printfromtable gUproarAwakeStringIds
@@ -2976,26 +2548,25 @@ BattleScript_CantMakeAsleep::
BattleScript_EffectAbsorbLiquidOoze::
call BattleScript_AbilityPopUpTarget
+ jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_EffectAbsorbRet
goto BattleScript_EffectAbsorb
BattleScript_EffectAbsorb::
- absorbhealthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printfromtable gAbsorbDrainStringIds
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
- bicword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_PASSIVE_DAMAGE
+BattleScript_EffectAbsorbRet:
return
BattleScript_EffectExplosion::
attackcanceler
- attackstring
- ppreduce
tryexplosion
setatkhptozero
waitstate
jumpiffainted BS_TARGET, TRUE, BattleScript_MoveEnd
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
BattleScript_FaintAttackerForExplosion::
@@ -3003,63 +2574,19 @@ BattleScript_FaintAttackerForExplosion::
return
BattleScript_MaxHp50Recoil::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
return
BattleScript_EffectDreamEater::
attackcanceler
- jumpifsubstituteblocks BattleScript_DreamEaterNoEffect
- jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_DreamEaterWorked
- jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_DreamEaterWorked
-BattleScript_DreamEaterNoEffect:
- attackstring
- ppreduce
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_WasntAffected
-BattleScript_DreamEaterWorked:
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- critcalc
- damagecalc
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- jumpifstatus3 BS_ATTACKER, STATUS3_HEAL_BLOCK, BattleScript_DreamEaterTryFaintEnd
- setdrainedhp
- manipulatedamage DMG_BIG_ROOT
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
- jumpifmovehadnoeffect BattleScript_DreamEaterTryFaintEnd
- printstring STRINGID_PKMNENERGYDRAINED
- waitmessage B_WAIT_TIME_LONG
-BattleScript_DreamEaterTryFaintEnd:
- tryfaintmon BS_TARGET
- goto BattleScript_MoveEnd
-
-BattleScript_EffectMirrorMove::
- attackcanceler
- attackstring
- pause B_WAIT_TIME_LONG
- trymirrormove
- ppreduce
- setmoveresultflags MOVE_RESULT_FAILED
- printstring STRINGID_MIRRORMOVEFAILED
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+.if B_DREAM_EATER_SUBSTITUTE < GEN_5
+ jumpifsubstituteblocks BattleScript_DoesntAffectTargetAtkString
+.endif
+ jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_HitFromAccCheck
+ jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_HitFromAccCheck
+ goto BattleScript_DoesntAffectTargetAtkString
BattleScript_EffectAttackUp::
setstatchanger STAT_ATK, 1, FALSE
@@ -3090,18 +2617,16 @@ BattleScript_EffectEvasionUp::
BattleScript_EffectStatUp::
attackcanceler
BattleScript_EffectStatUpAfterAtkCanceler::
- attackstring
- ppreduce
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd
- jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpAttackAnim
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_StatUpEnd
+ jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_StatUpAttackAnim
pause B_WAIT_TIME_SHORT
+ setmoveresultflags MOVE_RESULT_MISSED @ TODO: Is this even necessary?
goto BattleScript_StatUpPrintString
BattleScript_StatUpAttackAnim::
attackanimation
waitanimation
BattleScript_StatUpDoAnim::
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpEnd
BattleScript_StatUpPrintString::
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -3109,8 +2634,6 @@ BattleScript_StatUpEnd::
goto BattleScript_MoveEnd
BattleScript_StatUp::
- playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-BattleScript_StatUpMsg::
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
return
@@ -3143,22 +2666,20 @@ BattleScript_EffectEvasionDown::
setstatchanger STAT_EVASION, 1, TRUE
BattleScript_EffectStatDown:
attackcanceler
- jumpifsubstituteblocks BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-BattleScript_StatDownFromAttackString:
- attackstring
- ppreduce
+ jumpifsubstituteblocks BattleScript_ButItFailed
+BattleScript_EffectStatDownFromAccCheck:
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
BattleScript_EffectStatDownFromStatBuffChange:
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StatDownDoAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StatDownEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_StatDownEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_StatDownDoAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_StatDownEnd
pause B_WAIT_TIME_SHORT
+ setmoveresultflags MOVE_RESULT_MISSED @ TODO: Is this even necessary?
goto BattleScript_StatDownPrintString
BattleScript_StatDownDoAnim::
attackanimation
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_StatDownEnd
bicword gHitMarker, HITMARKER_DISABLE_ANIMATION
BattleScript_StatDownPrintString::
printfromtable gStatDownStringIds
@@ -3169,14 +2690,11 @@ BattleScript_StatDownEnd::
BattleScript_MirrorArmorReflect::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
- jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_MirrorArmorDoesntAffect
+ jumpifvolatile BS_ATTACKER, VOLATILE_SUBSTITUTE, BattleScript_MirrorArmorDoesntAffect
BattleScript_MirrorArmorReflectStatLoss:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_MIRROR_ARMOR | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_MirrorArmorReflectAnim
+ statbuffchange BS_ATTACKER, STAT_CHANGE_MIRROR_ARMOR | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorArmorReflectEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_MirrorArmorReflectPrintString
goto BattleScript_MirrorArmorReflectWontFall
-BattleScript_MirrorArmorReflectAnim:
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_MirrorArmorReflectPrintString:
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
@@ -3203,15 +2721,12 @@ BattleScript_MirrorArmorReflectStickyWeb:
goto BattleScript_StickyWebOnSwitchInEnd
BattleScript_StatDown::
- playanimation BS_EFFECT_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
return
BattleScript_EffectHaze::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
normalisebuffs
@@ -3221,23 +2736,18 @@ BattleScript_EffectHaze::
BattleScript_EffectBide::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_CHARGING
setbide
goto BattleScript_MoveEnd
BattleScript_EffectRoar::
attackcanceler
- attackstring
- ppreduce
jumpifroarfails BattleScript_ButItFailed
jumpifcommanderactive BattleScript_ButItFailed
jumpifability BS_TARGET, ABILITY_GUARD_DOG, BattleScript_ButItFailed
jumpifability BS_TARGET, ABILITY_SUCTION_CUPS, BattleScript_AbilityPreventsPhasingOut
- jumpifstatus3 BS_TARGET, STATUS3_ROOTED, BattleScript_PrintMonIsRooted
+ jumpifvolatile BS_TARGET, VOLATILE_ROOT, BattleScript_PrintMonIsRooted
jumpiftargetdynamaxed BattleScript_RoarBlockedByDynamax
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
@@ -3263,8 +2773,6 @@ BattleScript_ScaleShot::
BattleScript_EffectConversion::
attackcanceler
- attackstring
- ppreduce
tryconversiontypechange BattleScript_ButItFailed
attackanimation
waitanimation
@@ -3274,21 +2782,18 @@ BattleScript_EffectConversion::
BattleScript_EffectRestoreHp::
attackcanceler
- attackstring
- ppreduce
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_ATTACKER
+ tryhealhalfhealth BS_ATTACKER, BattleScript_AlreadyAtFullHp
attackanimation
waitanimation
BattleScript_RestoreHp:
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AlreadyPoisoned::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_LONG
printstring STRINGID_PKMNALREADYPOISONED
waitmessage B_WAIT_TIME_LONG
@@ -3296,39 +2801,28 @@ BattleScript_AlreadyPoisoned::
BattleScript_ImmunityProtected::
call BattleScript_AbilityPopUp
- pause B_WAIT_TIME_SHORT
- printfromtable gStatusPreventionStringIds
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ goto BattleScript_DoesntAffectTargetAtkString
BattleScript_EffectAuroraVeil::
attackcanceler
- attackstring
- ppreduce
- setauroraveil BS_ATTACKER
+ setauroraveil
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectLightScreen::
attackcanceler
- attackstring
- ppreduce
setlightscreen
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectRest::
attackcanceler
- attackstring
- ppreduce
jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_RestIsAlreadyAsleep
jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_RestIsAlreadyAsleep
jumpifuproarwakes BattleScript_RestCantSleep
jumpifability BS_TARGET, ABILITY_INSOMNIA, BattleScript_InsomniaProtects
jumpifability BS_TARGET, ABILITY_VITAL_SPIRIT, BattleScript_InsomniaProtects
jumpifability BS_ATTACKER, ABILITY_PURIFYING_SALT, BattleScript_InsomniaProtects
-.if B_LEAF_GUARD_PREVENTS_REST >= GEN_5
- jumpifleafguardprotected BS_TARGET, BattleScript_LeafGuardPreventsRest
-.endif
- trysetrest BattleScript_AlreadyAtFullHp
+ jumpifabilitypreventsrest BS_TARGET, BattleScript_AbilityPreventsRest
+ trysetrest
pause B_WAIT_TIME_SHORT
printfromtable gRestUsedStringIds
waitmessage B_WAIT_TIME_LONG
@@ -3343,13 +2837,13 @@ BattleScript_RestCantSleep::
goto BattleScript_MoveEnd
BattleScript_RestIsAlreadyAsleep::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYASLEEP2
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_LeafGuardPreventsRest::
+BattleScript_AbilityPreventsRest::
pause B_WAIT_TIME_SHORT
printstring STRINGID_BUTITFAILED
waitmessage B_WAIT_TIME_LONG
@@ -3357,13 +2851,9 @@ BattleScript_LeafGuardPreventsRest::
BattleScript_EffectOHKO::
attackcanceler
- attackstring
- ppreduce
- accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
typecalc
jumpifmovehadnoeffect BattleScript_HitFromAtkAnimation
tryKO BattleScript_KOFail
- trysetdestinybondtohappen
goto BattleScript_HitFromAtkAnimation
BattleScript_KOFail::
pause B_WAIT_TIME_LONG
@@ -3375,16 +2865,14 @@ BattleScript_RecoilIfMiss::
printstring STRINGID_PKMNCRASHED
waitmessage B_WAIT_TIME_LONG
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_RecoilEnd
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
+BattleScript_RecoilEnd:
return
BattleScript_EffectMist::
attackcanceler
- attackstring
- ppreduce
setmist
attackanimation
waitanimation
@@ -3394,9 +2882,8 @@ BattleScript_EffectMist::
BattleScript_EffectFocusEnergy::
attackcanceler
- attackstring
- ppreduce
- jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY_ANY, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_DRAGON_CHEER, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_FOCUS_ENERGY, BattleScript_ButItFailed
setfocusenergy BS_TARGET
attackanimation
waitanimation
@@ -3406,23 +2893,21 @@ BattleScript_EffectFocusEnergy::
BattleScript_EffectConfuse::
attackcanceler
- attackstring
- ppreduce
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
jumpifsubstituteblocks BattleScript_ButItFailed
- jumpifstatus2 BS_TARGET, STATUS2_CONFUSION, BattleScript_AlreadyConfused
+ jumpifvolatile BS_TARGET, VOLATILE_CONFUSION, BattleScript_AlreadyConfused
jumpifterrainaffected BS_TARGET, STATUS_FIELD_MISTY_TERRAIN, BattleScript_MistyTerrainPrevents
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifsafeguard BattleScript_SafeguardProtected
attackanimation
waitanimation
- seteffectprimary MOVE_EFFECT_CONFUSION
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_CONFUSION
resultmessage
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AlreadyConfused::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYCONFUSED
waitmessage B_WAIT_TIME_LONG
@@ -3466,9 +2951,10 @@ BattleScript_EffectEvasionUp2::
BattleScript_EffectTransform::
attackcanceler
- attackstring
- ppreduce
trytoclearprimalweather
+ tryrevertweatherform
+ flushtextbox
+ tryendneutralizinggas
flushtextbox
transformdataexecution
attackanimation
@@ -3507,24 +2993,26 @@ BattleScript_EffectEvasionDown2::
BattleScript_EffectReflect::
attackcanceler
- attackstring
- ppreduce
setreflect
BattleScript_PrintReflectLightScreenSafeguardString::
attackanimation
waitanimation
-BattleScript_EffectAuroraVeilSuccess::
printfromtable gReflectLightScreenSafeguardStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
+BattleScript_MoveEffectAuroraVeil::
+ printfromtable gReflectLightScreenSafeguardStringIds
+ waitmessage B_WAIT_TIME_LONG
+ return
+
BattleScript_VoltAbsorbHeal:
copybyte gBattlerAbility, gBattlerTarget
- tryhealquarterhealth BS_TARGET BattleScript_MonMadeMoveUseless @ Check if max hp
+ tryhealquarterhealth BS_TARGET, BattleScript_MonMadeMoveUseless @ Check if max hp
goto BattleScript_MoveHPDrain
BattleScript_AlreadyParalyzed::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNISALREADYPARALYZED
waitmessage B_WAIT_TIME_LONG
@@ -3538,49 +3026,43 @@ BattleScript_PowerHerbActivation:
return
BattleScript_EffectTwoTurnsAttack::
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_TwoTurnMovesSecondTurn
+ jumpifvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS, BattleScript_TwoTurnMovesSecondTurn
tryfiretwoturnmovewithoutcharging BS_ATTACKER, BattleScript_EffectHit @ e.g. Solar Beam
call BattleScript_FirstChargingTurn
tryfiretwoturnmoveaftercharging BS_ATTACKER, BattleScript_TwoTurnMovesSecondTurn @ e.g. Electro Shot
- jumpifholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_TwoTurnMovesSecondPowerHerbActivates
+ jumpifholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_TwoTurnMovesSecondPowerHerbActivates, TRUE
goto BattleScript_MoveEnd
BattleScript_EffectGeomancy::
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_GeomancySecondTurn
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING, BattleScript_GeomancySecondTurn
+ jumpifvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS, BattleScript_GeomancySecondTurn
call BattleScript_FirstChargingTurn
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_POWER_HERB, BattleScript_MoveEnd
call BattleScript_PowerHerbActivation
BattleScript_GeomancySecondTurn:
attackcanceler
setbyte sB_ANIM_TURN, 1
- clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
- orword gHitMarker, HITMARKER_NO_PPDEDUCT
- attackstring
+ clearvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_GeomancyDoMoveAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_GeomancyDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_GeomancyDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF | BIT_SPEED, 0
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpDef, BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_GeomancyTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GeomancyTrySpDef::
setstatchanger STAT_SPDEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_GeomancyTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GeomancyTrySpeed::
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_GeomancyEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_GeomancyEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_GeomancyEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_GeomancyEnd::
@@ -3588,17 +3070,10 @@ BattleScript_GeomancyEnd::
BattleScript_FirstChargingTurn::
attackcanceler
-@ before Gen 5, charge moves did not print an attack string on the charge turn
-.if B_UPDATED_MOVE_DATA >= GEN_5
- flushtextbox
- attackstring
waitmessage B_WAIT_TIME_LONG
-.endif
- ppreduce
BattleScript_FirstChargingTurnAfterAttackString:
setsemiinvulnerablebit @ only for moves with EFFECT_SEMI_INVULNERABLE/EFFECT_SKY_DROP
- orword gHitMarker, HITMARKER_CHARGING
- seteffectprimary MOVE_EFFECT_CHARGING | MOVE_EFFECT_AFFECTS_USER
+ setchargingturn
twoturnmoveschargestringandanimation
setadditionaleffects @ only onChargeTurnOnly effects will work here
return
@@ -3608,46 +3083,38 @@ BattleScript_TwoTurnMovesSecondPowerHerbActivates:
trygulpmissile @ Edge case for Cramorant ability Gulp Missile
BattleScript_FromTwoTurnMovesSecondTurnRet:
call BattleScript_TwoTurnMovesSecondTurnRet
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-@ before Gen 5, charge moves did not print an attack string on the charge turn
-.if B_UPDATED_MOVE_DATA < GEN_5
- attackstring
-.endif
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
BattleScript_TwoTurnMovesSecondTurn::
attackcanceler
call BattleScript_TwoTurnMovesSecondTurnRet
- orword gHitMarker, HITMARKER_NO_PPDEDUCT
goto BattleScript_HitFromAccCheck
BattleScript_TwoTurnMovesSecondTurnRet:
setbyte sB_ANIM_TURN, 1
setbyte sB_ANIM_TARGETS_HIT, 0
- clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
+ clearvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS
clearsemiinvulnerablebit @ only for moves with EFFECT_SEMI_INVULNERABLE/EFFECT_SKY_DROP
return
BattleScript_EffectSubstitute::
attackcanceler
- ppreduce
- attackstring
waitstate
- jumpifstatus2 BS_ATTACKER, STATUS2_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
+ jumpifvolatile BS_ATTACKER, VOLATILE_SUBSTITUTE, BattleScript_AlreadyHasSubstitute
setsubstitute
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_SUBSTITUTE_FAILED, BattleScript_SubstituteString
- orword gHitMarker, HITMARKER_PASSIVE_DAMAGE
attackanimation
waitanimation
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
BattleScript_SubstituteString::
pause B_WAIT_TIME_SHORT
printfromtable gSubstituteUsedStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AlreadyHasSubstitute::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNHASSUBSTITUTE
waitmessage B_WAIT_TIME_LONG
@@ -3661,16 +3128,14 @@ BattleScript_MoveUsedMustRecharge::
BattleScript_EffectRage::
attackcanceler
accuracycheck BattleScript_RageMiss, ACC_CURR_MOVE
- seteffectprimary MOVE_EFFECT_RAGE
- goto BattleScript_HitFromAtkString
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_RAGE
+ goto BattleScript_HitFromCritCalc
BattleScript_RageMiss::
- clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_RAGE
- goto BattleScript_PrintMoveMissed
+ clearvolatile BS_ATTACKER, VOLATILE_RAGE
+ goto BattleScript_MoveMissedPause
BattleScript_EffectMimic::
attackcanceler
- attackstring
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
mimicattackcopy BattleScript_ButItFailed
@@ -3680,19 +3145,9 @@ BattleScript_EffectMimic::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectMetronome::
- attackcanceler
- attackstring
- pause B_WAIT_TIME_SHORT
- attackanimation
- waitanimation
- metronome
-
BattleScript_EffectLeechSeed::
attackcanceler
- attackstring
pause B_WAIT_TIME_SHORT
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
accuracycheck BattleScript_DoLeechSeed, ACC_CURR_MOVE
BattleScript_DoLeechSeed::
@@ -3705,8 +3160,6 @@ BattleScript_DoLeechSeed::
BattleScript_EffectDoNothing::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
incrementgamestat GAME_STAT_USED_SPLASH
@@ -3716,8 +3169,6 @@ BattleScript_EffectDoNothing::
BattleScript_EffectHoldHands::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_ButItFailed
attackanimation
@@ -3726,8 +3177,6 @@ BattleScript_EffectHoldHands::
BattleScript_EffectCelebrate::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
printstring STRINGID_CELEBRATEMESSAGE
@@ -3736,17 +3185,13 @@ BattleScript_EffectCelebrate::
BattleScript_EffectHappyHour::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
- seteffectprimary MOVE_EFFECT_HAPPY_HOUR
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_HAPPY_HOUR
goto BattleScript_MoveEnd
BattleScript_EffectDisable::
attackcanceler
- attackstring
- ppreduce
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
disablelastusedattack BattleScript_ButItFailed
@@ -3758,10 +3203,8 @@ BattleScript_EffectDisable::
BattleScript_EffectCounter::
attackcanceler
- counterdamagecalculator BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ counterdamagecalculator BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
clearmoveresultflags MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
adjustdamage
@@ -3769,9 +3212,7 @@ BattleScript_EffectCounter::
BattleScript_EffectEncore::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
trysetencore BattleScript_ButItFailed
attackanimation
@@ -3782,43 +3223,30 @@ BattleScript_EffectEncore::
BattleScript_EffectPainSplit::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
painsplitdmgcalc BattleScript_ButItFailed
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_SHAREDPAIN
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectSnore::
attackcanceler
- jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_SnoreIsAsleep
- jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SnoreIsAsleep
- attackstring
- ppreduce
- goto BattleScript_ButItFailed
-BattleScript_SnoreIsAsleep::
jumpifhalfword CMP_EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore
printstring STRINGID_PKMNFASTASLEEP
waitmessage B_WAIT_TIME_LONG
statusanimation BS_ATTACKER
BattleScript_DoSnore::
- attackstring
- ppreduce
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
BattleScript_EffectConversion2::
attackcanceler
- attackstring
- ppreduce
settypetorandomresistance BattleScript_ButItFailed
attackanimation
waitanimation
@@ -3828,8 +3256,6 @@ BattleScript_EffectConversion2::
BattleScript_EffectLockOn::
attackcanceler
- attackstring
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
setalwayshitflag
@@ -3841,8 +3267,6 @@ BattleScript_EffectLockOn::
BattleScript_EffectSketch::
attackcanceler
- attackstring
- ppreduce
copymovepermanently BattleScript_ButItFailed
attackanimation
waitanimation
@@ -3850,33 +3274,9 @@ BattleScript_EffectSketch::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectSleepTalk::
- attackcanceler
- jumpifability BS_ATTACKER, ABILITY_COMATOSE, BattleScript_SleepTalkIsAsleep
- jumpifstatus BS_ATTACKER, STATUS1_SLEEP, BattleScript_SleepTalkIsAsleep
- attackstring
- ppreduce
- goto BattleScript_ButItFailed
-BattleScript_SleepTalkIsAsleep::
- printstring STRINGID_PKMNFASTASLEEP
- waitmessage B_WAIT_TIME_LONG
- statusanimation BS_ATTACKER
- attackstring
- ppreduce
- orword gHitMarker, HITMARKER_NO_PPDEDUCT
- trychoosesleeptalkmove BattleScript_SleepTalkUsingMove
- pause B_WAIT_TIME_LONG
- goto BattleScript_ButItFailed
-BattleScript_SleepTalkUsingMove::
- attackanimation
- waitanimation
- jumptocalledmove TRUE
-
BattleScript_EffectDestinyBond::
attackcanceler
- attackstring
- ppreduce
- trysetdestinybond BattleScript_ButItFailed
+ setvolatile BS_ATTACKER, VOLATILE_DESTINY_BOND, 2
attackanimation
waitanimation
printstring STRINGID_PKMNTRYINGTOTAKEFOE
@@ -3890,8 +3290,6 @@ BattleScript_MoveEffectEerieSpell::
BattleScript_EffectSpite::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
tryspiteppreduce BattleScript_ButItFailed
attackanimation
@@ -3900,13 +3298,11 @@ BattleScript_EffectSpite::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
+@ TODO: Simplfy script
BattleScript_EffectHealBell::
attackcanceler
- attackstring
- ppreduce
attackanimation
waitanimation
-BattleScript_EffectHealBell_FromHeal::
healpartystatus
waitstate
printfromtable gPartyStatusHealStringIds
@@ -3926,56 +3322,59 @@ BattleScript_PartyHealEnd::
waitstate
goto BattleScript_MoveEnd
+BattleScript_MoveEffectAromatherapy::
+ healpartystatus
+ waitstate
+ printfromtable gPartyStatusHealStringIds
+ waitmessage B_WAIT_TIME_LONG
+ updatestatusicon BS_ATTACKER_WITH_PARTNER
+ waitstate
+ return
+
BattleScript_EffectMeanLook::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
- jumpifstatus2 BS_TARGET, STATUS2_ESCAPE_PREVENTION, BattleScript_ButItFailed
+ jumpifvolatile BS_TARGET, VOLATILE_ESCAPE_PREVENTION, BattleScript_ButItFailed
jumpifsubstituteblocks BattleScript_ButItFailed
.if B_GHOSTS_ESCAPE >= GEN_6
jumpiftype BS_TARGET, TYPE_GHOST, BattleScript_ButItFailed
.endif
attackanimation
waitanimation
- seteffectprimary MOVE_EFFECT_PREVENT_ESCAPE
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_PREVENT_ESCAPE
printstring STRINGID_TARGETCANTESCAPENOW
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectNightmare::
attackcanceler
- attackstring
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
- jumpifstatus2 BS_TARGET, STATUS2_NIGHTMARE, BattleScript_ButItFailed
+ jumpifvolatile BS_TARGET, VOLATILE_NIGHTMARE, BattleScript_ButItFailed
jumpifstatus BS_TARGET, STATUS1_SLEEP, BattleScript_NightmareWorked
jumpifability BS_TARGET, ABILITY_COMATOSE, BattleScript_NightmareWorked
goto BattleScript_ButItFailed
BattleScript_NightmareWorked::
attackanimation
waitanimation
- seteffectprimary MOVE_EFFECT_NIGHTMARE
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_NIGHTMARE
printstring STRINGID_PKMNFELLINTONIGHTMARE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectMinimize::
attackcanceler
- setminimize
-.if B_MINIMIZE_EVASION >= GEN_5
+ setvolatile BS_ATTACKER, VOLATILE_MINIMIZE
+ jumpifgenconfiglowerthan CONFIG_MINIMIZE_EVASION, GEN_5, BattleScript_EffectMinimizeGen4
setstatchanger STAT_EVASION, 2, FALSE
-.else
+ goto BattleScript_EffectStatUpAfterAtkCanceler
+BattleScript_EffectMinimizeGen4:
setstatchanger STAT_EVASION, 1, FALSE
-.endif
goto BattleScript_EffectStatUpAfterAtkCanceler
BattleScript_EffectCurse::
jumpiftype BS_ATTACKER, TYPE_GHOST, BattleScript_GhostCurse
attackcanceler
jumpiftype BS_ATTACKER, TYPE_GHOST, BattleScript_DoGhostCurse
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_SPEED, MIN_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_NOT_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_CurseTrySpeed
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_ButItFailed
@@ -3984,57 +3383,42 @@ BattleScript_CurseTrySpeed::
setbyte sB_ANIM_TURN, 1
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_SPEED, STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPEED, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryAttack
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryAttack::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CurseTryDefense, BIT_DEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseTryDefense::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CurseEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CurseEnd::
goto BattleScript_MoveEnd
BattleScript_GhostCurse::
jumpifbytenotequal gBattlerAttacker, gBattlerTarget, BattleScript_DoGhostCurse
- getmovetarget BS_ATTACKER
+ getmovetarget
BattleScript_DoGhostCurse::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
cursetarget BattleScript_ButItFailed
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
setbyte sB_ANIM_TURN, 0
attackanimation
waitanimation
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNLAIDCURSE
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
goto BattleScript_MoveEnd
-BattleScript_EffectMatBlock::
- attackcanceler
- jumpifnotfirstturn BattleScript_FailedFromAtkString
- goto BattleScript_ProtectLikeAtkString
-
BattleScript_EffectProtect::
BattleScript_EffectEndure::
attackcanceler
-BattleScript_ProtectLikeAtkString:
- attackstring
- ppreduce
setprotectlike
attackanimation
waitanimation
@@ -4044,9 +3428,7 @@ BattleScript_ProtectLikeAtkString:
BattleScript_EffectSpikes::
attackcanceler
- trysetspikes BattleScript_FailedFromAtkString
- attackstring
- ppreduce
+ trysetspikes BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_SPIKESSCATTERED
@@ -4055,11 +3437,9 @@ BattleScript_EffectSpikes::
BattleScript_EffectForesight::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
- jumpifstatus2 BS_TARGET, STATUS2_FORESIGHT, BattleScript_ButItFailed
- setforesight
+ jumpifvolatile BS_TARGET, VOLATILE_FORESIGHT, BattleScript_ButItFailed
+ setvolatile BS_TARGET, VOLATILE_FORESIGHT
BattleScript_IdentifiedFoe:
attackanimation
waitanimation
@@ -4069,8 +3449,6 @@ BattleScript_IdentifiedFoe:
BattleScript_EffectPerishSong::
attackcanceler
- attackstring
- ppreduce
trysetperishsong BattleScript_ButItFailed
savetarget
attackanimation
@@ -4080,7 +3458,7 @@ BattleScript_EffectPerishSong::
setbyte gBattlerTarget, 0
BattleScript_PerishSongLoop::
jumpifblockedbysoundproof BS_TARGET, BattleScript_PerishSongBlocked
- jumpifpranksterblocked BS_TARGET, BattleScript_PerishSongNotAffected
+ jumpifpranksterblocked BattleScript_PerishSongNotAffected
BattleScript_PerishSongLoopIncrement::
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_PerishSongLoop
@@ -4100,17 +3478,13 @@ BattleScript_PerishSongNotAffected:
BattleScript_EffectSandstorm::
attackcanceler
- attackstring
- ppreduce
call BattleScript_CheckPrimalWeather
setfieldweather BATTLE_WEATHER_SANDSTORM
goto BattleScript_MoveWeatherChange
BattleScript_EffectRollout::
attackcanceler
- attackstring
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy
- ppreduce
+ jumpifvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS, BattleScript_RolloutCheckAccuracy
BattleScript_RolloutCheckAccuracy::
accuracycheck BattleScript_RolloutHit, ACC_CURR_MOVE
BattleScript_RolloutHit::
@@ -4121,29 +3495,23 @@ BattleScript_RolloutHit::
BattleScript_EffectSwagger::
attackcanceler
jumpifsubstituteblocks BattleScript_MakeMoveMissed
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifconfusedandstatmaxed STAT_ATK, BattleScript_ButItFailed
attackanimation
waitanimation
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SwaggerTryConfuse
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_SwaggerTryConfuse
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_SwaggerTryConfuse
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_SwaggerTryConfuse:
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
jumpifsafeguard BattleScript_SafeguardProtected
- seteffectprimary MOVE_EFFECT_CONFUSION
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_CONFUSION
goto BattleScript_MoveEnd
BattleScript_EffectFuryCutter::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_FuryCutterHit, ACC_CURR_MOVE
BattleScript_FuryCutterHit:
handlefurycutter
@@ -4155,32 +3523,36 @@ BattleScript_FuryCutterHit:
BattleScript_TryDestinyKnotTarget:
jumpifnoholdeffect BS_ATTACKER, HOLD_EFFECT_DESTINY_KNOT, BattleScript_TryDestinyKnotTargetRet
- infatuatewithbattler BS_TARGET, BS_ATTACKER
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
waitanimation
- status2animation BS_TARGET, STATUS2_INFATUATION
- waitanimation
printstring STRINGID_DESTINYKNOTACTIVATES
+ tryinfatuating BattleScript_TryDestinyKnotTargetFailed
+ volatileanimation BS_TARGET, VOLATILE_INFATUATION
+ waitanimation
+ waitmessage B_WAIT_TIME_LONG
+ goto BattleScript_TryDestinyKnotTargetRet
+BattleScript_TryDestinyKnotTargetFailed:
+ pause B_WAIT_TIME_SHORT
+ printstring STRINGID_BUTITFAILED
waitmessage B_WAIT_TIME_LONG
BattleScript_TryDestinyKnotTargetRet:
return
BattleScript_TryDestinyKnotAttacker:
- jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_DESTINY_KNOT, BattleScript_TryDestinyKnotAttackerRet
- infatuatewithbattler BS_ATTACKER, BS_TARGET
+ jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_DESTINY_KNOT, BattleScript_TryDestinyKnotTargetRet
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
waitanimation
- status2animation BS_ATTACKER, STATUS2_INFATUATION
- waitanimation
+ swapattackerwithtarget
printstring STRINGID_DESTINYKNOTACTIVATES
+ tryinfatuating BattleScript_SwapTargetAttackerButItFailed
+ swapattackerwithtarget
+ volatileanimation BS_ATTACKER, VOLATILE_INFATUATION
+ waitanimation
waitmessage B_WAIT_TIME_LONG
-BattleScript_TryDestinyKnotAttackerRet:
return
BattleScript_EffectAttract::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
tryinfatuating BattleScript_ButItFailed
@@ -4193,45 +3565,35 @@ BattleScript_EffectAttract::
BattleScript_EffectPresent::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
presentdamagecalculation
BattleScript_EffectSafeguard::
attackcanceler
- attackstring
- ppreduce
setsafeguard
goto BattleScript_PrintReflectLightScreenSafeguardString
BattleScript_EffectMagnitude::
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_NO_PPDEDUCT, BattleScript_EffectMagnitudeTarget
attackcanceler
- attackstring
- ppreduce
magnitudedamagecalculation
pause B_WAIT_TIME_SHORT
printstring STRINGID_MAGNITUDESTRENGTH
waitmessage B_WAIT_TIME_LONG
-BattleScript_EffectMagnitudeTarget:
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
goto BattleScript_HitFromCritCalc
BattleScript_EffectBatonPass::
attackcanceler
- attackstring
- ppreduce
jumpifbattletype BATTLE_TYPE_ARENA, BattleScript_ButItFailed
jumpifcantswitch SWITCH_IGNORE_ESCAPE_PREVENTION | BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
openpartyscreen BS_ATTACKER, BattleScript_ButItFailed
- switchoutabilities BS_ATTACKER
waitstate
- switchhandleorder BS_ATTACKER, 2
returntoball BS_ATTACKER, FALSE
+ switchoutabilities BS_ATTACKER
+ switchhandleorder BS_ATTACKER, 2
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
@@ -4248,15 +3610,11 @@ BattleScript_EffectSynthesis::
BattleScript_EffectMoonlight::
BattleScript_EffectShoreUp::
attackcanceler
- attackstring
- ppreduce
recoverbasedonsunlight BattleScript_AlreadyAtFullHp
goto BattleScript_PresentHealTarget
BattleScript_EffectRainDance::
attackcanceler
- attackstring
- ppreduce
call BattleScript_CheckPrimalWeather
setfieldweather BATTLE_WEATHER_RAIN
BattleScript_MoveWeatherChange::
@@ -4273,8 +3631,6 @@ BattleScript_MoveWeatherChangeRet::
BattleScript_EffectSunnyDay::
attackcanceler
- attackstring
- ppreduce
call BattleScript_CheckPrimalWeather
setfieldweather BATTLE_WEATHER_SUN
goto BattleScript_MoveWeatherChange
@@ -4349,27 +3705,21 @@ BattleScript_BlockedByPrimalWeatherRet::
BattleScript_EffectBellyDrum::
attackcanceler
- attackstring
- ppreduce
- jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_ButItFailed
+ jumpifstatignorecontrary BS_ATTACKER, CMP_EQUAL, STAT_ATK, MAX_STAT_STAGE, BattleScript_ButItFailed
halvehp BattleScript_ButItFailed
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
attackanimation
waitanimation
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
- playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_BY_TWO
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
setstatchanger STAT_ATK, MAX_STAT_STAGE, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_MoveEnd
printstring STRINGID_PKMNCUTHPMAXEDATTACK
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectPsychUp::
attackcanceler
- attackstring
- ppreduce
- copyfoestats BattleScript_ButItFailed
+ copyfoestats
attackanimation
waitanimation
printstring STRINGID_PKMNCOPIEDSTATCHANGES
@@ -4378,10 +3728,8 @@ BattleScript_EffectPsychUp::
BattleScript_EffectMirrorCoat::
attackcanceler
- mirrorcoatdamagecalculator BattleScript_FailedFromAtkString
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ mirrorcoatdamagecalculator BattleScript_ButItFailed
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
clearmoveresultflags MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
adjustdamage
@@ -4389,9 +3737,7 @@ BattleScript_EffectMirrorCoat::
BattleScript_EffectFutureSight::
attackcanceler
- attackstring
- ppreduce
- trysetfutureattack BattleScript_ButItFailed
+ setfutureattack
attackanimation
waitanimation
printfromtable gFutureMoveUsedStringIds
@@ -4399,76 +3745,42 @@ BattleScript_EffectFutureSight::
goto BattleScript_MoveEnd
BattleScript_EffectTeleport::
-.if B_TELEPORT_BEHAVIOR >= GEN_8
+ jumpifgenconfiglowerthan CONFIG_TELEPORT_BEHAVIOR, GEN_8, BattleScript_EffectTeleportGen7
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_EffectBatonPass
jumpifside BS_ATTACKER, B_SIDE_PLAYER, BattleScript_EffectBatonPass
-.else
+ goto BattleScript_DoEffectTeleport
+BattleScript_EffectTeleportGen7::
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_FailedFromAtkCanceler
-.endif
+BattleScript_DoEffectTeleport::
attackcanceler
- attackstring
- ppreduce
- getifcantrunfrombattle BS_ATTACKER
+ isrunningimpossible
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation
waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE
waitmessage B_WAIT_TIME_LONG
- setoutcomeonteleport BS_ATTACKER
+ setteleportoutcome BS_ATTACKER
goto BattleScript_MoveEnd
BattleScript_EffectBeatUp::
+ jumpifgenconfiglowerthan CONFIG_BEAT_UP, GEN_5, BattleScript_EffectBeatUpGen3
+ goto BattleScript_EffectHit
+
+BattleScript_EffectBeatUpGen3:
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
-.if B_BEAT_UP >= GEN_5
- attackstring
- ppreduce
- critcalc
- damagecalc
- adjustdamage
- trydobeatup
- goto BattleScript_HitFromAtkAnimation
-.else
- attackstring
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
pause B_WAIT_TIME_SHORT
- ppreduce
- setbyte gBattleCommunication, 0
-BattleScript_BeatUpLoop::
- movevaluescleanup
- trydobeatup BattleScript_BeatUpEnd, BattleScript_ButItFailed
+ trydobeatup BattleScript_MoveEnd, BattleScript_ButItFailed
printstring STRINGID_PKMNATTACK
- critcalc
- jumpifcriticalhit BattleScript_BeatUpAttack
- manipulatedamage DMG_DOUBLED
-BattleScript_BeatUpAttack::
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- tryfaintmon BS_TARGET
- moveendto MOVEEND_NEXT_TARGET
- goto BattleScript_BeatUpLoop
-BattleScript_BeatUpEnd::
- end
-.endif
+ goto BattleScript_HitFromCritCalc
BattleScript_EffectDefenseCurl::
attackcanceler
- attackstring
- ppreduce
- setdefensecurlbit
+ setvolatile BS_TARGET, VOLATILE_DEFENSE_CURL
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DefenseCurlDoStatUpAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpPrintString
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_DefenseCurlDoStatUpAnim
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_StatUpPrintString
attackanimation
waitanimation
BattleScript_DefenseCurlDoStatUpAnim::
@@ -4476,15 +3788,12 @@ BattleScript_DefenseCurlDoStatUpAnim::
BattleScript_EffectSoftboiled::
attackcanceler
- attackstring
- ppreduce
- tryhealhalfhealth BattleScript_AlreadyAtFullHp, BS_TARGET
+ tryhealhalfhealth BS_TARGET, BattleScript_AlreadyAtFullHp
BattleScript_PresentHealTarget::
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -4495,17 +3804,8 @@ BattleScript_AlreadyAtFullHp::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectFirstTurnOnly::
- attackcanceler
- jumpifnotfirstturn BattleScript_FailedFromAtkString
- goto BattleScript_EffectHit
-
BattleScript_FailedFromAtkCanceler::
attackcanceler
-BattleScript_FailedFromAtkString::
- attackstring
-BattleScript_FailedFromPpReduce::
- ppreduce
BattleScript_ButItFailed::
pause B_WAIT_TIME_SHORT
setmoveresultflags MOVE_RESULT_FAILED
@@ -4518,6 +3818,9 @@ BattleScript_RestoreAttackerButItFailed:
BattleScript_RestoreTargetButItFailed:
restoretarget
goto BattleScript_ButItFailed
+BattleScript_SwapTargetAttackerButItFailed:
+ swapattackerwithtarget
+ goto BattleScript_ButItFailed
BattleScript_NotAffected::
pause B_WAIT_TIME_SHORT
@@ -4534,23 +3837,12 @@ BattleScript_NotAffectedAbilityPopUp::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectUproar::
- attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- jumpifstatus2 BS_ATTACKER, STATUS2_MULTIPLETURNS, BattleScript_UproarHit
- ppreduce
-BattleScript_UproarHit::
- goto BattleScript_HitFromCritCalc
-
BattleScript_EffectStockpile::
attackcanceler
- attackstring
- ppreduce
stockpile 0
attackanimation
waitanimation
- printfromtable gStockpileUsedStringIds
+ printstring STRINGID_PKMNSTOCKPILED
waitmessage B_WAIT_TIME_LONG
.if B_STOCKPILE_RAISES_DEFS < GEN_4
goto BattleScript_EffectStockpileEnd
@@ -4559,17 +3851,15 @@ BattleScript_EffectStockpile::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_EffectStockpileDef
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_EffectStockpileEnd
BattleScript_EffectStockpileDef:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileSpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileSpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileSpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectStockpileSpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectStockpileSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectStockpileEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectStockpileEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectStockpileEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectStockpileEnd:
@@ -4585,9 +3875,7 @@ BattleScript_MoveEffectStockpileWoreOff::
return
BattleScript_StockpileStatChangeDown:
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_StockpileStatChangeDown_Ret
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN, BattleScript_StockpileStatChangeDown_Ret
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_StockpileStatChangeDown_Ret:
@@ -4596,67 +3884,42 @@ BattleScript_StockpileStatChangeDown_Ret:
BattleScript_EffectSpitUp::
attackcanceler
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_SpitUpFailProtect
- attackstring
- ppreduce
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
damagecalc
adjustdamage
- stockpiletobasedamage BattleScript_SpitUpFail
+ stockpiletobasedamage
call BattleScript_Hit_RetFromAtkAnimation
tryfaintmon BS_TARGET
removestockpilecounters
- goto BattleScript_SpitUpEnd
-BattleScript_SpitUpFail::
- checkparentalbondcounter 2, BattleScript_SpitUpEnd
- pause B_WAIT_TIME_SHORT
- printstring STRINGID_FAILEDTOSPITUP
- waitmessage B_WAIT_TIME_LONG
-BattleScript_SpitUpEnd:
goto BattleScript_MoveEnd
BattleScript_SpitUpFailProtect::
- attackstring
- ppreduce
pause B_WAIT_TIME_LONG
- stockpiletobasedamage BattleScript_SpitUpFail
+ stockpiletobasedamage
resultmessage
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectSwallow::
attackcanceler
- attackstring
- ppreduce
- stockpiletohpheal BattleScript_SwallowFail
+ stockpiletohpheal BattleScript_ButItFailed
attackanimation
waitanimation
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
removestockpilecounters
goto BattleScript_MoveEnd
-
-BattleScript_SwallowFail::
- pause B_WAIT_TIME_SHORT
- printfromtable gSwallowFailStringIds
- waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
-
BattleScript_EffectHail::
attackcanceler
- attackstring
- ppreduce
call BattleScript_CheckPrimalWeather
setfieldweather BATTLE_WEATHER_HAIL
goto BattleScript_MoveWeatherChange
BattleScript_EffectTorment::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
settorment BattleScript_ButItFailed
@@ -4669,40 +3932,40 @@ BattleScript_EffectTorment::
BattleScript_EffectFlatter::
attackcanceler
jumpifsubstituteblocks BattleScript_MakeMoveMissed
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
jumpifconfusedandstatmaxed STAT_SPATK, BattleScript_ButItFailed
attackanimation
waitanimation
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_FlatterTryConfuse
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_FlatterTryConfuse
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_FlatterTryConfuse
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_FlatterTryConfuse::
jumpifability BS_TARGET, ABILITY_OWN_TEMPO, BattleScript_OwnTempoPrevents
jumpifsafeguard BattleScript_SafeguardProtected
- seteffectprimary MOVE_EFFECT_CONFUSION
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_CONFUSION
goto BattleScript_MoveEnd
+BattleScript_EffectDarkVoid::
+.if B_DARK_VOID_FAIL >= GEN_7
+ jumpifspecies SPECIES_DARKRAI, BattleScript_EffectNonVolatileStatus
+ goto BattleScript_PokemonCantUseTheMove
+.endif
BattleScript_EffectNonVolatileStatus::
attackcanceler
- attackstring
- ppreduce
trynonvolatilestatus
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
- setnonvolatilestatus
+ setnonvolatilestatus TRIGGER_ON_MOVE
+ clearmoveresultflags MOVE_RESULT_NOT_VERY_EFFECTIVE | MOVE_RESULT_SUPER_EFFECTIVE
resultmessage
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_AlreadyBurned::
- setalreadystatusedmoveattempt BS_ATTACKER
+ setalreadystatusedmoveattempt
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNALREADYHASBURN
waitmessage B_WAIT_TIME_LONG
@@ -4711,28 +3974,22 @@ BattleScript_AlreadyBurned::
BattleScript_EffectMemento::
attackcanceler
jumpifbyte CMP_EQUAL, cMISS_TYPE, B_MSG_PROTECTED, BattleScript_MementoTargetProtect
- attackstring
- ppreduce
trymemento BattleScript_ButItFailed
setatkhptozero
attackanimation
waitanimation
jumpifsubstituteblocks BattleScript_EffectMementoPrintNoEffect
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk
-@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
- jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTrySpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTrySpAtk, BIT_SPATK
+@ Greater than B_MSG_DEFENDER_STAT_CHANGED is checking if the stat cannot decrease
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_CHANGED, BattleScript_EffectMementoTrySpAtk
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMementoTrySpAtk:
- playstatchangeanimation BS_TARGET, BIT_SPATK, STAT_CHANGE_NEGATIVE | STAT_CHANGE_BY_TWO
setstatchanger STAT_SPATK, 2, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint
-@ Greater than B_MSG_DEFENDER_STAT_FELL is checking if the stat cannot decrease
- jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_EffectMementoTryFaint
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectMementoTryFaint
+@ Greater than B_MSG_DEFENDER_STAT_CHANGED is checking if the stat cannot decrease
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_CHANGED, BattleScript_EffectMementoTryFaint
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectMementoTryFaint:
@@ -4744,8 +4001,6 @@ BattleScript_EffectMementoPrintNoEffect:
goto BattleScript_EffectMementoTryFaint
@ If the target is protected there's no need to check the target's stats or animate, the user will just faint
BattleScript_MementoTargetProtect:
- attackstring
- ppreduce
trymemento BattleScript_MementoTargetProtectEnd
BattleScript_MementoTargetProtectEnd:
setatkhptozero
@@ -4759,18 +4014,12 @@ BattleScript_MementoTargetProtectEnd:
BattleScript_EffectFocusPunch::
attackcanceler
jumpifnodamage BattleScript_HitFromAccCheck
- ppreduce
printstring STRINGID_PKMNLOSTFOCUS
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_EffectFollowMe::
attackcanceler
- attackstring
- ppreduce
- .if B_UPDATED_MOVE_DATA >= GEN_8
- jumpifnotbattletype BATTLE_TYPE_DOUBLE, BattleScript_ButItFailed
- .endif
setforcedtarget
attackanimation
waitanimation
@@ -4778,28 +4027,15 @@ BattleScript_EffectFollowMe::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_EffectNaturePower::
- attackcanceler
- attackstring
- pause B_WAIT_TIME_SHORT
- callenvironmentattack
- printstring STRINGID_NATUREPOWERTURNEDINTO
- waitmessage B_WAIT_TIME_LONG
- return
-
BattleScript_EffectCharge::
attackcanceler
- attackstring
- ppreduce
- setcharge BS_ATTACKER
+ setvolatile BS_ATTACKER, VOLATILE_CHARGE_TIMER, 2
attackanimation
waitanimation
.if B_CHARGE_SPDEF_RAISE >= GEN_5
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectChargeString
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectChargeString
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectChargeString
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectChargeString
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectChargeString:
@@ -4810,8 +4046,6 @@ BattleScript_EffectChargeString:
BattleScript_EffectTaunt::
attackcanceler
- attackstring
- ppreduce
jumpifability BS_TARGET_SIDE, ABILITY_AROMA_VEIL, BattleScript_AromaVeilProtects
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
settaunt BattleScript_ButItFailed
@@ -4823,8 +4057,6 @@ BattleScript_EffectTaunt::
BattleScript_EffectHelpingHand::
attackcanceler
- attackstring
- ppreduce
trysethelpinghand BattleScript_ButItFailed
attackanimation
waitanimation
@@ -4834,8 +4066,6 @@ BattleScript_EffectHelpingHand::
BattleScript_EffectTrick::
attackcanceler
- attackstring
- ppreduce
jumpifsubstituteblocks BattleScript_ButItFailed
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
tryswapitems BattleScript_ButItFailed
@@ -4849,16 +4079,12 @@ BattleScript_EffectTrick::
BattleScript_EffectRolePlay::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
trycopyability BS_ATTACKER, BattleScript_ButItFailed
attackanimation
waitanimation
-.if B_ABILITY_POP_UP == TRUE
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
recordability BS_ATTACKER
printstring STRINGID_PKMNCOPIEDFOE
waitmessage B_WAIT_TIME_LONG
@@ -4867,26 +4093,14 @@ BattleScript_EffectRolePlay::
BattleScript_EffectWish::
attackcanceler
- attackstring
- ppreduce
trywish BattleScript_ButItFailed
attackanimation
waitanimation
goto BattleScript_MoveEnd
-BattleScript_EffectAssist::
- attackcanceler
- attackstring
- assistattackselect BattleScript_FailedFromPpReduce
- attackanimation
- waitanimation
- jumptocalledmove TRUE
-
BattleScript_EffectIngrain::
attackcanceler
- attackstring
- ppreduce
- setuserstatus3 STATUS3_ROOTED, BattleScript_ButItFailed
+ trysetvolatile BS_ATTACKER, VOLATILE_ROOT, BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNPLANTEDROOTS
@@ -4895,9 +4109,7 @@ BattleScript_EffectIngrain::
BattleScript_EffectMagicCoat::
attackcanceler
- trysetmagiccoat BattleScript_FailedFromAtkString
- attackstring
- ppreduce
+ trysetmagiccoat BattleScript_ButItFailed
attackanimation
waitanimation
printstring STRINGID_PKMNSHROUDEDITSELF
@@ -4906,8 +4118,6 @@ BattleScript_EffectMagicCoat::
BattleScript_EffectRecycle::
attackcanceler
- attackstring
- ppreduce
tryrecycleitem BattleScript_ButItFailed
attackanimation
waitanimation
@@ -4917,9 +4127,7 @@ BattleScript_EffectRecycle::
BattleScript_EffectBrickBreak::
attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
removescreens
critcalc
@@ -4938,30 +4146,32 @@ BattleScript_BrickBreakDoHit::
effectivenesssound
hitanimation BS_TARGET
waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
+ datahpupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
critmessage
waitmessage B_WAIT_TIME_LONG
resultmessage
waitmessage B_WAIT_TIME_LONG
- setadditionaleffects
tryfaintmon BS_TARGET
+ setadditionaleffects
goto BattleScript_MoveEnd
BattleScript_EffectYawn::
attackcanceler
- attackstring
- ppreduce
trynonvolatilestatus
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
setyawn BattleScript_ButItFailed
attackanimation
waitanimation
-BattleScript_EffectYawnSuccess::
printstring STRINGID_PKMNWASMADEDROWSY
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
+BattleScript_MoveEffectYawnSide::
+ printstring STRINGID_PKMNWASMADEDROWSY
+ waitmessage B_WAIT_TIME_LONG
+ return
+
BattleScript_PrintAbilityMadeIneffective::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
@@ -4971,8 +4181,6 @@ BattleScript_PrintAbilityMadeIneffective::
BattleScript_EffectEndeavor::
attackcanceler
- attackstring
- ppreduce
setdamagetohealthdifference BattleScript_ButItFailed
accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
typecalc
@@ -4983,20 +4191,16 @@ BattleScript_EffectEndeavor::
BattleScript_EffectSkillSwap::
attackcanceler
- attackstring
- ppreduce
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
tryswapabilities BattleScript_ButItFailed
attackanimation
waitanimation
jumpiftargetally BattleScript_EffectSkillSwap_AfterAbilityPopUp
-.if B_ABILITY_POP_UP == TRUE
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUpOverwriteThenNormal
copybyte gBattlerAbility, gBattlerTarget
copyhword sABILITY_OVERWRITE, gLastUsedAbility
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
BattleScript_EffectSkillSwap_AfterAbilityPopUp:
recordability BS_ATTACKER
recordability BS_TARGET
@@ -5010,8 +4214,6 @@ BattleScript_EffectSkillSwap_AfterAbilityPopUp:
BattleScript_EffectImprison::
attackcanceler
- attackstring
- ppreduce
tryimprison BattleScript_ButItFailed
attackanimation
waitanimation
@@ -5021,8 +4223,6 @@ BattleScript_EffectImprison::
BattleScript_EffectRefresh::
attackcanceler
- attackstring
- ppreduce
curestatuswithmove BattleScript_ButItFailed
attackanimation
waitanimation
@@ -5033,9 +4233,8 @@ BattleScript_EffectRefresh::
BattleScript_EffectGrudge::
attackcanceler
- attackstring
- ppreduce
- setuserstatus3 STATUS3_GRUDGE, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_GRUDGE, BattleScript_ButItFailed
+ setvolatile BS_ATTACKER, VOLATILE_GRUDGE, 2
attackanimation
waitanimation
printstring STRINGID_PKMNWANTSGRUDGE
@@ -5044,9 +4243,7 @@ BattleScript_EffectGrudge::
BattleScript_EffectSnatch::
attackcanceler
- trysetsnatch BattleScript_FailedFromAtkString
- attackstring
- ppreduce
+ trysetsnatch BattleScript_ButItFailed
attackanimation
waitanimation
pause B_WAIT_TIME_SHORT
@@ -5062,8 +4259,6 @@ BattleScript_EffectStruggle::
BattleScript_EffectMudSport::
BattleScript_EffectWaterSport::
attackcanceler
- attackstring
- ppreduce
settypebasedhalvers BattleScript_ButItFailed
attackanimation
waitanimation
@@ -5073,27 +4268,21 @@ BattleScript_EffectWaterSport::
BattleScript_EffectTickle::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_ATK, MIN_STAT_STAGE, BattleScript_TickleDoMoveAnim
jumpifstat BS_TARGET, CMP_EQUAL, STAT_DEF, MIN_STAT_STAGE, BattleScript_CantLowerMultipleStats
BattleScript_TickleDoMoveAnim::
accuracycheck BattleScript_ButItFailed, ACC_CURR_MOVE
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_TARGET, BIT_ATK, STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleTryLowerDef
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TickleTryLowerDef, BIT_DEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_TickleTryLowerDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TickleTryLowerDef::
- playstatchangeanimation BS_TARGET, BIT_DEF, STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_TickleEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TickleEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_TickleEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_TickleEnd::
@@ -5108,24 +4297,20 @@ BattleScript_CantLowerMultipleStats::
BattleScript_EffectCosmicPower::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_CosmicPowerDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_CosmicPowerDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, 0
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerTrySpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CosmicPowerTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CosmicPowerTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CosmicPowerEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CosmicPowerEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CosmicPowerEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CosmicPowerEnd::
@@ -5133,24 +4318,20 @@ BattleScript_CosmicPowerEnd::
BattleScript_EffectBulkUp::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_BulkUpDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_DEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_BulkUpDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpTryDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpTryDef, BIT_DEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_BulkUpTryDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_BulkUpTryDef::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_BulkUpEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_BulkUpEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_BulkUpEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_BulkUpEnd::
@@ -5158,8 +4339,6 @@ BattleScript_BulkUpEnd::
BattleScript_EffectCalmMind::
attackcanceler
- attackstring
- ppreduce
BattleScript_CalmMindTryToRaiseStats::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_CalmMindDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
@@ -5167,17 +4346,15 @@ BattleScript_CalmMindDoMoveAnim::
attackanimation
waitanimation
BattleScript_CalmMindStatRaise::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindTrySpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CalmMindTrySpDef
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CalmMindTrySpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CalmMindEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CalmMindEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CalmMindEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CalmMindEnd::
@@ -5192,25 +4369,21 @@ BattleScript_CantRaiseMultipleStats::
BattleScript_EffectDragonDance::
attackcanceler
- attackstring
- ppreduce
BattleScript_EffectDragonDanceFromStatUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_DragonDanceDoMoveAnim
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_CantRaiseMultipleStats
BattleScript_DragonDanceDoMoveAnim::
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_SPEED, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DragonDanceTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DragonDanceTrySpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DragonDanceEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_DragonDanceEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DragonDanceEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DragonDanceEnd::
@@ -5218,8 +4391,6 @@ BattleScript_DragonDanceEnd::
BattleScript_EffectCamouflage::
attackcanceler
- attackstring
- ppreduce
settypetoenvironment BattleScript_ButItFailed
attackanimation
waitanimation
@@ -5227,31 +4398,22 @@ BattleScript_EffectCamouflage::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_FaintAttacker::
- tryillusionoff BS_ATTACKER
- tryactivategulpmissile
- playfaintcry BS_ATTACKER
- pause B_WAIT_TIME_LONG
- dofaintanimation BS_ATTACKER
- printstring STRINGID_ATTACKERFAINTED
- cleareffectsonfaint BS_ATTACKER
- tryactivatesoulheart
- tryactivatereceiver BS_ATTACKER
- trytrainerslidefirstdownmsg BS_ATTACKER
- return
-
-BattleScript_FaintTarget::
- tryillusionoff BS_TARGET
+BattleScript_FaintBattler::
+ tryillusionoff BS_FAINTED
tryactivategulpmissile
- tryupdateleaderscresttracker
- playfaintcry BS_TARGET
+ playfaintcry BS_FAINTED
pause B_WAIT_TIME_LONG
- dofaintanimation BS_TARGET
- printstring STRINGID_TARGETFAINTED
- cleareffectsonfaint BS_TARGET
+ dofaintanimation BS_FAINTED
+ copybyte sBATTLER, gBattlerFainted @ for message
+ printstring STRINGID_BATTLERFAINTED
+ cleareffectsonfaint BS_FAINTED
+ trytoclearprimalweather
+ tryrevertweatherform
+ flushtextbox
+ waitanimation
+ tryactivatereceiver BS_FAINTED
tryactivatesoulheart
- tryactivatereceiver BS_TARGET
- trytrainerslidefirstdownmsg BS_TARGET
+ trytrainerslidemsgfirstoff BS_FAINTED
return
BattleScript_GiveExp::
@@ -5297,7 +4459,7 @@ BattleScript_FaintedMonTryChoose:
jumpifbyte CMP_EQUAL, gBattleCommunication, PARTY_SIZE, BattleScript_FaintedMonSendOutNew
@ Switch PokΓ©mon before opponent
atknameinbuff1
- resetswitchinabilitybits BS_ATTACKER
+ resetswitchinabilitybits
hpthresholds2 BS_ATTACKER
printstring STRINGID_RETURNMON
switchoutabilities BS_ATTACKER
@@ -5327,7 +4489,7 @@ BattleScript_FaintedMonSendOutNew:
switchinanim BS_FAINTED, FALSE, FALSE
waitstate
resetplayerfainted
- trytrainerslidelastonmsg BS_FAINTED
+ trytrainerslidemsglaston BS_FAINTED
jumpifbytenotequal sSHIFT_SWITCHED, sZero, BattleScript_FaintedMonShiftSwitched
BattleScript_FaintedMonSendOutNewEnd:
switchineffects BS_FAINTED
@@ -5392,32 +4554,32 @@ BattleScript_PayDayMoneyAndPickUpItems::
end2
BattleScript_LocalBattleLost::
- jumpifbattletype BATTLE_TYPE_INGAME_PARTNER, BattleScript_LocalBattleLostPrintWhiteOut
jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
jumpifbattletype BATTLE_TYPE_FRONTIER, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_TRAINER_HILL, BattleScript_LocalBattleLostPrintTrainersWinText
jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
jumpifhalfword CMP_EQUAL, gTrainerBattleParameter + 2, TRAINER_SECRET_BASE, BattleScript_LocalBattleLostEnd
jumpifnowhiteout BattleScript_LocalBattleLostEnd_
+ jumpifbattletype BATTLE_TYPE_INGAME_PARTNER, BattleScript_LocalBattleLostPrintWhiteOut
BattleScript_LocalBattleLostPrintWhiteOut::
getmoneyreward
+ printstring STRINGID_PLAYERWHITEOUT
+ waitmessage B_WAIT_TIME_LONG
.if B_WHITEOUT_MONEY >= GEN_4
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostEnd
- printstring STRINGID_PLAYERWHITEOUT
+ printstring STRINGID_PLAYERWHITEOUT2_WILD
waitmessage B_WAIT_TIME_LONG
- printstring STRINGID_PLAYERWHITEOUT2
+ printstring STRINGID_PLAYERWHITEOUT3
waitmessage B_WAIT_TIME_LONG
end2
BattleScript_LocalBattleLostEnd::
- printstring STRINGID_PLAYERLOSTTOENEMYTRAINER
+ printstring STRINGID_PLAYERWHITEOUT2_TRAINER
waitmessage B_WAIT_TIME_LONG
- printstring STRINGID_PLAYERPAIDPRIZEMONEY
+ printstring STRINGID_PLAYERWHITEOUT3
waitmessage B_WAIT_TIME_LONG
end2
.else
- printstring STRINGID_PLAYERWHITEOUT
- waitmessage B_WAIT_TIME_LONG
- printstring STRINGID_PLAYERWHITEOUT2
+ printstring STRINGID_PLAYERWHITEOUT3
waitmessage B_WAIT_TIME_LONG
BattleScript_LocalBattleLostEnd::
end2
@@ -5427,9 +4589,9 @@ BattleScript_CheckDomeDrew::
jumpifbyte CMP_EQUAL, gBattleOutcome, B_OUTCOME_DREW, BattleScript_LocalBattleLostEnd_
BattleScript_LocalBattleLostPrintTrainersWinText::
jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_LocalBattleLostPrintWhiteOut
- returnopponentmon1toball BS_ATTACKER
+ returnopponentmon1toball
waitstate
- returnopponentmon2toball BS_ATTACKER
+ returnopponentmon2toball
waitstate
trainerslidein BS_OPPONENT1
waitstate
@@ -5446,9 +4608,9 @@ BattleScript_LocalBattleLostEnd_::
end2
BattleScript_FrontierLinkBattleLost::
- returnopponentmon1toball BS_ATTACKER
+ returnopponentmon1toball
waitstate
- returnopponentmon2toball BS_ATTACKER
+ returnopponentmon2toball
waitstate
trainerslidein BS_OPPONENT1
waitstate
@@ -5475,7 +4637,7 @@ BattleScript_LinkBattleWonOrLostWaitEnd::
end2
BattleScript_TowerLinkBattleWon::
- playtrainerdefeatbgm BS_ATTACKER
+ playtrainerdefeatedmusic
printstring STRINGID_BATTLEEND
waitmessage B_WAIT_TIME_LONG
trainerslidein BS_OPPONENT1
@@ -5560,11 +4722,11 @@ BattleScript_ActionSwitch::
end2
BattleScript_DoSwitchOut::
- switchoutabilities BS_ATTACKER
undodynamax BS_ATTACKER
waitstate
returnatktoball
waitstate
+ switchoutabilities BS_ATTACKER
drawpartystatussummary BS_ATTACKER
switchhandleorder BS_ATTACKER, 1
getswitchedmondata BS_ATTACKER
@@ -5602,10 +4764,12 @@ BattleScript_AskToLearnMove::
waitstate
setbyte sLEARNMOVE_STATE, 0
yesnoboxlearnmove BattleScript_ForgotAndLearnedNewMove
+.if P_ASK_MOVE_CONFIRMATION == TRUE
printstring STRINGID_STOPLEARNINGMOVE
waitstate
setbyte sLEARNMOVE_STATE, 0
yesnoboxstoplearningmove BattleScript_AskToLearnMove
+.endif
printstring STRINGID_DIDNOTLEARNMOVE
goto BattleScript_TryLearnMoveLoop
BattleScript_ForgotAndLearnedNewMove::
@@ -5617,7 +4781,7 @@ BattleScript_LearnedNewMove::
fanfare MUS_LEVEL_UP
printstring STRINGID_PKMNLEARNEDMOVE
waitmessage B_WAIT_TIME_LONG
- updatechoicemoveonlvlup BS_ATTACKER
+ updatechoicemoveonlvlup
goto BattleScript_TryLearnMoveLoop
BattleScript_LearnMoveReturn::
return
@@ -5652,11 +4816,11 @@ BattleScript_FogEnded_Ret::
BattleScript_IceBodyHeal::
call BattleScript_AbilityPopUp
playanimation BS_ATTACKER, B_ANIM_SIMPLE_HEAL
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_ICEBODYHPGAIN
waitmessage B_WAIT_TIME_LONG
- end3
+ end2
BattleScript_OverworldStatusStarts::
printfromtable gStartingStatusStringIds
@@ -5720,7 +4884,7 @@ BattleScript_MagicRoomEnds::
setbyte gBattlerTarget, 0
BattleScript_MagicRoomHealingItemsLoop:
copyarraywithindex gBattlerAttacker, gBattlerByTurnOrder, gBattlerTarget, 1
- tryrestorehpberry
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_USABLE_AGAIN
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_MagicRoomHealingItemsLoop
end2
@@ -5729,6 +4893,7 @@ BattleScript_TerrainEnds_Ret::
printfromtable gTerrainStringIds
waitmessage B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
+ tryboosterenergy ON_TERRAIN
return
BattleScript_TerrainEnds::
@@ -5770,17 +4935,19 @@ BattleScript_LeechSeedTurnDrainLiquidOoze::
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
copybyte gBattlerAttacker, gBattlerTarget @ needed to get liquid ooze message correct
+ jumpifability BS_TARGET, ABILITY_MAGIC_GUARD, BattleScript_LeechSeedTurnDrainHealBlockEnd2
goto BattleScript_LeechSeedTurnDrainGainHp
BattleScript_LeechSeedTurnDrainHealBlock::
call BattleScript_LeechSeedTurnDrain
+BattleScript_LeechSeedTurnDrainHealBlockEnd2:
end2
BattleScript_LeechSeedTurnDrainRecovery::
call BattleScript_LeechSeedTurnDrain
BattleScript_LeechSeedTurnDrainGainHp:
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printfromtable gLeechSeedStringIds
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_TARGET
@@ -5788,8 +4955,8 @@ BattleScript_LeechSeedTurnDrainGainHp:
BattleScript_LeechSeedTurnDrain:
playanimation BS_ATTACKER, B_ANIM_LEECH_SEED_DRAIN, sB_ANIM_ARG1
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
return
@@ -5800,7 +4967,7 @@ BattleScript_BideStoringEnergy::
BattleScript_BideAttack::
attackcanceler
- clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
+ clearvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage B_WAIT_TIME_LONG
accuracycheck BattleScript_MoveMissed, ACC_CURR_MOVE
@@ -5814,8 +4981,8 @@ BattleScript_BideAttack::
effectivenesssound
hitanimation BS_TARGET
waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
+ datahpupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
resultmessage
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_TARGET
@@ -5823,7 +4990,7 @@ BattleScript_BideAttack::
BattleScript_BideNoEnergyToAttack::
attackcanceler
- clearstatusfromeffect BS_ATTACKER, MOVE_EFFECT_CHARGING
+ clearvolatile BS_ATTACKER, VOLATILE_MULTIPLETURNS
printstring STRINGID_PKMNUNLEASHEDENERGY
waitmessage B_WAIT_TIME_LONG
goto BattleScript_ButItFailed
@@ -5851,7 +5018,7 @@ BattleScript_RoarSuccessSwitch_Ret:
BattleScript_RoarSuccessEndBattle::
call BattleScript_RoarSuccessRet
setbyte sSWITCH_CASE, B_SWITCH_NORMAL
- setoutcomeonteleport BS_ATTACKER
+ setteleportoutcome BS_ATTACKER
finishaction
BattleScript_RoarSuccessRet:
@@ -5860,9 +5027,9 @@ BattleScript_RoarSuccessRet:
attackanimation
waitanimation
BattleScript_RoarSuccessRet_Ret:
- switchoutabilities BS_TARGET
returntoball BS_TARGET, FALSE
waitstate
+ switchoutabilities BS_TARGET
return
BattleScript_WeaknessPolicy::
@@ -5872,17 +5039,15 @@ BattleScript_WeaknessPolicy::
BattleScript_WeaknessPolicyAtk:
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_TARGET, BIT_ATK | BIT_SPATK, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicySpAtk
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicySpAtk, BIT_SPATK
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_WeaknessPolicySpAtk
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
BattleScript_WeaknessPolicySpAtk:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeaknessPolicyRemoveItem
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_WeaknessPolicyRemoveItem
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_WeaknessPolicyRemoveItem
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
BattleScript_WeaknessPolicyRemoveItem:
@@ -5892,13 +5057,11 @@ BattleScript_WeaknessPolicyEnd:
BattleScript_TargetItemStatRaise::
copybyte sBATTLER, gBattlerTarget
- statbuffchange 0, BattleScript_TargetItemStatRaiseRemoveItemRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_TargetItemStatRaiseRemoveItemRet
+ statbuffchange BS_TARGET, STAT_CHANGE_ONLY_CHECKING, BattleScript_TargetItemStatRaiseRemoveItemRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_TargetItemStatRaiseRemoveItemRet
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
+ statbuffchange BS_TARGET, 0, BattleScript_TargetItemStatRaiseRemoveItemRet
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
removeitem BS_TARGET
@@ -5907,13 +5070,11 @@ BattleScript_TargetItemStatRaiseRemoveItemRet:
BattleScript_AttackerItemStatRaise::
copybyte sBATTLER, gBattlerAttacker
- statbuffchange MOVE_EFFECT_AFFECTS_USER, BattleScript_AttackerItemStatRaiseRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, 0x2, BattleScript_AttackerItemStatRaiseRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ONLY_CHECKING, BattleScript_AttackerItemStatRaiseRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AttackerItemStatRaiseRet
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
waitanimation
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
+ statbuffchange BS_ATTACKER, 0, BattleScript_AttackerItemStatRaiseRet
printstring STRINGID_USINGITEMSTATOFPKMNROSE
waitmessage B_WAIT_TIME_LONG
removeitem BS_ATTACKER
@@ -5927,7 +5088,7 @@ BattleScript_MistProtected::
return
BattleScript_RageIsBuilding::
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RageIsBuildingEnd
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_RageIsBuildingEnd
printstring STRINGID_PKMNRAGEBUILDING
waitmessage B_WAIT_TIME_LONG
BattleScript_RageIsBuildingEnd:
@@ -5949,6 +5110,14 @@ BattleScript_DisabledNoMore::
BattleScript_SelectingDisabledMoveInPalace::
printstring STRINGID_PKMNMOVEISDISABLED
+ goto BattleScript_SelectingUnusableMoveInPalace
+
+BattleScript_EncoredMove::
+ printselectionstring STRINGID_PKMNGOTENCOREDMOVE
+ endselectionscript
+
+BattleScript_EncoredMoveInPalace::
+ printselectionstring STRINGID_PKMNGOTENCOREDMOVE
BattleScript_SelectingUnusableMoveInPalace::
moveendto MOVEEND_NEXT_TARGET
end
@@ -5961,16 +5130,14 @@ BattleScript_EncoredNoMore::
BattleScript_DestinyBondTakesLife::
printstring STRINGID_PKMNTOOKFOE
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
return
BattleScript_DmgHazardsOnAttacker::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
call BattleScript_PrintHurtByDmgHazards
tryfaintmon BS_ATTACKER
tryfaintmon_spikes BS_ATTACKER, BattleScript_DmgHazardsOnAttackerFainted
@@ -5983,9 +5150,8 @@ BattleScript_DmgHazardsOnAttackerFainted::
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnTarget::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
call BattleScript_PrintHurtByDmgHazards
tryfaintmon BS_TARGET
tryfaintmon_spikes BS_TARGET, BattleScript_DmgHazardsOnTargetFainted
@@ -5998,9 +5164,8 @@ BattleScript_DmgHazardsOnTargetFainted::
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnBattlerScripting::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
call BattleScript_PrintHurtByDmgHazards
tryfaintmon BS_SCRIPTING
tryfaintmon_spikes BS_SCRIPTING, BattleScript_DmgHazardsOnBattlerScriptingFainted
@@ -6013,9 +5178,8 @@ BattleScript_DmgHazardsOnBattlerScriptingFainted::
goto BattleScript_HandleFaintedMon
BattleScript_DmgHazardsOnFaintedBattler::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_FAINTED
- datahpupdate BS_FAINTED
+ healthbarupdate BS_FAINTED, PASSIVE_HP_UPDATE
+ datahpupdate BS_FAINTED, PASSIVE_HP_UPDATE
call BattleScript_PrintHurtByDmgHazards
tryfaintmon BS_FAINTED
tryfaintmon_spikes BS_FAINTED, BattleScript_DmgHazardsOnFaintedBattlerFainted
@@ -6061,15 +5225,8 @@ BattleScript_StickyWebOnSwitchIn::
printstring STRINGID_STICKYWEBSWITCHIN
waitmessage B_WAIT_TIME_LONG
jumpifability BS_TARGET, ABILITY_MIRROR_ARMOR, BattleScript_MirrorArmorReflectStickyWeb
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_StickyWebOnSwitchInStatAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_StickyWebOnSwitchInEnd
- pause B_WAIT_TIME_SHORT
- goto BattleScript_StickyWebOnSwitchInPrintStatMsg
-BattleScript_StickyWebOnSwitchInStatAnim:
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
-BattleScript_StickyWebOnSwitchInPrintStatMsg:
+ statbuffchange BS_TARGET, STAT_CHANGE_CHECK_PREVENTION | STAT_CHANGE_ALLOW_PTR, BattleScript_StickyWebOnSwitchInEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_StickyWebOnSwitchInEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_StickyWebOnSwitchInEnd:
@@ -6081,9 +5238,8 @@ BattleScript_StickyWebOnSwitchInEnd:
BattleScript_PerishSongTakesLife::
printstring STRINGID_PKMNPERISHCOUNTFELL
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
end2
@@ -6091,20 +5247,18 @@ BattleScript_PerishBodyActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSWILLPERISHIN3TURNS
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
return
BattleScript_GulpMissileGorging::
call BattleScript_AbilityPopUp
playanimation BS_ATTACKER, B_ANIM_GULP_MISSILE
waitanimation
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
effectivenesssound
hitanimation BS_ATTACKER
waitstate
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_GulpMissileNoDmgGorging
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
jumpiffainted BS_ATTACKER, TRUE, BattleScript_GulpMissileNoSecondEffectGorging
BattleScript_GulpMissileNoDmgGorging:
@@ -6112,7 +5266,7 @@ BattleScript_GulpMissileNoDmgGorging:
playanimation BS_TARGET, B_ANIM_FORM_CHANGE
waitanimation
swapattackerwithtarget
- seteffectprimary MOVE_EFFECT_PARALYSIS
+ seteffectprimary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_PARALYSIS
swapattackerwithtarget
return
BattleScript_GulpMissileNoSecondEffectGorging:
@@ -6125,13 +5279,12 @@ BattleScript_GulpMissileGulping::
call BattleScript_AbilityPopUp
playanimation BS_ATTACKER, B_ANIM_GULP_MISSILE
waitanimation
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
effectivenesssound
hitanimation BS_ATTACKER
waitstate
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_GulpMissileNoDmgGulping
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
jumpiffainted BS_ATTACKER, TRUE, BattleScript_GulpMissileNoSecondEffectGulping
BattleScript_GulpMissileNoDmgGulping:
@@ -6140,12 +5293,10 @@ BattleScript_GulpMissileNoDmgGulping:
waitanimation
swapattackerwithtarget @ to make gStatDownStringIds down below print the right battler
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_GulpMissileGulpingEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_GulpMissileGulpingTargetDefenseCantGoLower
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_GulpMissileGulpingEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
+BattleScript_GulpMissileGulpingEnd:
swapattackerwithtarget @ restore the battlers, just in case
return
BattleScript_GulpMissileNoSecondEffectGulping:
@@ -6153,12 +5304,6 @@ BattleScript_GulpMissileNoSecondEffectGulping:
playanimation BS_TARGET, B_ANIM_FORM_CHANGE
waitanimation
return
-BattleScript_GulpMissileGulpingTargetDefenseCantGoLower:
- printstring STRINGID_STATSWONTDECREASE
- waitmessage B_WAIT_TIME_LONG
-BattleScript_GulpMissileGulpingEnd:
- swapattackerwithtarget @ restore the battlers, just in case
- return
BattleScript_SeedSowerActivates::
pause B_WAIT_TIME_SHORT
@@ -6169,34 +5314,39 @@ BattleScript_SeedSowerActivates::
call BattleScript_ActivateTerrainEffects
return
-BattleScript_AngerShellActivates::
+BattleScript_BerserkActivates::
saveattacker
- copybyte gBattlerAttacker, gBattlerTarget
+ copybyte gBattlerAttacker, gEffectBattler
+ call BattleScript_AbilityPopUp
+ statbuffchange BS_EFFECT_BATTLER, STAT_CHANGE_CERTAIN, BattleScript_BerserkActivatesTryBerry
+ call BattleScript_StatUp
+BattleScript_BerserkActivatesTryBerry:
+ restoreattacker
+ return
+
+BattleScript_AngerShellActivates::
call BattleScript_AbilityPopUp
- jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
- jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
- jumpifstat BS_TARGET, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
- jumpifstat BS_TARGET, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_AngerShellTryDef
- jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_RestoreAttackerButItFailed
+ jumpifstat BS_EFFECT_BATTLER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
+ jumpifstat BS_EFFECT_BATTLER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
+ jumpifstat BS_EFFECT_BATTLER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_AngerShellTryDef
+ jumpifstat BS_EFFECT_BATTLER, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_AngerShellTryDef
+ jumpifstat BS_EFFECT_BATTLER, CMP_EQUAL, STAT_SPDEF, MIN_STAT_STAGE, BattleScript_RestoreAttackerButItFailed
BattleScript_AngerShellTryDef::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- modifybattlerstatstage BS_ATTACKER, STAT_DEF, DECREASE, 1, BattleScript_AngerShellTrySpDef, ANIM_ON
+ modifybattlerstatstage BS_EFFECT_BATTLER, STAT_DEF, DECREASE, 1, BattleScript_AngerShellTrySpDef, ANIM_ON
BattleScript_AngerShellTrySpDef:
- modifybattlerstatstage BS_ATTACKER, STAT_SPDEF, DECREASE, 1, BattleScript_AngerShellTryAttack, ANIM_ON
+ modifybattlerstatstage BS_EFFECT_BATTLER, STAT_SPDEF, DECREASE, 1, BattleScript_AngerShellTryAttack, ANIM_ON
BattleScript_AngerShellTryAttack:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- modifybattlerstatstage BS_ATTACKER, STAT_ATK, INCREASE, 1, BattleScript_AngerShellTrySpAtk, ANIM_ON
+ modifybattlerstatstage BS_EFFECT_BATTLER, STAT_ATK, INCREASE, 1, BattleScript_AngerShellTrySpAtk, ANIM_ON
BattleScript_AngerShellTrySpAtk:
- modifybattlerstatstage BS_ATTACKER, STAT_SPATK, INCREASE, 1, BattleScript_AngerShellTrySpeed, ANIM_ON
+ modifybattlerstatstage BS_EFFECT_BATTLER, STAT_SPATK, INCREASE, 1, BattleScript_AngerShellTrySpeed, ANIM_ON
BattleScript_AngerShellTrySpeed:
- modifybattlerstatstage BS_ATTACKER, STAT_SPEED, INCREASE, 1, BattleScript_AngerShellRet, ANIM_ON
+ modifybattlerstatstage BS_EFFECT_BATTLER, STAT_SPEED, INCREASE, 1, BattleScript_AngerShellRet, ANIM_ON
BattleScript_AngerShellRet:
- restoreattacker
return
BattleScript_WindPowerActivates::
call BattleScript_AbilityPopUp
- setcharge BS_TARGET
+ setvolatile BS_TARGET, VOLATILE_CHARGE_TIMER, 1
printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER
waitmessage B_WAIT_TIME_LONG
return
@@ -6208,18 +5358,16 @@ BattleScript_ToxicDebrisActivates::
printstring STRINGID_POISONSPIKESSCATTERED
waitmessage B_WAIT_TIME_LONG
BattleScript_ToxicDebrisRet:
- copybyte sBATTLER, gBattlerTarget
- copybyte gBattlerTarget, gBattlerAttacker
- copybyte gBattlerAttacker, sBATTLER
+ restoretarget
+ restoreattacker
return
BattleScript_EarthEaterActivates::
call BattleScript_AbilityPopUp
pause B_WAIT_TIME_LONG
tryhealquarterhealth BS_TARGET, BattleScript_EarthEaterRet
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
BattleScript_EarthEaterRet:
@@ -6240,30 +5388,28 @@ BattleScript_AllStatsUp::
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPATK, MAX_STAT_STAGE, BattleScript_AllStatsUpAtk
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPDEF, MAX_STAT_STAGE, BattleScript_AllStatsUpRet
BattleScript_AllStatsUpAtk::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpDef, BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpDef::
setstatchanger STAT_DEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpeed, BIT_SPEED | BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpeed::
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpAtk, BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpAtk::
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpSpDef, BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpSpDef::
setstatchanger STAT_SPDEF, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_AllStatsUpRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AllStatsUpRet::
@@ -6284,58 +5430,18 @@ BattleScript_LeechSeedFree::
waitmessage B_WAIT_TIME_LONG
return
-BattleScript_SpikesFree::
- printstring STRINGID_PKMNBLEWAWAYSPIKES
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_ToxicSpikesFree::
- printstring STRINGID_PKMNBLEWAWAYTOXICSPIKES
+BattleScript_SpinHazardsAway::
+ printfromtable gSpinHazardsStringIds
waitmessage B_WAIT_TIME_LONG
return
-BattleScript_StickyWebFree::
- printstring STRINGID_PKMNBLEWAWAYSTICKYWEB
+BattleScript_DefogClearHazards::
+ printfromtable gDefogHazardsStringIds
waitmessage B_WAIT_TIME_LONG
return
-BattleScript_StealthRockFree::
- printstring STRINGID_PKMNBLEWAWAYSTEALTHROCK
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_SteelsurgeFree::
- printstring STRINGID_PKMNBLEWAWAYSHARPSTEEL
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_SpikesDefog::
- printstring STRINGID_SPIKESDISAPPEAREDFROMTEAM
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_ToxicSpikesDefog::
- printstring STRINGID_TOXICSPIKESDISAPPEAREDFROMTEAM
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_StickyWebDefog::
- printstring STRINGID_STICKYWEBDISAPPEAREDFROMTEAM
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_StealthRockDefog::
- printstring STRINGID_STEALTHROCKDISAPPEAREDFROMTEAM
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_SteelsurgeDefog::
- printstring STRINGID_SHARPSTEELDISAPPEAREDFROMTEAM
- waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_MonTookFutureAttack::
- printstring STRINGID_PKMNTOOKATTACK
+BattleScript_MonTookFutureAttack::
+ printstring STRINGID_PKMNTOOKATTACK
waitmessage B_WAIT_TIME_LONG
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_FUTURE_SIGHT, BattleScript_CheckDoomDesireMiss
accuracycheck BattleScript_FutureAttackMiss, MOVE_FUTURE_SIGHT
@@ -6356,8 +5462,8 @@ BattleScript_DoFutureAttackHit::
effectivenesssound
hitanimation BS_TARGET
waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
+ datahpupdate BS_TARGET, MOVE_DAMAGE_HP_UPDATE
critmessage
waitmessage B_WAIT_TIME_LONG
BattleScript_DoFutureAttackResult:
@@ -6366,17 +5472,21 @@ BattleScript_DoFutureAttackResult:
tryfaintmon BS_TARGET
checkteamslost BattleScript_FutureAttackEnd
BattleScript_FutureAttackEnd::
+ moveendcase MOVEEND_SET_VALUES
moveendcase MOVEEND_RAGE
moveendcase MOVEEND_ABILITIES
- moveendfromto MOVEEND_ITEM_EFFECTS_ALL, MOVEEND_UPDATE_LAST_MOVES
- setmoveresultflags 0
- end2
+ moveendcase MOVEEND_COLOR_CHANGE
+ moveendcase MOVEEND_ITEM_EFFECTS_TARGET
+ moveendfromto MOVEEND_SYMBIOSIS, MOVEEND_UPDATE_LAST_MOVES
+ goto BattleScript_FutureAttackClearResults
BattleScript_FutureAttackMiss::
pause B_WAIT_TIME_SHORT
setmoveresultflags MOVE_RESULT_FAILED
resultmessage
waitmessage B_WAIT_TIME_LONG
+BattleScript_FutureAttackClearResults:
setmoveresultflags 0
+ clearspecialstatuses
end2
BattleScript_NoMovesLeft::
@@ -6388,7 +5498,7 @@ BattleScript_SelectingMoveWithNoPP::
endselectionscript
BattleScript_NoPPForMove::
- attackstring
+ printattackstring
pause B_WAIT_TIME_SHORT
printstring STRINGID_BUTNOPPLEFT
waitmessage B_WAIT_TIME_LONG
@@ -6500,9 +5610,8 @@ BattleScript_WishComesTrue::
playanimation BS_TARGET, B_ANIM_WISH_HEAL
printstring STRINGID_PKMNWISHCAMETRUE
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
end2
@@ -6528,9 +5637,8 @@ BattleScript_IngrainTurnHeal::
printstring STRINGID_PKMNABSORBEDNUTRIENTS
BattleScript_TurnHeal:
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
end2
BattleScript_AquaRingHeal::
@@ -6551,38 +5659,29 @@ BattleScript_PrintMonIsRootedRet::
return
BattleScript_AtkDefDown::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_ATTACKER, BIT_ATK, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownTryDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownTryDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownTryDef, BIT_DEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_AtkDefDownTryDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefDownTryDef:
- playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_AtkDefDownRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_AtkDefDownRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_AtkDefDownRet:
return
BattleScript_DefSpDefDown::
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_DEF | BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE | STAT_CHANGE_MULTIPLE_STATS
- playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownTrySpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownTrySpDef, BIT_SPDEF
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DefSpDefDownTrySpDef
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefSpDefDownTrySpDef::
- playstatchangeanimation BS_ATTACKER, BIT_SPDEF, STAT_CHANGE_CANT_PREVENT | STAT_CHANGE_NEGATIVE
setstatchanger STAT_SPDEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_DefSpDefDownRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_DefSpDefDownRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DefSpDefDownRet
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefSpDefDownRet::
@@ -6592,17 +5691,15 @@ BattleScript_DefDownSpeedUp::
jumpifstat BS_ATTACKER, CMP_GREATER_THAN, STAT_DEF, MIN_STAT_STAGE, BattleScript_DefDownSpeedUpTryDef
jumpifstat BS_ATTACKER, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_DefDownSpeedUpRet
BattleScript_DefDownSpeedUpTryDef::
- playstatchangeanimation BS_ATTACKER, BIT_DEF, STAT_CHANGE_NEGATIVE | STAT_CHANGE_CANT_PREVENT
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DefDownSpeedUpTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_CERTAIN, BattleScript_DefDownSpeedUpTrySpeed
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DefDownSpeedUpTrySpeed
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefDownSpeedUpTrySpeed:
- playstatchangeanimation BS_ATTACKER, BIT_SPEED, 0
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR | MOVE_EFFECT_CERTAIN, BattleScript_DefDownSpeedUpRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_DefDownSpeedUpRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_CERTAIN, BattleScript_DefDownSpeedUpRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_DefDownSpeedUpRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_DefDownSpeedUpRet::
@@ -6633,31 +5730,21 @@ BattleScript_GrudgeTakesPp::
return
BattleScript_MagicBounce::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNMOVEBOUNCEDABILITY
waitmessage B_WAIT_TIME_LONG
setmagiccoattarget
- orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
- bicword gHitMarker, HITMARKER_NO_ATTACKSTRING
return
BattleScript_MagicCoat::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
setmagiccoattarget
printstring STRINGID_PKMNMOVEBOUNCED
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
- bicword gHitMarker, HITMARKER_NO_ATTACKSTRING
return
BattleScript_MagicCoatPrankster::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNMOVEBOUNCED
waitmessage B_WAIT_TIME_LONG
@@ -6667,13 +5754,10 @@ BattleScript_MagicCoatPrankster::
goto BattleScript_MoveEnd
BattleScript_SnatchedMove::
- attackstring
- ppreduce
snatchsetbattlers
playanimation BS_TARGET, B_ANIM_SNATCH_MOVE
printstring STRINGID_PKMNSNATCHEDMOVE
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED | HITMARKER_NO_PPDEDUCT | HITMARKER_ALLOW_NO_PP
swapattackerwithtarget
return
@@ -6743,16 +5827,15 @@ BattleScript_PowerConstruct::
flushtextbox
printstring STRINGID_POWERCONSTRUCTPRESENCEOFMANY
waitmessage B_WAIT_TIME_SHORT
- copybyte gBattlerAbility, gBattlerAttacker
- call BattleScript_AbilityPopUp
- handleformchange BS_ATTACKER, 0
- handleformchange BS_ATTACKER, 1
- playanimation BS_ATTACKER, B_ANIM_POWER_CONSTRUCT
+ call BattleScript_AbilityPopUpScripting
+ handleformchange BS_SCRIPTING, 0
+ handleformchange BS_SCRIPTING, 1
+ playanimation BS_SCRIPTING, B_ANIM_POWER_CONSTRUCT
waitanimation
- handleformchange BS_ATTACKER, 2
+ handleformchange BS_SCRIPTING, 2
printstring STRINGID_POWERCONSTRUCTTRANSFORM
waitmessage B_WAIT_TIME_SHORT
- end3
+ end2
BattleScript_UltraBurst::
flushtextbox
@@ -6769,51 +5852,44 @@ BattleScript_UltraBurst::
end3
BattleScript_GulpMissileFormChange::
- call BattleScript_AttackerFormChange
+ call BattleScript_BattlerFormChange
goto BattleScript_FromTwoTurnMovesSecondTurnRet
-BattleScript_AttackerFormChange::
+BattleScript_BattlerFormChange::
pause 5
- copybyte gBattlerAbility, gBattlerAttacker
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
flushtextbox
-BattleScript_AttackerFormChangeNoPopup::
- handleformchange BS_ATTACKER, 0
- handleformchange BS_ATTACKER, 1
- playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE
+BattleScript_BattlerFormChangeNoPopup:
+ handleformchange BS_SCRIPTING, 0
+ handleformchange BS_SCRIPTING, 1
+ playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
- handleformchange BS_ATTACKER, 2
+ handleformchange BS_SCRIPTING, 2
return
-BattleScript_AttackerFormChangeEnd3::
- call BattleScript_AttackerFormChange
+BattleScript_BattlerFormChangeEnd3::
+ call BattleScript_BattlerFormChange
end3
-BattleScript_AttackerFormChangeEnd3NoPopup::
- call BattleScript_AttackerFormChangeNoPopup
- end3
+BattleScript_BattlerFormChangeEnd3NoPopup::
+ call BattleScript_BattlerFormChangeNoPopup
+ end2
+
+BattleScript_BattlerFormChangeEnd2::
+ call BattleScript_BattlerFormChange
+ end2
-BattleScript_AttackerFormChangeWithString::
+BattleScript_BattlerFormChangeWithStringEnd3::
pause 5
- copybyte gBattlerAbility, gBattlerAttacker
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
flushtextbox
-BattleScript_AttackerFormChangeWithStringNoPopup::
- handleformchange BS_ATTACKER, 0
- handleformchange BS_ATTACKER, 1
- playanimation BS_ATTACKER, B_ANIM_FORM_CHANGE
+ handleformchange BS_SCRIPTING, 0
+ handleformchange BS_SCRIPTING, 1
+ playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
- handleformchange BS_ATTACKER, 2
+ handleformchange BS_SCRIPTING, 2
printstring STRINGID_PKMNTRANSFORMED
waitmessage B_WAIT_TIME_LONG
- return
-
-BattleScript_AttackerFormChangeWithStringEnd3::
- call BattleScript_AttackerFormChangeWithString
- end3
-
-BattleScript_AttackerFormChangeWithStringEnd3NoPopup::
- call BattleScript_AttackerFormChangeWithStringNoPopup
end3
BattleScript_AttackerFormChangeMoveEffect::
@@ -6832,7 +5908,7 @@ BattleScript_BallFetch::
call BattleScript_AbilityPopUp
printstring STRINGID_FETCHEDPOKEBALL
waitmessage B_WAIT_TIME_LONG
- end3
+ end2
BattleScript_CudChewActivates::
pause B_WAIT_TIME_SHORTEST
@@ -6840,13 +5916,13 @@ BattleScript_CudChewActivates::
setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
consumeberry BS_ATTACKER, FALSE
setbyte sBERRY_OVERRIDE, 0
- end3
+ end2
BattleScript_ApplyDisguiseFormChangeHPLoss::
-.if B_DISGUISE_HP_LOSS >= GEN_8
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
-.endif
+ jumpifgenconfiglowerthan CONFIG_DISGUISE_HP_LOSS, GEN_8, BattleScript_ApplyDisguiseFormChangeHPLossReturn
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+BattleScript_ApplyDisguiseFormChangeHPLossReturn:
return
BattleScript_TargetFormChangeNoPopup:
@@ -6879,19 +5955,6 @@ BattleScript_TargetFormChangeWithStringNoPopup::
waitmessage B_WAIT_TIME_LONG
return
-BattleScript_BattlerFormChangeWithStringEnd3::
- pause 5
- call BattleScript_AbilityPopUpScripting
- flushtextbox
- handleformchange BS_SCRIPTING, 0
- handleformchange BS_SCRIPTING, 1
- playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE, NULL
- waitanimation
- handleformchange BS_SCRIPTING, 2
- printstring STRINGID_PKMNTRANSFORMED
- waitmessage B_WAIT_TIME_LONG
- end3
-
BattleScript_IllusionOffAndTerastallization::
call BattleScript_IllusionOff
goto BattleScript_Terastallization
@@ -6901,12 +5964,14 @@ BattleScript_IllusionOffEnd3::
end3
BattleScript_IllusionOff::
- spriteignore0hp TRUE
+ setspriteignore0hp TRUE
+ call BattleScript_SwapFromSubstitute
playanimation BS_SCRIPTING, B_ANIM_ILLUSION_OFF
waitanimation
- updatenick BS_SCRIPTING
+ call BattleScript_SwapToSubstitute
+ updatenick
waitstate
- spriteignore0hp FALSE
+ setspriteignore0hp FALSE
printstring STRINGID_ILLUSIONWOREOFF
waitmessage B_WAIT_TIME_LONG
return
@@ -6918,13 +5983,11 @@ BattleScript_CottonDownActivates::
swapattackerwithtarget
setbyte gBattlerTarget, 0
BattleScript_CottonDownLoop:
- jumpiffainted BS_TARGET, TRUE, BattleScript_CottonDownLoopIncrement
+ jumpifabsent BS_TARGET, BattleScript_CottonDownLoopIncrement
setstatchanger STAT_SPEED, 1, TRUE
jumpifbyteequal gBattlerTarget, gEffectBattler, BattleScript_CottonDownLoopIncrement
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_CottonDownLoopIncrement
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_CottonDownTargetSpeedCantGoLower
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_CottonDownLoopIncrement
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CottonDownTargetSpeedCantGoLower
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_CottonDownLoopIncrement
@@ -6949,9 +6012,8 @@ BattleScript_AftermathDmg::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUpScripting
jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_AftermathDmgRet
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_AFTERMATHDMG
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -6983,7 +6045,7 @@ BattleScript_MoveUsedWokeUp::
BattleScript_MonWokeUpInUproar::
printstring STRINGID_PKMNWOKEUPINUPROAR
waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_ATTACKER
+ updatestatusicon BS_EFFECT_BATTLER
end2
BattleScript_PoisonTurnDmg::
@@ -6992,12 +6054,11 @@ BattleScript_PoisonTurnDmg::
BattleScript_DoStatusTurnDmg::
statusanimation BS_ATTACKER
BattleScript_DoTurnDmg:
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
tryfaintmon BS_ATTACKER
checkteamslost BattleScript_DoTurnDmgEnd
- tryrestorehpberry
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_HP_THRESHOLD
BattleScript_DoTurnDmgEnd:
end2
@@ -7007,9 +6068,8 @@ BattleScript_PoisonHealActivates::
printstring STRINGID_POISONHEALHPUP
waitmessage B_WAIT_TIME_LONG
statusanimation BS_ATTACKER
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
end2
BattleScript_BurnTurnDmg::
@@ -7056,43 +6116,41 @@ BattleScript_MoveUsedIsParalyzed::
printstring STRINGID_PKMNISPARALYZED
waitmessage B_WAIT_TIME_LONG
statusanimation BS_ATTACKER
- cancelmultiturnmoves BS_ATTACKER
+ cancelmultiturnmoves
goto BattleScript_MoveEnd
BattleScript_PowderMoveNoEffect::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
jumpiftype BS_TARGET, TYPE_GRASS, BattleScript_PowderMoveNoEffectPrint
jumpifability BS_TARGET, ABILITY_OVERCOAT, BattleScript_PowderMoveNoEffectOvercoat
+ setlastuseditem BS_TARGET
printstring STRINGID_SAFETYGOGGLESPROTECTED
goto BattleScript_PowderMoveNoEffectWaitMsg
BattleScript_PowderMoveNoEffectOvercoat:
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpTarget
BattleScript_PowderMoveNoEffectPrint:
printstring STRINGID_ITDOESNTAFFECT
BattleScript_PowderMoveNoEffectWaitMsg:
waitmessage B_WAIT_TIME_LONG
- cancelmultiturnmoves BS_ATTACKER
+ cancelmultiturnmoves
setmoveresultflags MOVE_RESULT_FAILED
goto BattleScript_MoveEnd
BattleScript_MoveUsedFlinched::
printstring STRINGID_PKMNFLINCHED
waitmessage B_WAIT_TIME_LONG
- jumpifability BS_ATTACKER ABILITY_STEADFAST BattleScript_TryActivateSteadFast
+ jumpifability BS_ATTACKER, ABILITY_STEADFAST, BattleScript_TryActivateSteadFast
BattleScript_MoveUsedFlinchedEnd:
goto BattleScript_MoveEnd
BattleScript_TryActivateSteadFast:
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_MoveUsedFlinchedEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_MoveUsedFlinchedEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_MoveUsedFlinchedEnd
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- setbyte gBattleCommunication STAT_SPEED
- stattextbuffer BS_ATTACKER
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_MoveUsedFlinchedEnd
+ setbyte gBattleCommunication, STAT_SPEED
+ stattextbuffer
printstring STRINGID_ATTACKERABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveUsedFlinchedEnd
@@ -7103,7 +6161,7 @@ BattleScript_PrintUproarOverTurns::
end2
BattleScript_ThrashConfuses::
- chosenstatus2animation BS_ATTACKER, STATUS2_CONFUSION
+ volatileanimation BS_ATTACKER, VOLATILE_CONFUSION
printstring STRINGID_PKMNFATIGUECONFUSION
waitmessage B_WAIT_TIME_LONG
end2
@@ -7111,19 +6169,19 @@ BattleScript_ThrashConfuses::
BattleScript_MoveUsedIsConfused::
printstring STRINGID_PKMNISCONFUSED
waitmessage B_WAIT_TIME_LONG
- status2animation BS_ATTACKER, STATUS2_CONFUSION
+ volatileanimation BS_ATTACKER, VOLATILE_CONFUSION
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, FALSE, BattleScript_MoveUsedIsConfusedRet
BattleScript_DoSelfConfusionDmg::
- cancelmultiturnmoves BS_ATTACKER
+ cancelmultiturnmoves
adjustdamage
printstring STRINGID_ITHURTCONFUSION
waitmessage B_WAIT_TIME_LONG
effectivenesssound
hitanimation BS_ATTACKER
waitstate
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ isdmgblockedbydisguise
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
resultmessage
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -7132,19 +6190,15 @@ BattleScript_MoveUsedIsConfusedRet::
return
BattleScript_MoveUsedPowder::
- bicword gHitMarker, HITMARKER_NO_ATTACKSTRING | HITMARKER_ATTACKSTRING_PRINTED
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
- cancelmultiturnmoves BS_ATTACKER
- status2animation BS_ATTACKER, STATUS2_POWDER
+ cancelmultiturnmoves
+ volatileanimation BS_ATTACKER, VOLATILE_POWDER
waitanimation
effectivenesssound
hitanimation BS_ATTACKER
waitstate
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_POWDEREXPLODES
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -7175,7 +6229,7 @@ BattleScript_WrapEnds::
BattleScript_MoveUsedIsInLove::
printstring STRINGID_PKMNINLOVE
waitmessage B_WAIT_TIME_LONG
- status2animation BS_ATTACKER, STATUS2_INFATUATION
+ volatileanimation BS_ATTACKER, VOLATILE_INFATUATION
return
BattleScript_MoveUsedIsInLoveCantAttack::
@@ -7186,13 +6240,13 @@ BattleScript_MoveUsedIsInLoveCantAttack::
BattleScript_NightmareTurnDmg::
printstring STRINGID_PKMNLOCKEDINNIGHTMARE
waitmessage B_WAIT_TIME_LONG
- status2animation BS_ATTACKER, STATUS2_NIGHTMARE
+ volatileanimation BS_ATTACKER, VOLATILE_NIGHTMARE
goto BattleScript_DoTurnDmg
BattleScript_CurseTurnDmg::
printstring STRINGID_PKMNAFFLICTEDBYCURSE
waitmessage B_WAIT_TIME_LONG
- status2animation BS_ATTACKER, STATUS2_CURSED
+ volatileanimation BS_ATTACKER, VOLATILE_CURSED
goto BattleScript_DoTurnDmg
BattleScript_TargetPRLZHeal::
@@ -7230,13 +6284,13 @@ BattleScript_UpdateEffectStatusIconRet::
flushtextbox
return
-BattleScript_YawnMakesAsleep::
+BattleScript_YawnMakesAsleepEnd2::
statusanimation BS_EFFECT_BATTLER
printstring STRINGID_PKMNFELLASLEEP
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_EFFECT_BATTLER
waitstate
- jumpifstatus3 BS_EFFECT_BATTLER, STATUS3_SKY_DROPPED, BattleScript_YawnEnd
+ jumpfifsemiinvulnerable BS_EFFECT_BATTLER, STATE_SKY_DROP, BattleScript_YawnEnd
makevisible BS_EFFECT_BATTLER
skydropyawn
BattleScript_YawnEnd:
@@ -7245,7 +6299,7 @@ BattleScript_YawnEnd:
BattleScript_EmbargoEndTurn::
printstring STRINGID_EMBARGOENDS
waitmessage B_WAIT_TIME_LONG
- tryrestorehpberry
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_USABLE_AGAIN
end2
BattleScript_TelekinesisEndTurn::
@@ -7322,28 +6376,21 @@ BattleScript_MoveEffectWrap::
return
BattleScript_MoveEffectConfusion::
- chosenstatus2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
+ volatileanimation BS_EFFECT_BATTLER, VOLATILE_CONFUSION
printstring STRINGID_PKMNWASCONFUSED
waitmessage B_WAIT_TIME_LONG
return
BattleScript_MoveEffectRecoil::
- jumpifmove MOVE_STRUGGLE, BattleScript_DoRecoil
- jumpifability BS_ATTACKER, ABILITY_ROCK_HEAD, BattleScript_RecoilEnd
- jumpifability BS_ATTACKER, ABILITY_MAGIC_GUARD, BattleScript_RecoilEnd
-BattleScript_DoRecoil::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNHITWITHRECOIL
waitmessage B_WAIT_TIME_LONG
- tryupdaterecoiltracker
tryfaintmon BS_ATTACKER
-BattleScript_RecoilEnd::
return
BattleScript_ItemSteal::
- playanimation BS_TARGET, B_ANIM_ITEM_STEAL
+ playanimation BS_EFFECT_BATTLER, B_ANIM_ITEM_STEAL
printstring STRINGID_PKMNSTOLEITEM
waitmessage B_WAIT_TIME_LONG
return
@@ -7359,21 +6406,37 @@ BattleScript_DrizzleActivates::
BattleScript_AbilityRaisesDefenderStat::
pause B_WAIT_TIME_SHORT
+ statbuffchange BS_TARGET, STAT_CHANGE_ONLY_CHECKING, BattleScript_AbilityCantRaiseDefenderStat
call BattleScript_AbilityPopUp
- statbuffchange 0, NULL
- setgraphicalstatchangevalues
- playanimation BS_ABILITY_BATTLER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, 0, BattleScript_AbilityCantRaiseDefenderStat
printstring STRINGID_DEFENDERSSTATROSE
waitmessage B_WAIT_TIME_LONG
return
+BattleScript_AbilityCantRaiseDefenderStat::
+ saveattacker
+ copybyte gBattlerAttacker, gBattlerTarget
+ printstring STRINGID_STATSWONTINCREASE
+ waitmessage B_WAIT_TIME_LONG
+ restoreattacker
+ return
+
+BattleScript_AbilityShieldProtects::
+ saveattacker
+ copybyte gBattlerAttacker, gBattlerAbility
+ playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
+ waitanimation
+ printstring STRINGID_ABILITYSHIELDPROTECTS
+ waitmessage B_WAIT_TIME_LONG
+ restoreattacker
+ return
+
BattleScript_AbilityPopUpTarget::
copybyte gBattlerAbility, gBattlerTarget
BattleScript_AbilityPopUp::
- .if B_ABILITY_POP_UP == TRUE
- showabilitypopup BS_ABILITY_BATTLER
- pause 40
- .endif
+ tryactivateabilityshield BS_ABILITY_BATTLER
+ showabilitypopup
+ pause B_WAIT_TIME_SHORT
recordability BS_ABILITY_BATTLER
sethword sABILITY_OVERWRITE, 0
return
@@ -7384,26 +6447,16 @@ BattleScript_AbilityPopUpScripting:
BattleScript_AbilityPopUpOverwriteThenNormal:
setbyte sFIXED_ABILITY_POPUP, TRUE
- showabilitypopup BS_ABILITY_BATTLER
- pause 60
+ showabilitypopup
+ pause B_WAIT_TIME_SHORT
sethword sABILITY_OVERWRITE, 0
- updateabilitypopup BS_ABILITY_BATTLER
- pause 20
+ updateabilitypopup
+ pause B_WAIT_TIME_SHORT
recordability BS_ABILITY_BATTLER
destroyabilitypopup
- pause 40
+ setbyte sFIXED_ABILITY_POPUP, FALSE
return
-BattleScript_SpeedBoostActivates::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_SpeedBoostActivatesEnd
- call BattleScript_AbilityPopUp
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- printstring STRINGID_PKMNRAISEDSPEED
- waitmessage B_WAIT_TIME_LONG
-BattleScript_SpeedBoostActivatesEnd:
- end3
-
@ Can't compare directly to a value, have to compare to value at pointer
sZero:
.byte 0
@@ -7411,37 +6464,31 @@ sZero:
BattleScript_MoodyActivates::
call BattleScript_AbilityPopUp
jumpifbyteequal sSTATCHANGER, sZero, BattleScript_MoodyLower
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyLower
- jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_MoodyLower
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyLower
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_CHANGED, BattleScript_MoodyLower
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_MoodyLower:
jumpifbyteequal sSAVED_STAT_CHANGER, sZero, BattleScript_MoodyEnd
copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyEnd
- jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_FELL, BattleScript_MoodyEnd
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN | STAT_CHANGE_NOT_PROTECT_AFFECTED, BattleScript_MoodyEnd
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_CHANGED, BattleScript_MoodyEnd
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_MoodyEnd:
- end3
+ end2
BattleScript_EmergencyExit::
- .if B_ABILITY_POP_UP == TRUE
pause 5
call BattleScript_AbilityPopUpScripting
pause B_WAIT_TIME_LONG
- .endif
playanimation BS_SCRIPTING, B_ANIM_SLIDE_OFFSCREEN
waitanimation
openpartyscreen BS_SCRIPTING, BattleScript_EmergencyExitRet
- switchoutabilities BS_SCRIPTING
waitstate
+ returntoball BS_SCRIPTING, FALSE
+ switchoutabilities BS_SCRIPTING
switchhandleorder BS_SCRIPTING, 2
- returntoball BS_TARGET, FALSE
getswitchedmondata BS_SCRIPTING
switchindataupdate BS_SCRIPTING
hpthresholds BS_SCRIPTING
@@ -7453,14 +6500,12 @@ BattleScript_EmergencyExitRet:
return
BattleScript_EmergencyExitWild::
- .if B_ABILITY_POP_UP == TRUE
pause 5
call BattleScript_AbilityPopUpScripting
pause B_WAIT_TIME_LONG
- .endif
playanimation BS_SCRIPTING, B_ANIM_SLIDE_OFFSCREEN
waitanimation
- setoutcomeonteleport BS_SCRIPTING
+ setteleportoutcome BS_SCRIPTING
finishaction
return
@@ -7471,10 +6516,10 @@ BattleScript_EmergencyExitEnd2::
playanimation BS_ATTACKER, B_ANIM_SLIDE_OFFSCREEN
waitanimation
openpartyscreen BS_ATTACKER, BattleScript_EmergencyExitRetEnd2
- switchoutabilities BS_ATTACKER
waitstate
+ returntoball BS_ATTACKER, FALSE
+ switchoutabilities BS_ATTACKER
switchhandleorder BS_ATTACKER, 2
- returntoball BS_TARGET, FALSE
getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER
@@ -7491,7 +6536,7 @@ BattleScript_EmergencyExitWildEnd2::
pause B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_SLIDE_OFFSCREEN
waitanimation
- setoutcomeonteleport BS_ATTACKER
+ setteleportoutcome BS_ATTACKER
finishaction
end2
@@ -7509,20 +6554,20 @@ BattleScript_ReceiverActivates::
printstring STRINGID_RECEIVERABILITYTAKEOVER
waitmessage B_WAIT_TIME_LONG
settracedability BS_ABILITY_BATTLER
+ switchinabilities BS_ABILITY_BATTLER
return
BattleScript_AbilityHpHeal:
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXRESTOREDHPALITTLE2
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
return
BattleScript_RainDishActivates::
call BattleScript_AbilityHpHeal
- end3
+ end2
BattleScript_CheekPouchActivates::
copybyte sSAVED_BATTLER, gBattlerAttacker
@@ -7537,9 +6582,9 @@ BattleScript_PickupActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_XFOUNDONEY
waitmessage B_WAIT_TIME_LONG
- tryrestorehpberry
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_PICK_UP
BattleScript_PickupActivatesEnd:
- end3
+ end2
BattleScript_HarvestActivates::
pause 5
@@ -7547,19 +6592,18 @@ BattleScript_HarvestActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_HARVESTBERRY
waitmessage B_WAIT_TIME_LONG
- tryrestorehpberry
+ tryactivateitem BS_ATTACKER, ACTIVATION_ON_HARVEST
BattleScript_HarvestActivatesEnd:
- end3
+ end2
BattleScript_SolarPowerActivates::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
call BattleScript_AbilityPopUp
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_SOLARPOWERHPDROP
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
- end3
+ end2
BattleScript_HealerActivates::
call BattleScript_AbilityPopUp
@@ -7567,7 +6611,7 @@ BattleScript_HealerActivates::
updatestatusicon BS_SCRIPTING
printstring STRINGID_HEALERCURE
waitmessage B_WAIT_TIME_LONG
- end3
+ end2
BattleScript_SandstreamActivates::
pause B_WAIT_TIME_SHORT
@@ -7592,11 +6636,12 @@ BattleScript_ShedSkinActivates::
printstring STRINGID_PKMNSXCUREDYPROBLEM
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_ATTACKER
- end3
+ end2
BattleScript_ActivateWeatherAbilities:
saveattacker
savetarget
+ tryboosterenergy ON_WEATHER
setbyte gBattlerAttacker, 0
BattleScript_ActivateWeatherAbilities_Loop:
copyarraywithindex gBattlerTarget, gBattlerByTurnOrder, gBattlerAttacker, 1
@@ -7608,14 +6653,11 @@ BattleScript_ActivateWeatherAbilities_Loop:
return
BattleScript_TryIntimidateHoldEffects:
- itemstatchangeeffects BS_TARGET
jumpifnoholdeffect BS_TARGET, HOLD_EFFECT_ADRENALINE_ORB, BattleScript_TryIntimidateHoldEffectsRet
- jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPEED, 12, BattleScript_TryIntimidateHoldEffectsRet
+ jumpifstat BS_TARGET, CMP_EQUAL, STAT_SPEED, MAX_STAT_STAGE, BattleScript_TryIntimidateHoldEffectsRet
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_TryIntimidateHoldEffectsRet
playanimation BS_TARGET, B_ANIM_HELD_ITEM_EFFECT
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN | STAT_CHANGE_ALLOW_PTR, BattleScript_TryIntimidateHoldEffectsRet
copybyte sBATTLER, gBattlerTarget
setlastuseditem BS_TARGET
printstring STRINGID_USINGITEMSTATOFPKMNROSE
@@ -7626,26 +6668,18 @@ BattleScript_TryIntimidateHoldEffectsRet:
BattleScript_IntimidateActivates::
savetarget
-.if B_ABILITY_POP_UP == TRUE
- showabilitypopup BS_ATTACKER
- pause B_WAIT_TIME_LONG
- destroyabilitypopup
-.endif
+ call BattleScript_AbilityPopUp
setbyte gBattlerTarget, 0
BattleScript_IntimidateLoop:
- jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_IntimidateLoopIncrement
jumpiftargetally BattleScript_IntimidateLoopIncrement
jumpifabsent BS_TARGET, BattleScript_IntimidateLoopIncrement
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
+ jumpifvolatile BS_TARGET, VOLATILE_SUBSTITUTE, BattleScript_IntimidateLoopIncrement
jumpifintimidateabilityprevented
BattleScript_IntimidateEffect:
copybyte sBATTLER, gBattlerAttacker
setstatchanger STAT_ATK, 1, TRUE
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateLoopIncrement
- setgraphicalstatchangevalues
- jumpifability BS_TARGET, ABILITY_CONTRARY, BattleScript_IntimidateContrary
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_IntimidateWontDecrease
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_IntimidateLoopIncrement
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_IntimidateWontDecrease
printstring STRINGID_PKMNCUTSATTACKWITH
BattleScript_IntimidateEffect_WaitString:
waitmessage B_WAIT_TIME_LONG
@@ -7661,8 +6695,8 @@ BattleScript_IntimidateLoopIncrement:
copybyte sBATTLER, gBattlerAttacker
destroyabilitypopup
restoretarget
+ restoreattacker
pause B_WAIT_TIME_MED
- tryintimidateejectpack
end3
BattleScript_IntimidatePrevented::
@@ -7675,16 +6709,6 @@ BattleScript_IntimidateWontDecrease:
printstring STRINGID_STATSWONTDECREASE
goto BattleScript_IntimidateEffect_WaitString
-BattleScript_IntimidateContrary:
- call BattleScript_AbilityPopUpTarget
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_IntimidateContrary_WontIncrease
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- printfromtable gStatUpStringIds
- goto BattleScript_IntimidateEffect_WaitString
-BattleScript_IntimidateContrary_WontIncrease:
- printstring STRINGID_TARGETSTATWONTGOHIGHER
- goto BattleScript_IntimidateEffect_WaitString
-
BattleScript_IntimidateInReverse::
copybyte sBATTLER, gBattlerTarget
call BattleScript_AbilityPopUpTarget
@@ -7695,56 +6719,42 @@ BattleScript_IntimidateInReverse::
BattleScript_SupersweetSyrupActivates::
savetarget
-.if B_ABILITY_POP_UP == TRUE
- showabilitypopup BS_ATTACKER
- pause B_WAIT_TIME_LONG
- destroyabilitypopup
-.endif
+ call BattleScript_AbilityPopUp
printstring STRINGID_SUPERSWEETAROMAWAFTS
waitmessage B_WAIT_TIME_LONG
setbyte gBattlerTarget, 0
BattleScript_SupersweetSyrupLoop:
- jumpifbyteequal gBattlerTarget, gBattlerAttacker, BattleScript_SupersweetSyrupLoopIncrement
jumpiftargetally BattleScript_SupersweetSyrupLoopIncrement
jumpifabsent BS_TARGET, BattleScript_SupersweetSyrupLoopIncrement
- jumpifstatus2 BS_TARGET, STATUS2_SUBSTITUTE, BattleScript_SupersweetSyrupLoopIncrement
+ jumpifvolatile BS_TARGET, VOLATILE_SUBSTITUTE, BattleScript_SupersweetSyrupLoopIncrement
BattleScript_SupersweetSyrupEffect:
copybyte sBATTLER, gBattlerAttacker
setstatchanger STAT_EVASION, 1, TRUE
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_SupersweetSyrupLoopIncrement
- setgraphicalstatchangevalues
- jumpifability BS_TARGET, ABILITY_CONTRARY, BattleScript_SupersweetSyrupContrary
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_SupersweetSyrupWontDecrease
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_SupersweetSyrupLoopIncrement
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_SupersweetSyrupWontDecrease
printfromtable gStatDownStringIds
BattleScript_SupersweetSyrupEffect_WaitString:
waitmessage B_WAIT_TIME_LONG
+ saveattacker
+ savetarget
copybyte sBATTLER, gBattlerTarget
call BattleScript_TryIntimidateHoldEffects
+ restoreattacker
+ restoretarget
BattleScript_SupersweetSyrupLoopIncrement:
addbyte gBattlerTarget, 1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_SupersweetSyrupLoop
copybyte sBATTLER, gBattlerAttacker
destroyabilitypopup
restoretarget
+ restoreattacker
pause B_WAIT_TIME_MED
- tryintimidateejectpack
end3
BattleScript_SupersweetSyrupWontDecrease:
printstring STRINGID_STATSWONTDECREASE
goto BattleScript_SupersweetSyrupEffect_WaitString
-BattleScript_SupersweetSyrupContrary:
- call BattleScript_AbilityPopUpTarget
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_SupersweetSyrupContrary_WontIncrease
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- printfromtable gStatUpStringIds
- goto BattleScript_SupersweetSyrupEffect_WaitString
-BattleScript_SupersweetSyrupContrary_WontIncrease:
- printstring STRINGID_TARGETSTATWONTGOHIGHER
- goto BattleScript_SupersweetSyrupEffect_WaitString
-
BattleScript_DroughtActivates::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
@@ -7764,11 +6774,7 @@ BattleScript_DesolateLandActivates::
end3
BattleScript_PrimalWeatherBlocksMove::
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_ATTACKSTRING_PRINTED, BattleScript_MoveEnd @in case of multi-target moves, if move fails once, no point in printing the message twice
- accuracycheck BattleScript_PrintMoveMissed, NO_ACC_CALC_CHECK_LOCK_ON
- attackstring
pause B_WAIT_TIME_SHORT
- ppreduce
printfromtable gPrimalWeatherBlocksStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
@@ -7788,6 +6794,7 @@ BattleScript_DeltaStreamActivates::
printstring STRINGID_MYSTERIOUSAIRCURRENT
waitstate
playanimation BS_ATTACKER, B_ANIM_STRONG_WINDS
+ call BattleScript_ActivateWeatherAbilities
end3
BattleScript_ProtosynthesisActivates::
@@ -7821,12 +6828,9 @@ BattleScript_SupremeOverlordActivates::
BattleScript_CostarActivates::
pause B_WAIT_TIME_SHORT
- savetarget
- copybyte gBattlerTarget, sBATTLER
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNCOPIEDSTATCHANGES
waitmessage B_WAIT_TIME_LONG
- restoretarget
end3
BattleScript_ZeroToHeroActivates::
@@ -7842,35 +6846,33 @@ BattleScript_CommanderActivates::
printstring STRINGID_COMMANDERACTIVATES
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderAtkIncrease:
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPATK | BIT_SPDEF | BIT_SPEED, STAT_CHANGE_BY_TWO
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderDefIncrease
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderDefIncrease
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderDefIncrease, BIT_DEF | BIT_SPATK | BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CommanderDefIncrease
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderDefIncrease:
setstatchanger STAT_DEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpAtkIncrease
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpAtkIncrease
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpAtkIncrease, BIT_SPATK | BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CommanderSpAtkIncrease
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderSpAtkIncrease:
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpDefIncrease
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpDefIncrease
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpDefIncrease, BIT_SPDEF | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CommanderSpDefIncrease
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderSpDefIncrease:
setstatchanger STAT_SPDEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpeedIncrease
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderSpeedIncrease
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderSpeedIncrease, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CommanderSpeedIncrease
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderSpeedIncrease:
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_CommanderEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_CommanderEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_CommanderEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_CommanderEnd:
@@ -7882,9 +6884,9 @@ BattleScript_HospitalityActivates::
call BattleScript_AbilityPopUp
printstring STRINGID_HOSPITALITYRESTORATION
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ playanimation BS_EFFECT_BATTLER, B_ANIM_SIMPLE_HEAL
+ healthbarupdate BS_EFFECT_BATTLER, PASSIVE_HP_UPDATE
+ datahpupdate BS_EFFECT_BATTLER, PASSIVE_HP_UPDATE
end3
BattleScript_AttackWeakenedByStrongWinds::
@@ -7921,10 +6923,12 @@ BattleScript_SnowWarningActivatesSnow::
BattleScript_ActivateTerrainEffects:
saveattacker
savetarget
+ tryboosterenergy ON_TERRAIN
+ resetterrainabilityflags
setbyte gBattlerAttacker, 0
BattleScript_ActivateTerrainSeed:
copyarraywithindex gBattlerTarget, gBattlerByTurnOrder, gBattlerAttacker, 1
- doterrainseed BS_TARGET, BattleScript_ActivateTerrainAbility
+ tryterrainseed BS_TARGET, BattleScript_ActivateTerrainAbility
removeitem BS_TARGET
BattleScript_ActivateTerrainAbility:
activateterrainchangeabilities BS_TARGET
@@ -7984,9 +6988,8 @@ BattleScript_BadDreams_DmgAfterPopUp:
printstring STRINGID_BADDREAMSDMG
waitmessage B_WAIT_TIME_LONG
dmg_1_8_targethp
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
jumpifhasnohp BS_TARGET, BattleScript_BadDreams_HidePopUp
BattleScript_BadDreamsIncrement:
addbyte gBattlerTarget, 1
@@ -7995,7 +6998,7 @@ BattleScript_BadDreamsIncrement:
destroyabilitypopup
pause 15
BattleScript_BadDreamsEnd:
- end3
+ end2
BattleScript_BadDreams_ShowPopUp:
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
@@ -8007,11 +7010,9 @@ BattleScript_BadDreams_HidePopUp:
goto BattleScript_BadDreamsIncrement
BattleScript_TookAttack::
- attackstring
pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNSXTOOKATTACK
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_ATTACKSTRING_PRINTED
return
BattleScript_SturdyPreventsOHKO::
@@ -8030,30 +7031,20 @@ BattleScript_DampStopsExplosion::
moveendcase MOVEEND_CLEAR_BITS
end
-BattleScript_MoveHPDrain_PPLoss::
- ppreduce
BattleScript_MoveHPDrain::
- attackstring
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNRESTOREDHPUSING
waitmessage B_WAIT_TIME_LONG
setmoveresultflags MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
-BattleScript_MoveStatDrain_PPLoss::
- ppreduce
BattleScript_MoveStatDrain::
- attackstring
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MoveStatDrain_Cont
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_MoveStatDrain_Cont
.if B_ABSORBING_ABILITY_STRING >= GEN_5
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
@@ -8065,10 +7056,7 @@ BattleScript_MoveStatDrain_Cont:
clearsemiinvulnerablebit
goto BattleScript_MoveEnd
-BattleScript_MonMadeMoveUseless_PPLoss::
- ppreduce
BattleScript_MonMadeMoveUseless::
- attackstring
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXMADEYUSELESS
@@ -8076,10 +7064,7 @@ BattleScript_MonMadeMoveUseless::
setmoveresultflags MOVE_RESULT_DOESNT_AFFECT_FOE
goto BattleScript_MoveEnd
-BattleScript_FlashFireBoost_PPLoss::
- ppreduce
BattleScript_FlashFireBoost::
- attackstring
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printfromtable gFlashFireStringIds
@@ -8122,18 +7107,17 @@ BattleScript_FlinchPrevention::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXPREVENTSFLINCHING
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ return
BattleScript_OwnTempoPrevents::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
+ copybyte sBATTLER, gBattlerTarget
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
BattleScript_SoundproofProtected::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXBLOCKSY
@@ -8146,8 +7130,6 @@ BattleScript_IceFaceNullsDamage::
return
BattleScript_DazzlingProtected::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUpScripting
printstring STRINGID_POKEMONCANNOTUSEMOVE
@@ -8155,17 +7137,17 @@ BattleScript_DazzlingProtected::
goto BattleScript_MoveEnd
BattleScript_MoveUsedPsychicTerrainPrevents::
- printstring STRINGID_POKEMONCANNOTUSEMOVE
+ pause B_WAIT_TIME_SHORT
+ printstring STRINGID_PSYCHICTERRAINPREVENTS
waitmessage B_WAIT_TIME_LONG
+ setmoveresultflags MOVE_RESULT_NO_EFFECT
goto BattleScript_MoveEnd
BattleScript_GrassyTerrainHeals::
printstring STRINGID_GRASSYTERRAINHEALS
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
- bicword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
end2
BattleScript_AbilityNoSpecificStatLoss::
@@ -8173,16 +7155,20 @@ BattleScript_AbilityNoSpecificStatLoss::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXPREVENTSYLOSS
waitmessage B_WAIT_TIME_LONG
- setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY
+ setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY
setmoveresultflags MOVE_RESULT_NO_EFFECT
return
BattleScript_StickyHoldActivates::
+ call BattleScript_StickyHoldActivatesRet
+ goto BattleScript_MoveEnd
+
+BattleScript_StickyHoldActivatesRet::
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSXMADEYINEFFECTIVE
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ return
BattleScript_ColorChangeActivates::
call BattleScript_AbilityPopUp
@@ -8197,6 +7183,11 @@ BattleScript_ProteanActivates::
waitmessage B_WAIT_TIME_LONG
return
+BattleScript_AbilityAvoidsDamage::
+ call BattleScript_AbilityPopUp
+ printfromtable gMissStringIds @ waitmessage is executed next so no waitmessage here
+ return
+
BattleScript_TeraShellDistortingTypeMatchups::
pause B_WAIT_TIME_SHORTEST
call BattleScript_AbilityPopUpScripting
@@ -8206,33 +7197,35 @@ BattleScript_TeraShellDistortingTypeMatchups::
BattleScript_CursedBodyActivates::
call BattleScript_AbilityPopUp
- printstring STRINGID_CUSEDBODYDISABLED
+ printstring STRINGID_CURSEDBODYDISABLED
waitmessage B_WAIT_TIME_LONG
return
BattleScript_MummyActivates::
-.if B_ABILITY_POP_UP == TRUE
- call BattleScript_AbilityPopUpTarget
setbyte sFIXED_ABILITY_POPUP, TRUE
+ call BattleScript_AbilityPopUpTarget
copybyte gBattlerAbility, gBattlerAttacker
copyhword sABILITY_OVERWRITE, gLastUsedAbility
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
recordability BS_TARGET
recordability BS_ATTACKER
printstring STRINGID_ATTACKERACQUIREDABILITY
waitmessage B_WAIT_TIME_LONG
+ trytoclearprimalweather
+ tryrevertweatherform
+ flushtextbox
+ tryendneutralizinggas
return
BattleScript_WanderingSpiritActivates::
-.if B_ABILITY_POP_UP == TRUE
+ saveattacker
+ savetarget
copybyte gBattlerAbility, gBattlerTarget
sethword sABILITY_OVERWRITE, ABILITY_WANDERING_SPIRIT
call BattleScript_AbilityPopUpOverwriteThenNormal
copybyte gBattlerAbility, gBattlerAttacker
copyhword sABILITY_OVERWRITE, gLastUsedAbility
call BattleScript_AbilityPopUpOverwriteThenNormal
-.endif
recordability BS_TARGET
recordability BS_ATTACKER
printstring STRINGID_SWAPPEDABILITIES
@@ -8241,27 +7234,25 @@ BattleScript_WanderingSpiritActivates::
jumpiffainted BS_TARGET, TRUE, BattleScript_WanderingSpiritActivatesRet
switchinabilities BS_TARGET
BattleScript_WanderingSpiritActivatesRet:
+ restoreattacker
+ restoretarget
return
BattleScript_TargetsStatWasMaxedOut::
call BattleScript_AbilityPopUp
- statbuffchange STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_TargetsStatWasMaxedOutRet
printstring STRINGID_TARGETSSTATWASMAXEDOUT
waitmessage B_WAIT_TIME_LONG
+BattleScript_TargetsStatWasMaxedOutRet:
return
BattleScript_BattlerAbilityStatRaiseOnSwitchIn::
- copybyte gBattlerAbility, gBattlerAttacker
- call BattleScript_AbilityPopUp
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ call BattleScript_AbilityPopUpScripting
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_BattlerAbilityStatRaiseOnSwitchInRet
waitanimation
- printstring STRINGID_BATTLERABILITYRAISEDSTAT
+ printstring STRINGID_SCRIPTINGABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
- copybyte gBattlerAttacker, sSAVED_BATTLER
+BattleScript_BattlerAbilityStatRaiseOnSwitchInRet:
end3
BattleScript_ScriptingAbilityStatRaise::
@@ -8269,81 +7260,70 @@ BattleScript_ScriptingAbilityStatRaise::
call BattleScript_AbilityPopUp
saveattacker
copybyte gBattlerAttacker, sBATTLER
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | MOVE_EFFECT_CERTAIN, NULL
- setgraphicalstatchangevalues
- playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
+ statbuffchange BS_ATTACKER, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_CERTAIN, BattleScript_ScriptingAbilityStatRaiseRet
printstring STRINGID_ATTACKERABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
+BattleScript_ScriptingAbilityStatRaiseRet:
restoreattacker
return
BattleScript_WeakArmorActivates::
call BattleScript_AbilityPopUp
setstatchanger STAT_DEF, 1, TRUE
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_WeakArmorDefAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_FELL_EMPTY, BattleScript_WeakArmorActivatesSpeed
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesSpeed
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_WeakArmorDefPrintString
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_WeakArmorActivatesSpeed
pause B_WAIT_TIME_SHORTEST
printfromtable gStatDownStringIds
clearmoveresultflags MOVE_RESULT_MISSED @ Set by statbuffchange when stat can't be decreased
waitmessage B_WAIT_TIME_LONG
goto BattleScript_WeakArmorActivatesSpeed
-BattleScript_WeakArmorDefAnim:
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+BattleScript_WeakArmorDefPrintString:
printstring STRINGID_TARGETABILITYSTATLOWER
waitmessage B_WAIT_TIME_LONG
BattleScript_WeakArmorActivatesSpeed:
-.if B_WEAK_ARMOR_SPEED >= GEN_7
+ jumpifgenconfiglowerthan CONFIG_WEAK_ARMOR_SPEED, GEN_7, BattleScript_WeakArmorSetSpeedGen6
setstatchanger STAT_SPEED, 2, FALSE
-.else
+ goto BattleScript_WeakArmorDoSpeed
+BattleScript_WeakArmorSetSpeedGen6:
setstatchanger STAT_SPEED, 1, FALSE
-.endif
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
- jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_WeakArmorSpeedAnim
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_EMPTY, BattleScript_WeakArmorActivatesEnd
+BattleScript_WeakArmorDoSpeed:
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_WeakArmorActivatesEnd
+ jumpifbyte CMP_LESS_THAN, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_WeakArmorSpeedPrintString
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGE_EMPTY, BattleScript_WeakArmorActivatesEnd
pause B_WAIT_TIME_SHORTEST
printstring STRINGID_TARGETSTATWONTGOHIGHER
clearmoveresultflags MOVE_RESULT_MISSED
waitmessage B_WAIT_TIME_LONG
goto BattleScript_WeakArmorActivatesEnd
-BattleScript_WeakArmorSpeedAnim:
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+BattleScript_WeakArmorSpeedPrintString:
printstring STRINGID_TARGETABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
BattleScript_WeakArmorActivatesEnd:
return
BattleScript_RaiseStatOnFaintingTarget::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseStatOnFaintingTarget_End
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_RaiseStatOnFaintingTarget_End
copybyte gBattlerAbility, gBattlerAttacker
call BattleScript_AbilityPopUp
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseStatOnFaintingTarget_End
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RaiseStatOnFaintingTarget_End:
return
BattleScript_AttackerAbilityStatRaise::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_AttackerAbilityStatRaise_End
- copybyte gBattlerAbility, gBattlerAttacker
- call BattleScript_AbilityPopUp
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
- waitanimation
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_AttackerAbilityStatRaise_End
+ call BattleScript_AbilityPopUpScripting
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR, BattleScript_AttackerAbilityStatRaise_End
printstring STRINGID_ATTACKERABILITYSTATRAISE
waitmessage B_WAIT_TIME_LONG
BattleScript_AttackerAbilityStatRaise_End:
return
BattleScript_FellStingerRaisesStat::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
- jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_ROSE, BattleScript_FellStingerRaisesAtkEnd
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_FellStingerRaisesAtkEnd
+ jumpifbyte CMP_GREATER_THAN, cMULTISTRING_CHOOSER, B_MSG_DEFENDER_STAT_CHANGED, BattleScript_FellStingerRaisesAtkEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_FellStingerRaisesAtkEnd:
@@ -8351,8 +7331,14 @@ BattleScript_FellStingerRaisesAtkEnd:
BattleScript_AttackerAbilityStatRaiseEnd3::
call BattleScript_AttackerAbilityStatRaise
+ restoreattacker
end3
+BattleScript_AttackerAbilityStatRaiseEnd2::
+ call BattleScript_AttackerAbilityStatRaise
+ restoreattacker
+ end2
+
BattleScript_SwitchInAbilityMsg::
call BattleScript_AbilityPopUp
printfromtable gSwitchInAbilityStringIds
@@ -8387,26 +7373,27 @@ BattleScript_FriskMsg::
BattleScript_FriskActivates::
saveattacker
- savetarget
+ savetarget
copybyte gBattlerAttacker, sBATTLER
- tryfriskmsg BS_SCRIPTING
+ tryfriskmessage
restoreattacker
- restoretarget
+ restoretarget
end3
BattleScript_ImposterActivates::
call BattleScript_AbilityPopUp
transformdataexecution
- playmoveanimation BS_ATTACKER, MOVE_TRANSFORM
+ playmoveanimation MOVE_TRANSFORM
waitanimation
printstring STRINGID_IMPOSTERTRANSFORM
waitmessage B_WAIT_TIME_LONG
+ restoreattacker
+ restoretarget
end3
BattleScript_HurtAttacker:
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNHURTSWITH
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -8428,10 +7415,9 @@ BattleScript_RockyHelmetActivatesDmg:
BattleScript_SpikyShieldEffect::
jumpifabsent BS_ATTACKER, BattleScript_SpikyShieldRet
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
clearmoveresultflags MOVE_RESULT_NO_EFFECT
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNHURTSWITH
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -8440,9 +7426,8 @@ BattleScript_SpikyShieldRet::
return
BattleScript_KingsShieldEffect::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
clearmoveresultflags MOVE_RESULT_NO_EFFECT
- seteffectsecondary
+ seteffectsecondary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_NONE
copybyte sBATTLER, gBattlerTarget
copybyte gBattlerTarget, gBattlerAttacker
copybyte gBattlerAttacker, sBATTLER
@@ -8450,32 +7435,33 @@ BattleScript_KingsShieldEffect::
return
BattleScript_BanefulBunkerEffect::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_STATUS_ABILITY_EFFECT | HITMARKER_PASSIVE_DAMAGE
clearmoveresultflags MOVE_RESULT_NO_EFFECT
- seteffectsecondary
+ setnonvolatilestatus TRIGGER_ON_PROTECT
setmoveresultflags MOVE_RESULT_MISSED
return
BattleScript_CuteCharmActivates::
call BattleScript_AbilityPopUp
- status2animation BS_ATTACKER, STATUS2_INFATUATION
+ volatileanimation BS_ATTACKER, VOLATILE_INFATUATION
printstring STRINGID_PKMNSXINFATUATEDY
waitmessage B_WAIT_TIME_LONG
call BattleScript_TryDestinyKnotTarget
return
BattleScript_GooeyActivates::
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ONLY_CHECKING, BattleScript_GooeyActivatesRet
waitstate
call BattleScript_AbilityPopUp
swapattackerwithtarget @ for defiant, mirror armor
- seteffectsecondary MOVE_EFFECT_SPD_MINUS_1
+ seteffectsecondary BS_ATTACKER, BS_TARGET, MOVE_EFFECT_SPD_MINUS_1
swapattackerwithtarget
+BattleScript_GooeyActivatesRet:
return
BattleScript_AbilityStatusEffect::
waitstate
call BattleScript_AbilityPopUp
- seteffectsecondary
+ setnonvolatilestatus TRIGGER_ON_ABILITY
return
BattleScript_BattleBondActivatesOnMoveEndAttacker::
@@ -8493,22 +7479,21 @@ BattleScript_BattleBondActivatesOnMoveEndAttacker::
BattleScript_EffectBattleBondStatIncrease::
call BattleScript_AbilityPopUp
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
setstatchanger STAT_ATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseTrySpAtk
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectBattleBondStatIncreaseTrySpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseTrySpAtk, BIT_SPATK | BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectBattleBondStatIncreaseTrySpAtk
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectBattleBondStatIncreaseTrySpAtk:
setstatchanger STAT_SPATK, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseTrySpeed
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectBattleBondStatIncreaseTrySpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseTrySpeed, BIT_SPEED
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectBattleBondStatIncreaseTrySpeed
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectBattleBondStatIncreaseTrySpeed:
setstatchanger STAT_SPEED, 1, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseRet
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_EffectBattleBondStatIncreaseRet
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_EffectBattleBondStatIncreaseRet
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_EffectBattleBondStatIncreaseRet
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_EffectBattleBondStatIncreaseRet:
@@ -8517,13 +7502,12 @@ BattleScript_EffectBattleBondStatIncreaseRet:
BattleScript_DancerActivates::
call BattleScript_AbilityPopUp
waitmessage B_WAIT_TIME_SHORT
- orword gHitMarker, HITMARKER_ALLOW_NO_PP
jumptocalledmove TRUE
BattleScript_SynchronizeActivates::
waitstate
call BattleScript_AbilityPopUp
- seteffectprimary
+ setnonvolatilestatus TRIGGER_ON_ABILITY
return
BattleScript_NoItemSteal::
@@ -8539,6 +7523,13 @@ BattleScript_AbilityCuredStatus::
updatestatusicon BS_SCRIPTING
return
+BattleScript_AbilityCuredStatusEnd3::
+ call BattleScript_AbilityPopUp
+ printstring STRINGID_PKMNSXCUREDITSYPROBLEM
+ waitmessage B_WAIT_TIME_LONG
+ updatestatusicon BS_SCRIPTING
+ end3
+
BattleScript_BattlerShookOffTaunt::
call BattleScript_AbilityPopUp
printstring STRINGID_PKMNSHOOKOFFTHETAUNT
@@ -8560,15 +7551,14 @@ BattleScript_IgnoresWhileAsleep::
BattleScript_IgnoresAndUsesRandomMove::
printstring STRINGID_PKMNIGNOREDORDERS
waitmessage B_WAIT_TIME_LONG
- setbyte sMOVE_EFFECT, 0
- jumptocalledmove FALSE
+ return
BattleScript_MoveUsedLoafingAround::
jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_LOAFING, BattleScript_MoveUsedLoafingAroundMsg
@ Skip ahead if not the Battle Palace message
jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER, BattleScript_MoveUsedLoafingAroundMsg
setbyte gBattleCommunication, 0
- palacetryescapestatus BS_ATTACKER
+ palacetryescapestatus
setbyte cMULTISTRING_CHOOSER, B_MSG_INCAPABLE_OF_POWER
BattleScript_MoveUsedLoafingAroundMsg::
printfromtable gInobedientStringIds
@@ -8576,13 +7566,14 @@ BattleScript_MoveUsedLoafingAroundMsg::
moveendto MOVEEND_NEXT_TARGET
end
BattleScript_TruantLoafingAround::
+ flushtextbox
call BattleScript_AbilityPopUp
goto BattleScript_MoveUsedLoafingAroundMsg
BattleScript_IgnoresAndFallsAsleep::
printstring STRINGID_PKMNBEGANTONAP
waitmessage B_WAIT_TIME_LONG
- seteffectprimary MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
+ seteffectprimary BS_ATTACKER, BS_ATTACKER, MOVE_EFFECT_SLEEP
moveendto MOVEEND_NEXT_TARGET
end
@@ -8596,73 +7587,13 @@ BattleScript_SubstituteFade::
printstring STRINGID_PKMNSUBSTITUTEFADED
return
-BattleScript_BerryCurePrlzEnd2::
- call BattleScript_BerryCureParRet
- end2
-
-BattleScript_BerryCureParRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMCUREDPARALYSIS
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
-BattleScript_BerryCurePsnEnd2::
- call BattleScript_BerryCurePsnRet
+BattleScript_BerryCureStatusEnd2::
+ call BattleScript_BerryCureStatusRet
end2
-BattleScript_BerryCurePsnRet::
+BattleScript_BerryCureStatusRet::
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMCUREDPOISON
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
-BattleScript_BerryCureBrnEnd2::
- call BattleScript_BerryCureBrnRet
- end2
-
-BattleScript_BerryCureBrnRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMHEALEDBURN
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
-BattleScript_BerryCureFrzEnd2::
- call BattleScript_BerryCureFrzRet
- end2
-
-BattleScript_BerryCureFrzRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMDEFROSTEDIT
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
-BattleScript_BerryCureFrbEnd2::
- call BattleScript_BerryCureFrzRet
- end2
-
-BattleScript_BerryCureFrbRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMHEALEDFROSTBITE
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
-BattleScript_BerryCureSlpEnd2::
- call BattleScript_BerryCureSlpRet
- end2
-
-BattleScript_BerryCureSlpRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printstring STRINGID_PKMNSITEMWOKEIT
+ printfromtable CureStatusBerryEffectStringID
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
@@ -8697,25 +7628,12 @@ BattleScript_BerryCureConfusionRet::
removeitem BS_SCRIPTING
return
-BattleScript_BerryCureChosenStatusEnd2::
- call BattleScript_BerryCureChosenStatusRet
- end2
-
-BattleScript_BerryCureChosenStatusRet::
- playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
- printfromtable gBerryEffectStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_SCRIPTING
- removeitem BS_SCRIPTING
- return
-
BattleScript_MentalHerbCureRet::
- playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
+ playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printfromtable gMentalHerbCureStringIds
waitmessage B_WAIT_TIME_LONG
updatestatusicon BS_SCRIPTING
removeitem BS_SCRIPTING
- copybyte gBattlerAttacker, sSAVED_BATTLER @ restore the original attacker just to be safe
return
BattleScript_MentalHerbCureEnd2::
@@ -8737,14 +7655,13 @@ BattleScript_ItemHealHP_RemoveItemRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_ItemHealHP_RemoveItemRet_AbilityPopUp
goto BattleScript_ItemHealHP_RemoveItemRet_Anim
BattleScript_ItemHealHP_RemoveItemRet_AbilityPopUp:
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
BattleScript_ItemHealHP_RemoveItemRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
removeitem BS_SCRIPTING
return
@@ -8752,27 +7669,26 @@ BattleScript_ItemHealHP_RemoveItemEnd2::
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_ItemHealHP_RemoveItemEnd2_AbilityPopUp
goto BattleScript_ItemHealHP_RemoveItemEnd2_Anim
BattleScript_ItemHealHP_RemoveItemEnd2_AbilityPopUp:
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
BattleScript_ItemHealHP_RemoveItemEnd2_Anim:
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
removeitem BS_ATTACKER
end2
BattleScript_BerryPPHealRet::
- jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryPPHeal_AbilityPopup
+ jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_BerryPPHeal_AbilityPopup
goto BattleScript_BerryPPHeal_Anim
BattleScript_BerryPPHeal_AbilityPopup:
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
BattleScript_BerryPPHeal_Anim:
- playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
+ playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDPP
waitmessage B_WAIT_TIME_LONG
- removeitem BS_ATTACKER
+ removeitem BS_SCRIPTING
return
BattleScript_BerryPPHealEnd2::
@@ -8783,21 +7699,25 @@ BattleScript_ItemHealHP_End2::
call BattleScript_ItemHealHP_Ret
end2
-BattleScript_AirBaloonMsgIn::
+BattleScript_AirBalloonMsgIn::
printstring STRINGID_AIRBALLOONFLOAT
waitmessage B_WAIT_TIME_LONG
end3
-BattleScript_AirBaloonMsgPop::
+BattleScript_AirBalloonMsgInRet::
+ printstring STRINGID_AIRBALLOONFLOAT
+ waitmessage B_WAIT_TIME_LONG
+ return
+
+BattleScript_AirBalloonMsgPop::
printstring STRINGID_AIRBALLOONPOP
waitmessage B_WAIT_TIME_LONG
removeitem BS_TARGET
return
BattleScript_ItemHurtRet::
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE | HITMARKER_IGNORE_DISGUISE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
printstring STRINGID_HURTBYITEM
waitmessage B_WAIT_TIME_LONG
tryfaintmon BS_ATTACKER
@@ -8813,9 +7733,8 @@ BattleScript_ItemHealHP_Ret::
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDHPALITTLE
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_IGNORE_DISGUISE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_ATTACKER
- datahpupdate BS_ATTACKER
+ healthbarupdate BS_ATTACKER, PASSIVE_HP_UPDATE
+ datahpupdate BS_ATTACKER, PASSIVE_HP_UPDATE
return
BattleScript_SelectingNotAllowedMoveChoiceItem::
@@ -8868,10 +7787,9 @@ BattleScript_BerryConfuseHealEnd2_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
- seteffectprimary MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ seteffectprimary BS_SCRIPTING, BS_SCRIPTING, MOVE_EFFECT_CONFUSION
removeitem BS_SCRIPTING
end2
@@ -8884,11 +7802,10 @@ BattleScript_BerryConfuseHealRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_IGNORE_BIDE | HITMARKER_IGNORE_SUBSTITUTE | HITMARKER_PASSIVE_DAMAGE
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
- seteffectprimary MOVE_EFFECT_CONFUSION | MOVE_EFFECT_CERTAIN
- removeitem BS_TARGET
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ seteffectprimary BS_SCRIPTING, BS_SCRIPTING, MOVE_EFFECT_CONFUSION
+ removeitem BS_SCRIPTING
return
BattleScript_ConsumableStatRaiseEnd2::
@@ -8896,24 +7813,22 @@ BattleScript_ConsumableStatRaiseEnd2::
end2
BattleScript_ConsumableStatRaiseRet::
- @ to ensure `statbuffchange` has correct battler id, backup and use target
- savetarget
- copybyte gBattlerTarget, sBATTLER
jumpifnotberry BS_SCRIPTING, BattleScript_ConsumableStatRaiseRet_Anim
- @ check ripen popup if consuming berry
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_ConsumableStatRaiseRet_AbilityPopup
goto BattleScript_ConsumableStatRaiseRet_Anim
BattleScript_ConsumableStatRaiseRet_AbilityPopup:
call BattleScript_AbilityPopUp
BattleScript_ConsumableStatRaiseRet_Anim:
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_ConsumableStatRaiseRet_End
- setgraphicalstatchangevalues
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_ConsumableStatRaiseRet_End
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
- setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR, BattleScript_ConsumableStatRaiseRet_End
+ setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGED_ITEM
+ savetarget
+ copybyte gBattlerTarget, sBATTLER @ BattleScript_StatUp uses target as a message arg
call BattleScript_StatUp
+ restoretarget
removeitem BS_SCRIPTING
BattleScript_ConsumableStatRaiseRet_End:
- restoretarget
return
BattleScript_BerryFocusEnergyRet::
@@ -8938,7 +7853,7 @@ BattleScript_FlushMessageBox::
BattleScript_PalacePrintFlavorText::
setbyte gBattleCommunication + 1, 0
BattleScript_PalaceTryBattlerFlavorText::
- palaceflavortext BS_ATTACKER @ BS_ATTACKER here overwritten by gBattleCommunication + 1
+ palaceflavortext
jumpifbyte CMP_NOT_EQUAL, gBattleCommunication, TRUE, BattleScript_PalaceEndFlavorText
printfromtable gBattlePalaceFlavorTextTable
waitmessage B_WAIT_TIME_LONG
@@ -8950,16 +7865,16 @@ BattleScript_PalaceEndFlavorText::
end2
BattleScript_ArenaTurnBeginning::
- waitcry BS_ATTACKER
+ waitcry
volumedown
playse SE_ARENA_TIMEUP1
pause 8
playse SE_ARENA_TIMEUP1
- arenadrawreftextbox
+ drawarenareftextbox
arenajudgmentstring B_MSG_REF_COMMENCE_BATTLE
- arenawaitmessage B_MSG_REF_COMMENCE_BATTLE
+ arenawaitmessage
pause B_WAIT_TIME_LONG
- arenaerasereftextbox
+ erasearenareftextbox
volumeup
end2
@@ -8973,74 +7888,78 @@ BattleScript_ArenaDoJudgment::
pause 8
playse SE_ARENA_TIMEUP1
pause B_WAIT_TIME_LONG
- arenadrawreftextbox
+ drawarenareftextbox
arenajudgmentstring B_MSG_REF_THATS_IT
- arenawaitmessage B_MSG_REF_THATS_IT
+ arenawaitmessage
pause B_WAIT_TIME_LONG
setbyte gBattleCommunication, 0 @ Reset state for arenajudgmentwindow
arenajudgmentwindow
pause B_WAIT_TIME_LONG
arenajudgmentwindow
arenajudgmentstring B_MSG_REF_JUDGE_MIND
- arenawaitmessage B_MSG_REF_JUDGE_MIND
+ arenawaitmessage
arenajudgmentwindow
arenajudgmentstring B_MSG_REF_JUDGE_SKILL
- arenawaitmessage B_MSG_REF_JUDGE_SKILL
+ arenawaitmessage
arenajudgmentwindow
arenajudgmentstring B_MSG_REF_JUDGE_BODY
- arenawaitmessage B_MSG_REF_JUDGE_BODY
+ arenawaitmessage
arenajudgmentwindow
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
@ ARENA_RESULT_PLAYER_WON
arenajudgmentstring B_MSG_REF_PLAYER_WON
- arenawaitmessage B_MSG_REF_PLAYER_WON
+ arenawaitmessage
arenajudgmentwindow
- arenaerasereftextbox
+ erasearenareftextbox
printstring STRINGID_DEFEATEDOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
playfaintcry BS_OPPONENT1
- waitcry BS_ATTACKER
+ waitcry
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
+ waitanimation
arenaopponentmonlost
end2
BattleScript_ArenaJudgmentPlayerLoses:
arenajudgmentstring B_MSG_REF_OPPONENT_WON
- arenawaitmessage B_MSG_REF_OPPONENT_WON
+ arenawaitmessage
arenajudgmentwindow
- arenaerasereftextbox
+ erasearenareftextbox
printstring STRINGID_LOSTTOOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
playfaintcry BS_PLAYER1
- waitcry BS_ATTACKER
+ waitcry
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
+ waitanimation
arenaplayermonlost
end2
BattleScript_ArenaJudgmentDraw:
arenajudgmentstring B_MSG_REF_DRAW
- arenawaitmessage B_MSG_REF_DRAW
+ arenawaitmessage
arenajudgmentwindow
- arenaerasereftextbox
+ erasearenareftextbox
printstring STRINGID_TIEDOPPONENTBYREFEREE
waitmessage B_WAIT_TIME_LONG
+ arenabothmonslost
playfaintcry BS_PLAYER1
- waitcry BS_ATTACKER
+ waitcry
dofaintanimation BS_PLAYER1
cleareffectsonfaint BS_PLAYER1
+ waitanimation
playfaintcry BS_OPPONENT1
- waitcry BS_ATTACKER
+ waitcry
dofaintanimation BS_OPPONENT1
cleareffectsonfaint BS_OPPONENT1
- arenabothmonlost
+ waitanimation
end2
BattleScript_AskIfWantsToForfeitMatch::
printselectionstring STRINGID_QUESTIONFORFEITMATCH
- forfeityesnobox BS_ATTACKER
+ forfeityesnobox
endselectionscript
BattleScript_PrintPlayerForfeited::
@@ -9071,24 +7990,30 @@ BattleScript_MirrorHerbCopyStatChange::
printstring STRINGID_MIRRORHERBCOPIED
waitmessage B_WAIT_TIME_LONG
removeitem BS_SCRIPTING
- playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_MirrorHerbStartCopyStats:
copyfoesstatincrease BS_SCRIPTING, BattleScript_MirrorHerbStartReturn
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorHerbStartReturn
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR, BattleScript_MirrorHerbStartReturn
+ setbyte sSTAT_ANIM_PLAYED, TRUE @ play stat change animation only once
goto BattleScript_MirrorHerbStartCopyStats
BattleScript_MirrorHerbStartReturn:
+ setbyte sSTAT_ANIM_PLAYED, FALSE
return
BattleScript_OpportunistCopyStatChange::
call BattleScript_AbilityPopUpScripting
- playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
BattleScript_OpportunistStartCopyStats:
copyfoesstatincrease BS_SCRIPTING, BattleScript_OpportunistCopyStatChangeEnd
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_OpportunistCopyStatChangeEnd
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR, BattleScript_OpportunistCopyStatChangeEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
+ setbyte sSTAT_ANIM_PLAYED, TRUE @ play stat change animation only once
goto BattleScript_OpportunistStartCopyStats
BattleScript_OpportunistCopyStatChangeEnd:
+ setbyte sSTAT_ANIM_PLAYED, FALSE
+ return
+
+BattleScript_OpportunistCopyStatChangeEnd3::
+ call BattleScript_OpportunistCopyStatChange
end3
BattleScript_TotemVar::
@@ -9100,9 +8025,7 @@ BattleScript_TotemVar_Ret::
BattleScript_TotemVarEnd:
return
BattleScript_ApplyTotemVarBoost:
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_TotemVarEnd
- setgraphicalstatchangevalues
- playanimation BS_SCRIPTING, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_TotemVarEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
goto BattleScript_TotemVar_Ret @loop until stats bitfield is empty
@@ -9125,12 +8048,27 @@ BattleScript_ActivateTeraformZero_RemoveWeather:
removeweather
printfromtable gWeatherEndsStringIds
waitmessage B_WAIT_TIME_LONG
- jumpifhalfword CMP_NO_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_ANY, BattleScript_ActivateTeraformZero_End
+ call BattleScript_ActivateWeatherAbilities
+ jumpifhalfword CMP_NO_COMMON_BITS, gFieldStatuses, STATUS_FIELD_TERRAIN_ANY, BattleScript_ActivateTeraformZeroEffects
BattleScript_ActivateTeraformZero_RemoveTerrain:
removeterrain
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
printfromtable gTerrainStringIds
waitmessage B_WAIT_TIME_LONG
+BattleScript_ActivateTeraformZeroEffects:
+ saveattacker
+ savetarget
+ tryboosterenergy ON_ANY
+ resetterrainabilityflags
+ setbyte gBattlerAttacker, 0
+BattleScript_ActivateTeraformZeroLoop:
+ copyarraywithindex gBattlerTarget, gBattlerByTurnOrder, gBattlerAttacker, 1
+ activateterrainchangeabilities BS_TARGET
+ activateweatherchangeabilities BS_TARGET
+ addbyte gBattlerAttacker, 1
+ jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_ActivateTeraformZeroLoop
+ restoreattacker
+ restoretarget
BattleScript_ActivateTeraformZero_End:
end3
@@ -9174,7 +8112,7 @@ BattleScript_MicleBerryActivateRet::
jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_MicleBerryActivateRet_Ripen
goto BattleScript_MicleBerryActivateRet_Anim
BattleScript_MicleBerryActivateRet_Ripen:
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
BattleScript_MicleBerryActivateRet_Anim:
playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT
printstring STRINGID_MICLEBERRYACTIVATES
@@ -9217,33 +8155,21 @@ BattleScript_ZMoveActivateStatus::
copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
return
-BattleScript_ZMoveActivatePowder::
- flushtextbox
- trytrainerslidezmovemsg
- savetarget
- printstring STRINGID_ZPOWERSURROUNDS
- playanimation BS_ATTACKER, B_ANIM_ZMOVE_ACTIVATE, NULL
- setzeffect
- restoretarget
- goto BattleScript_MoveUsedPowder
-
BattleScript_ZEffectPrintString::
printfromtable gZEffectStringIds
waitmessage B_WAIT_TIME_LONG
return
BattleScript_RecoverHPZMove::
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
printfromtable gZEffectStringIds
waitmessage B_WAIT_TIME_LONG
return
BattleScript_StatUpZMove::
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpZMoveEnd
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_StatUpZMoveEnd
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_StatUpZMoveEnd
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_StatUpZMoveEnd
printstring STRINGID_ZMOVESTATUP
waitmessage B_WAIT_TIME_LONG
printfromtable gStatUpStringIds
@@ -9252,17 +8178,15 @@ BattleScript_StatUpZMoveEnd:
return
BattleScript_HealReplacementZMove::
- playanimation BS_SCRIPTING B_ANIM_WISH_HEAL 0x0
+ playanimation BS_SCRIPTING, B_ANIM_WISH_HEAL, 0x0
printfromtable gZEffectStringIds
waitmessage B_WAIT_TIME_LONG
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
return
BattleScript_EffectExtremeEvoboost::
attackcanceler
- attackstring
- ppreduce
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_ATK, MAX_STAT_STAGE, BattleScript_ExtremeEvoboostAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_DEF, MAX_STAT_STAGE, BattleScript_ExtremeEvoboostAnim
jumpifstat BS_ATTACKER, CMP_LESS_THAN, STAT_SPEED, MAX_STAT_STAGE, BattleScript_ExtremeEvoboostAnim
@@ -9272,95 +8196,48 @@ BattleScript_EffectExtremeEvoboost::
BattleScript_ExtremeEvoboostAnim:
attackanimation
waitanimation
- setbyte sSTAT_ANIM_PLAYED, FALSE
- playstatchangeanimation BS_ATTACKER, BIT_ATK | BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF, 0x0
setstatchanger STAT_ATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostDef, BIT_DEF | BIT_SPEED | BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostDef::
setstatchanger STAT_DEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpeed, BIT_SPEED | BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpeed::
setstatchanger STAT_SPEED, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpAtk, BIT_SPATK | BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpAtk::
setstatchanger STAT_SPATK, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostSpDef, BIT_SPDEF
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostSpDef::
setstatchanger STAT_SPDEF, 2, FALSE
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd
+ statbuffchange BS_ATTACKER, STAT_CHANGE_ALLOW_PTR, BattleScript_ExtremeEvoboostEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_ExtremeEvoboostEnd::
goto BattleScript_MoveEnd
-BattleScript_EffectHitSetRemoveTerrain::
- attackcanceler
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
- ppreduce
- jumpifmovepropertyargument ARG_TRY_REMOVE_TERRAIN_FAIL, BattleScript_RemoveTerrain
- critcalc
- damagecalc
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- setremoveterrain BattleScript_TryFaint
- playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
- printfromtable gTerrainStringIds
- waitmessage B_WAIT_TIME_LONG
-BattleScript_TryFaint:
- tryfaintmon BS_TARGET
- goto BattleScript_MoveEnd
-
-BattleScript_RemoveTerrain:
- jumpifterrainaffected BS_TARGET, STATUS_FIELD_TERRAIN_ANY, BattleScript_RemoveTerrain_Cont
- goto BattleScript_ButItFailed
-BattleScript_RemoveTerrain_Cont:
- critcalc
- damagecalc
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
+BattleScript_RemoveTerrain::
removeterrain
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
printfromtable gTerrainStringIds
waitmessage B_WAIT_TIME_LONG
- tryfaintmon BS_TARGET
- goto BattleScript_MoveEnd
+ return
BattleScript_Pickpocket::
call BattleScript_AbilityPopUp
jumpifability BS_ATTACKER, ABILITY_STICKY_HOLD, BattleScript_PickpocketPrevented
swapattackerwithtarget
+ copybyte gEffectBattler, gBattlerTarget
call BattleScript_ItemSteal
swapattackerwithtarget
- activateitemeffects BS_TARGET
+ activateitemeffects
return
BattleScript_PickpocketPrevented:
@@ -9392,7 +8269,7 @@ BattleScript_RedCardActivates::
printstring STRINGID_REDCARDACTIVATE
waitmessage B_WAIT_TIME_LONG
swapattackerwithtarget
- jumpifstatus3 BS_EFFECT_BATTLER, STATUS3_ROOTED, BattleScript_RedCardIngrain
+ jumpifvolatile BS_EFFECT_BATTLER, VOLATILE_ROOT, BattleScript_RedCardIngrain
jumpifability BS_EFFECT_BATTLER, ABILITY_SUCTION_CUPS, BattleScript_RedCardSuctionCups
jumpiftargetdynamaxed BattleScript_RedCardDynamaxed
removeitem BS_SCRIPTING
@@ -9425,12 +8302,12 @@ BattleScript_EjectButtonActivates::
undodynamax BS_SCRIPTING
makeinvisible BS_SCRIPTING
openpartyscreen BS_SCRIPTING, BattleScript_EjectButtonEnd
+ waitstate
+ returntoball BS_SCRIPTING, FALSE
copybyte sSAVED_BATTLER, sBATTLER
switchoutabilities BS_SCRIPTING
copybyte sBATTLER, sSAVED_BATTLER
- waitstate
- switchhandleorder BS_SCRIPTING 0x2
- returntoball BS_SCRIPTING, FALSE
+ switchhandleorder BS_SCRIPTING, 0x2
getswitchedmondata BS_SCRIPTING
switchindataupdate BS_SCRIPTING
hpthresholds BS_SCRIPTING
@@ -9450,13 +8327,15 @@ BattleScript_EjectPackActivate_End2::
call BattleScript_EjectPackActivate_Ret
end2
+BattleScript_EjectPackActivate_End3::
+ call BattleScript_EjectPackActivate_Ret
+ end3
+
BattleScript_EjectPackActivates::
jumpifcantswitch BS_SCRIPTING, BattleScript_EjectButtonEnd
goto BattleScript_EjectPackActivate_Ret
-BattleScript_DarkTypePreventsPrankster::
- attackstring
- ppreduce
+BattleScript_DoesntAffectTargetAtkString::
pause B_WAIT_TIME_SHORT
printstring STRINGID_ITDOESNTAFFECT
waitmessage B_WAIT_TIME_LONG
@@ -9464,8 +8343,6 @@ BattleScript_DarkTypePreventsPrankster::
goto BattleScript_MoveEnd
BattleScript_WellBakedBodyActivates::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUpTarget
setmoveresultflags MOVE_RESULT_NO_EFFECT
@@ -9474,8 +8351,6 @@ BattleScript_WellBakedBodyEnd:
goto BattleScript_MoveEnd
BattleScript_WindRiderActivatesMoveEnd::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
call BattleScript_AbilityPopUpTarget
setmoveresultflags MOVE_RESULT_NO_EFFECT
@@ -9484,8 +8359,6 @@ BattleScript_WindRiderActivatesMoveEnd_End:
goto BattleScript_MoveEnd
BattleScript_GoodAsGoldActivates::
- attackstring
- ppreduce
call BattleScript_AbilityPopUpTarget
pause B_WAIT_TIME_SHORT
printstring STRINGID_ITDOESNTAFFECT
@@ -9514,6 +8387,7 @@ BattleScript_PastelVeilLoopIncrement:
setallytonexttarget BattleScript_PastelVeil_TryCurePoison
goto BattleScript_PastelVeilEnd
BattleScript_PastelVeilEnd:
+ restoretarget
end3
BattleScript_NeutralizingGasExits::
@@ -9525,8 +8399,7 @@ BattleScript_NeutralizingGasExits::
setbyte gBattlerAttacker, 0
BattleScript_NeutralizingGasExitsLoop:
copyarraywithindex gBattlerTarget, gBattlerByTurnOrder, gBattlerAttacker, 1
- jumpifabilitycantbesuppressed BS_TARGET, BattleScript_NeutralizingGasExitsLoopIncrement
- jumpifability BS_TARGET, ABILITY_IMPOSTER, BattleScript_NeutralizingGasExitsLoopIncrement @ Imposter only activates when first entering the field
+ jumpifabilitycantbereactivated BS_TARGET, BattleScript_NeutralizingGasExitsLoopIncrement
saveattacker
switchinabilities BS_TARGET
restoreattacker
@@ -9549,98 +8422,75 @@ BattleScript_SymbiosisActivates::
return
BattleScript_TargetAbilityStatRaiseRet::
- copybyte sSAVED_BATTLER, gBattlerAttacker
- copybyte gBattlerAbility, gEffectBattler
- copybyte gBattlerAttacker, gBattlerTarget
+ saveattacker
+ copybyte gBattlerAttacker, gEffectBattler
call BattleScript_AbilityPopUp
- statbuffchange MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN, BattleScript_TargetAbilityStatRaiseRet_End
- setgraphicalstatchangevalues
+ statbuffchange BS_ATTACKER, STAT_CHANGE_CERTAIN, BattleScript_TargetAbilityStatRaiseRet_End
call BattleScript_StatUp
BattleScript_TargetAbilityStatRaiseRet_End:
- copybyte gBattlerAttacker, sSAVED_BATTLER
+ restoreattacker
return
@@@ MAX MOVES @@@
BattleScript_EffectMaxMove::
attackcanceler
accuracycheck BattleScript_ButItFailed, NO_ACC_CALC_CHECK_LOCK_ON
- attackstring
- ppreduce
- critcalc
- damagecalc
- adjustdamage
- attackanimation
- waitanimation
- effectivenesssound
- hitanimation BS_TARGET
- waitstate
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
- critmessage
- waitmessage B_WAIT_TIME_LONG
- resultmessage
- waitmessage B_WAIT_TIME_LONG
- tryfaintmon BS_TARGET
- setadditionaleffects
- moveendall
- end
+ goto BattleScript_HitFromCritCalc
BattleScript_EffectRaiseStatAllies::
savetarget
copybyte gBattlerTarget, gBattlerAttacker
+ copybyte sSAVED_STAT_CHANGER, sSTATCHANGER
BattleScript_RaiseSideStatsLoop:
jumpifabsent BS_TARGET, BattleScript_RaiseSideStatsIncrement
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseSideStatsIncrement
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_INCREASE, BattleScript_RaiseSideStatsIncrement
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_RaiseSideStatsIncrement
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_RaiseSideStatsIncrement
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_RaiseSideStatsIncrement:
- setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseSideStatsEnd
setallytonexttarget BattleScript_RaiseSideStatsLoop
BattleScript_RaiseSideStatsEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectLowerStatFoes::
savetarget
copybyte sBATTLER, gBattlerTarget
+ copybyte sSAVED_STAT_CHANGER, sSTATCHANGER
BattleScript_LowerSideStatsLoop:
jumpifabsent BS_TARGET, BattleScript_LowerSideStatsIncrement
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_LowerSideStatsIncrement
- jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_DECREASE, BattleScript_LowerSideStatsIncrement
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ copybyte sSTATCHANGER, sSAVED_STAT_CHANGER
+ statbuffchange BS_TARGET, STAT_CHANGE_ALLOW_PTR, BattleScript_LowerSideStatsIncrement
+ jumpifbyte CMP_EQUAL, cMULTISTRING_CHOOSER, B_MSG_STAT_WONT_CHANGE, BattleScript_LowerSideStatsIncrement
printfromtable gStatDownStringIds
waitmessage B_WAIT_TIME_LONG
BattleScript_LowerSideStatsIncrement:
- setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_LowerSideStatsEnd
setallytonexttarget BattleScript_LowerSideStatsLoop
BattleScript_LowerSideStatsEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectSetWeather::
playanimation 0, B_ANIM_MAX_SET_WEATHER
printfromtable gMoveWeatherChangeStringIds
waitmessage B_WAIT_TIME_LONG
call BattleScript_ActivateWeatherAbilities
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectSetTerrain::
printfromtable gTerrainStringIds
waitmessage B_WAIT_TIME_LONG
playanimation BS_ATTACKER, B_ANIM_RESTORE_BG
call BattleScript_ActivateTerrainEffects
- goto BattleScript_MoveEnd
+ return
BattleScript_DamageNonTypesStarts::
printfromtable gDamageNonTypesStartStringIds
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ return
BattleScript_DamageNonTypesContinues::
printfromtable gDamageNonTypesDmgStringIds
@@ -9653,7 +8503,7 @@ BattleScript_EffectTryReducePP::
tryspiteppreduce BattleScript_MoveEnd
printstring STRINGID_PKMNREDUCEDPP
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectParalyzeSide::
savetarget
@@ -9661,18 +8511,12 @@ BattleScript_EffectParalyzeSide::
BattleScript_ParalyzeSideLoop:
jumpifabsent BS_TARGET, BattleScript_ParalyzeSideIncrement
trysetparalysis BattleScript_ParalyzeSideIncrement
- statusanimation BS_TARGET
- updatestatusicon BS_TARGET
- printfromtable gStatusConditionsStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_EFFECT_BATTLER
- waitstate
BattleScript_ParalyzeSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_ParalyzeSideEnd
setallytonexttarget BattleScript_ParalyzeSideLoop
BattleScript_ParalyzeSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectPoisonSide::
savetarget
@@ -9680,18 +8524,12 @@ BattleScript_EffectPoisonSide::
BattleScript_PoisonSideLoop:
jumpifabsent BS_TARGET, BattleScript_PoisonSideIncrement
trysetpoison BattleScript_PoisonSideIncrement
- statusanimation BS_TARGET
- updatestatusicon BS_TARGET
- printfromtable gStatusConditionsStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_EFFECT_BATTLER
- waitstate
BattleScript_PoisonSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_PoisonSideEnd
setallytonexttarget BattleScript_PoisonSideLoop
BattleScript_PoisonSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectPoisonParalyzeSide::
savetarget
@@ -9699,18 +8537,12 @@ BattleScript_EffectPoisonParalyzeSide::
BattleScript_PoisonParalyzeSideLoop:
jumpifabsent BS_TARGET, BattleScript_PoisonParalyzeSideIncrement
trysetpoisonparalysis BattleScript_PoisonParalyzeSideIncrement
- statusanimation BS_TARGET
- updatestatusicon BS_TARGET
- printfromtable gStatusConditionsStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_EFFECT_BATTLER
- waitstate
BattleScript_PoisonParalyzeSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_PoisonParalyzeSideEnd
setallytonexttarget BattleScript_PoisonParalyzeSideLoop
BattleScript_PoisonParalyzeSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectEffectSporeSide::
savetarget
@@ -9718,18 +8550,12 @@ BattleScript_EffectEffectSporeSide::
BattleScript_EffectSporeSideLoop:
jumpifabsent BS_TARGET, BattleScript_EffectSporeSideIncrement
tryseteffectspore BattleScript_EffectSporeSideIncrement
- statusanimation BS_TARGET
- updatestatusicon BS_TARGET
- printfromtable gStatusConditionsStringIds
- waitmessage B_WAIT_TIME_LONG
- updatestatusicon BS_EFFECT_BATTLER
- waitstate
BattleScript_EffectSporeSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_EffectSporeSideEnd
setallytonexttarget BattleScript_EffectSporeSideLoop
BattleScript_EffectSporeSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectConfuseSide::
savetarget
@@ -9737,9 +8563,9 @@ BattleScript_EffectConfuseSide::
BattleScript_ConfuseSideLoop:
jumpifabsent BS_TARGET, BattleScript_ConfuseSideIncrement
trysetconfusion BattleScript_ConfuseSideIncrement
- status2animation BS_EFFECT_BATTLER, STATUS2_CONFUSION
+ volatileanimation BS_EFFECT_BATTLER, VOLATILE_CONFUSION
BattleScript_ConfuseSidePrintMessage:
- printfromtable gStatus2StringIds
+ printstring STRINGID_PKMNWASCONFUSED
waitmessage B_WAIT_TIME_LONG
BattleScript_ConfuseSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_ConfuseSideEnd
@@ -9747,11 +8573,11 @@ BattleScript_ConfuseSideIncrement:
BattleScript_ConfuseSideEnd:
restoretarget
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 1, BattleScript_PrintCoinsScattered @ Gold Rush
- goto BattleScript_MoveEnd
+ return
BattleScript_PrintCoinsScattered:
printstring STRINGID_COINSSCATTERED
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectInfatuateSide::
savetarget
@@ -9759,16 +8585,16 @@ BattleScript_EffectInfatuateSide::
BattleScript_InfatuateSideLoop:
jumpifabsent BS_TARGET, BattleScript_InfatuateSideIncrement
trysetinfatuation BattleScript_InfatuateSideIncrement
- status2animation BS_EFFECT_BATTLER, STATUS2_INFATUATION
+ volatileanimation BS_EFFECT_BATTLER, VOLATILE_INFATUATION
BattleScript_InfatuateSidePrintMessage:
- printfromtable gStatus2StringIds
+ printstring STRINGID_PKMNFELLINLOVE
waitmessage B_WAIT_TIME_LONG
BattleScript_InfatuateSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_InfatuateSideEnd
setallytonexttarget BattleScript_InfatuateSideLoop
BattleScript_InfatuateSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectTormentSide::
savetarget
@@ -9777,14 +8603,14 @@ BattleScript_TormentSideLoop:
jumpifabsent BS_TARGET, BattleScript_TormentSideIncrement
trysettorment BattleScript_TormentSideIncrement
BattleScript_TormentSidePrintMessage:
- printfromtable gStatus2StringIds
+ printstring STRINGID_PKMNSUBJECTEDTOTORMENT
waitmessage B_WAIT_TIME_LONG
BattleScript_TormentSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_TormentSideEnd
setallytonexttarget BattleScript_TormentSideLoop
BattleScript_TormentSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_TormentEnds::
printstring STRINGID_TORMENTEDNOMORE
@@ -9798,14 +8624,14 @@ BattleScript_MeanLookSideLoop:
jumpifabsent BS_TARGET, BattleScript_MeanLookSideIncrement
trysetescapeprevention BattleScript_MeanLookSideIncrement
BattleScript_MeanLookSidePrintMessage:
- printfromtable gStatus2StringIds
+ printstring STRINGID_TARGETCANTESCAPENOW
waitmessage B_WAIT_TIME_LONG
BattleScript_MeanLookSideIncrement:
jumpifbytenotequal gBattlerTarget, sBATTLER, BattleScript_MeanLookSideEnd
setallytonexttarget BattleScript_MeanLookSideLoop
BattleScript_MeanLookSideEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectRaiseCritAlliesAnim::
savetarget
@@ -9813,28 +8639,25 @@ BattleScript_EffectRaiseCritAlliesAnim::
BattleScript_RaiseCritAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_RaiseCritAlliesIncrement
setstatchanger STAT_ATK, 0, FALSE @ for animation
- setgraphicalstatchangevalues
- playanimation BS_TARGET, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_TARGET, 0, BattleScript_RaiseCritAlliesIncrement @ for animation
printstring STRINGID_PKMNGETTINGPUMPED
waitmessage B_WAIT_TIME_LONG
BattleScript_RaiseCritAlliesIncrement:
- setbyte sSTAT_ANIM_PLAYED, FALSE
jumpifbytenotequal gBattlerTarget, gBattlerAttacker, BattleScript_RaiseCritAlliesEnd
setallytonexttarget BattleScript_RaiseCritAlliesLoop
BattleScript_RaiseCritAlliesEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectHealOneSixthAllies::
- jumpifteamhealthy BS_ATTACKER, BattleScript_MoveEnd
+ jumpifteamhealthy BattleScript_MoveEnd
savetarget
copybyte gBattlerTarget, gBattlerAttacker
BattleScript_HealOneSixthAlliesLoop:
jumpifabsent BS_TARGET, BattleScript_HealOneSixthAlliesIncrement
tryhealsixthhealth BattleScript_HealOneSixthAlliesIncrement
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_TARGET
- datahpupdate BS_TARGET
+ healthbarupdate BS_TARGET, PASSIVE_HP_UPDATE
+ datahpupdate BS_TARGET, PASSIVE_HP_UPDATE
printstring STRINGID_PKMNREGAINEDHEALTH
waitmessage B_WAIT_TIME_LONG
BattleScript_HealOneSixthAlliesIncrement:
@@ -9842,7 +8665,7 @@ BattleScript_HealOneSixthAlliesIncrement:
setallytonexttarget BattleScript_HealOneSixthAlliesLoop
BattleScript_HealOneSixthAlliesEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectRecycleBerriesAllies::
savetarget
@@ -9859,13 +8682,13 @@ BattleScript_RecycleBerriesAlliesIncrement:
setallytonexttarget BattleScript_RecycleBerriesAlliesLoop
BattleScript_RecycleBerriesAlliesEnd:
restoretarget
- goto BattleScript_MoveEnd
+ return
BattleScript_EffectSteelsurge::
setsteelsurge BattleScript_MoveEnd
printfromtable gDmgHazardsStringIds
waitmessage B_WAIT_TIME_LONG
- goto BattleScript_MoveEnd
+ return
@@@ END MAX MOVES @@@
@@ -9907,28 +8730,22 @@ BattleScript_DynamaxEnds::
BattleScript_DynamaxEnds_Ret::
flushtextbox
- spriteignore0hp TRUE
+ setspriteignore0hp TRUE
updatedynamax
playanimation BS_SCRIPTING, B_ANIM_FORM_CHANGE
waitanimation
- spriteignore0hp FALSE
+ setspriteignore0hp FALSE
pause B_WAIT_TIME_SHORT
return
BattleScript_MoveBlockedByDynamax::
- accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
- attackstring
+ accuracycheck BattleScript_MoveMissedPause, ACC_CURR_MOVE
pause B_WAIT_TIME_SHORT
- ppreduce
- jumpifword CMP_COMMON_BITS, gHitMarker, HITMARKER_STRING_PRINTED, BattleScript_MoveEnd
printstring STRINGID_MOVEBLOCKEDBYDYNAMAX
waitmessage B_WAIT_TIME_LONG
- orword gHitMarker, HITMARKER_STRING_PRINTED
goto BattleScript_MoveEnd
BattleScript_PokemonCantUseTheMove::
- attackstring
- ppreduce
pause B_WAIT_TIME_SHORT
printstring STRINGID_BUTPOKEMONCANTUSETHEMOVE
waitmessage B_WAIT_TIME_LONG
@@ -9940,18 +8757,15 @@ BattleScript_CouldntFullyProtect::
return
BattleScript_BerserkGeneRet::
- saveattacker
- savetarget
- copybyte gBattlerTarget, sBATTLER
- statbuffchange STAT_CHANGE_ALLOW_PTR, BattleScript_BerserkGeneRet_TryConfuse
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
- setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_ROSE_ITEM
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR | STAT_CHANGE_ONLY_CHECKING, BattleScript_BerserkGeneRet_TryConfuse
+ playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, sB_ANIM_ARG1
+ statbuffchange BS_SCRIPTING, STAT_CHANGE_ALLOW_PTR, BattleScript_BerserkGeneRet_TryConfuse
+ setbyte cMULTISTRING_CHOOSER, B_MSG_STAT_CHANGED_ITEM
call BattleScript_StatUp
BattleScript_BerserkGeneRet_TryConfuse:
- jumpifability BS_ATTACKER, ABILITY_OWN_TEMPO, BattleScript_BerserkGeneRet_OwnTempoPrevents
+ jumpifability BS_SCRIPTING, ABILITY_OWN_TEMPO, BattleScript_BerserkGeneRet_OwnTempoPrevents
jumpifsafeguard BattleScript_BerserkGeneRet_SafeguardProtected
- seteffectprimary MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
+ seteffectprimary BS_SCRIPTING, BS_SCRIPTING, MOVE_EFFECT_CONFUSION
goto BattleScript_BerserkGeneRet_End
BattleScript_BerserkGeneRet_SafeguardProtected::
pause B_WAIT_TIME_SHORT
@@ -9960,13 +8774,11 @@ BattleScript_BerserkGeneRet_SafeguardProtected::
goto BattleScript_BerserkGeneRet_End
BattleScript_BerserkGeneRet_OwnTempoPrevents:
pause B_WAIT_TIME_SHORT
- call BattleScript_AbilityPopUp
+ call BattleScript_AbilityPopUpScripting
printstring STRINGID_PKMNPREVENTSCONFUSIONWITH
waitmessage B_WAIT_TIME_LONG
BattleScript_BerserkGeneRet_End:
- restoreattacker
- restoretarget
- removeitem BS_ATTACKER
+ removeitem BS_SCRIPTING
return
BattleScript_BerserkGeneRetEnd2::
@@ -9989,8 +8801,6 @@ BattleScript_BoosterEnergyRet::
BattleScript_EffectSnow::
attackcanceler
- attackstring
- ppreduce
call BattleScript_CheckPrimalWeather
setfieldweather BATTLE_WEATHER_SNOW
goto BattleScript_MoveWeatherChange
@@ -10002,7 +8812,7 @@ BattleScript_SleepClauseBlocked::
waitmessage B_WAIT_TIME_LONG
goto BattleScript_MoveEnd
-BattleScript_SleepClausePreventsEnd::
+BattleScript_SleepClausePreventsEnd2::
pause B_WAIT_TIME_SHORT
printstring STRINGID_BLOCKEDBYSLEEPCLAUSE
waitmessage B_WAIT_TIME_LONG
@@ -10010,16 +8820,74 @@ BattleScript_SleepClausePreventsEnd::
BattleScript_QuestionForfeitBattle::
printselectionstring STRINGID_QUESTIONFORFEITBATTLE
- forfeityesnobox BS_ATTACKER
+ forfeityesnobox
endselectionscript
BattleScript_ForfeitBattleGaveMoney::
getmoneyreward
.if B_WHITEOUT_MONEY >= GEN_4
- printstring STRINGID_FORFEITBATTLEGAVEMONEY
+ printstring STRINGID_PLAYERWHITEOUT2_TRAINER
.else
- printstring STRINGID_PLAYERWHITEOUT2
+ printstring STRINGID_PLAYERWHITEOUT3
.endif
waitmessage B_WAIT_TIME_LONG
end2
+BattleScript_Attackstring::
+ printattackstring
+ return
+
+BattleScript_SubmoveAttackstring::
+ printattackstring
+ pause B_WAIT_TIME_LONG
+ attackanimation
+ waitanimation
+ setcalledmove
+ return
+
+BattleScript_SleepTalkAttackstring::
+ printattackstring
+ pause B_WAIT_TIME_LONG
+ printstring STRINGID_PKMNFASTASLEEP
+ waitmessage B_WAIT_TIME_LONG
+ statusanimation BS_ATTACKER
+ attackanimation
+ waitanimation
+ setcalledmove
+ return
+
+BattleScript_MetronomeAttackstring::
+ printattackstring
+ pause B_WAIT_TIME_LONG
+ attackanimation
+ waitanimation
+ setcalledmove
+ printstring STRINGID_WAGGLINGAFINGER
+ waitmessage B_WAIT_TIME_LONG
+ return
+
+BattleScript_NaturePowerAttackstring::
+ printattackstring
+ pause B_WAIT_TIME_SHORT
+ setcalledmove
+ printstring STRINGID_NATUREPOWERTURNEDINTO
+ waitmessage B_WAIT_TIME_LONG
+ return
+
+BattleScript_SwapFromSubstitute::
+ jumpifvolatile BS_SCRIPTING, VOLATILE_SUBSTITUTE, BattleScript_SwapFromSubstituteContinue
+ goto BattleScript_SwapFromSubstituteReturn
+BattleScript_SwapFromSubstituteContinue:
+ playanimation BS_SCRIPTING, B_ANIM_SWAP_FROM_SUBSTITUTE
+ waitanimation
+BattleScript_SwapFromSubstituteReturn:
+ return
+
+BattleScript_SwapToSubstitute::
+ jumpifvolatile BS_SCRIPTING, VOLATILE_SUBSTITUTE, BattleScript_SwapToSubstituteContinue
+ goto BattleScript_SwapToSubstituteReturn
+BattleScript_SwapToSubstituteContinue:
+ playanimation BS_SCRIPTING, B_ANIM_SWAP_TO_SUBSTITUTE
+ waitanimation
+BattleScript_SwapToSubstituteReturn:
+ return
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s
old mode 100644
new mode 100755
index 27e3706e3f75..5f7cc23a8cba
--- a/data/battle_scripts_2.s
+++ b/data/battle_scripts_2.s
@@ -49,9 +49,8 @@ BattleScript_UseItemMessage:
BattleScript_ItemRestoreHPRet:
clearmoveresultflags MOVE_RESULT_NO_EFFECT
- orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
- healthbarupdate BS_SCRIPTING
- datahpupdate BS_SCRIPTING
+ healthbarupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
+ datahpupdate BS_SCRIPTING, PASSIVE_HP_UPDATE
printstring STRINGID_ITEMRESTOREDSPECIESHEALTH
waitmessage B_WAIT_TIME_LONG
return
@@ -75,6 +74,10 @@ BattleScript_ItemRestoreHP_Party::
return
BattleScript_ItemRestoreHP_SendOutRevivedBattler:
+ switchhandleorder BS_SCRIPTING, 0
+ getswitchedmondata BS_SCRIPTING
+ switchindataupdate BS_SCRIPTING
+ trytoclearprimalweather
switchinanim BS_SCRIPTING, FALSE, FALSE
waitstate
switchineffects BS_SCRIPTING
@@ -83,13 +86,18 @@ BattleScript_ItemRestoreHP_SendOutRevivedBattler:
BattleScript_ItemCureStatus::
call BattleScript_UseItemMessage
BattleScript_ItemCureStatusAfterItemMsg:
- itemcurestatus BattleScript_ItemCureStatusEnd
- updatestatusicon BS_SCRIPTING
+ itemcurestatus BattleScript_ItemCureStatusEnd, BattleScript_CureStatus_Battler
printstring STRINGID_ITEMCUREDSPECIESSTATUS
waitmessage B_WAIT_TIME_LONG
BattleScript_ItemCureStatusEnd:
end
+BattleScript_CureStatus_Battler::
+ updatestatusicon BS_SCRIPTING
+ printstring STRINGID_ITEMCUREDSPECIESSTATUS
+ waitmessage B_WAIT_TIME_LONG
+ end
+
BattleScript_ItemHealAndCureStatus::
call BattleScript_UseItemMessage
itemrestorehp BattleScript_ItemCureStatusAfterItemMsg, BattleScript_ItemHealAndCureStatus_Battler
@@ -104,9 +112,7 @@ BattleScript_ItemHealAndCureStatusEnd::
BattleScript_ItemIncreaseStat::
call BattleScript_UseItemMessage
itemincreasestat
- statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_ItemEnd
- setgraphicalstatchangevalues
- playanimation BS_ATTACKER, B_ANIM_STATS_CHANGE, sB_ANIM_ARG1
+ statbuffchange BS_ATTACKER, STAT_CHANGE_NOT_PROTECT_AFFECTED | STAT_CHANGE_ALLOW_PTR, BattleScript_ItemEnd
printfromtable gStatUpStringIds
waitmessage B_WAIT_TIME_LONG
end
@@ -133,7 +139,7 @@ BattleScript_PokeFluteEnd::
BattleScript_ItemSetMist::
call BattleScript_UseItemMessage
setmist
- playmoveanimation BS_ATTACKER, MOVE_MIST
+ playmoveanimation MOVE_MIST
waitanimation
printfromtable gMistUsedStringIds
waitmessage B_WAIT_TIME_LONG
@@ -141,9 +147,10 @@ BattleScript_ItemSetMist::
BattleScript_ItemSetFocusEnergy::
call BattleScript_UseItemMessage
- jumpifstatus2 BS_ATTACKER, STATUS2_FOCUS_ENERGY_ANY, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_DRAGON_CHEER, BattleScript_ButItFailed
+ jumpifvolatile BS_ATTACKER, VOLATILE_FOCUS_ENERGY, BattleScript_ButItFailed
setfocusenergy BS_ATTACKER
- playmoveanimation BS_ATTACKER, MOVE_FOCUS_ENERGY
+ playmoveanimation MOVE_FOCUS_ENERGY
waitanimation
copybyte sBATTLER, gBattlerAttacker
printstring STRINGID_PKMNUSEDXTOGETPUMPED
@@ -212,7 +219,10 @@ BattleScript_WallyBallThrow::
finishturn
BattleScript_ShakeBallThrow::
+ animatewildpokemonafterfailedpokeball BS_TARGET
+ waitmessage B_WAIT_TIME_LONG
printfromtable gBallEscapeStringIds
+ waitanimation
waitmessage B_WAIT_TIME_LONG
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, BATTLE_TYPE_SAFARI, BattleScript_ShakeBallThrowEnd
jumpifbyte CMP_NOT_EQUAL, gNumSafariBalls, 0, BattleScript_ShakeBallThrowEnd
diff --git a/data/event_scripts.s b/data/event_scripts.s
index db5d329b677d..73b171c206ea 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -3,6 +3,7 @@
#include "config/item.h"
#include "constants/global.h"
#include "constants/apprentice.h"
+#include "constants/apricorn_tree.h"
#include "constants/battle.h"
#include "constants/battle_arena.h"
#include "constants/battle_dome.h"
@@ -25,6 +26,7 @@
#include "constants/event_objects.h"
#include "constants/event_object_movement.h"
#include "constants/field_effects.h"
+#include "constants/field_move.h"
#include "constants/field_poison.h"
#include "constants/field_specials.h"
#include "constants/field_tasks.h"
@@ -42,6 +44,7 @@
#include "constants/maps.h"
#include "constants/mauville_old_man.h"
#include "constants/metatile_labels.h"
+#include "constants/move_relearner.h"
#include "constants/moves.h"
#include "constants/party_menu.h"
#include "constants/pokedex.h"
@@ -61,6 +64,7 @@
#include "constants/union_room.h"
#include "constants/vars.h"
#include "constants/weather.h"
+#include "constants/speaker_names.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.include "constants/constants.inc"
@@ -70,6 +74,7 @@
.set ALLOCATE_SCRIPT_CMD_TABLE, 1
.include "data/script_cmd_table.inc"
+.align 2
gSpecialVars::
.4byte gSpecialVar_0x8000
.4byte gSpecialVar_0x8001
@@ -694,6 +699,7 @@ EventScript_SetBrineyLocation_Route109::
.include "data/scripts/obtain_item.inc"
.include "data/scripts/record_mix.inc"
.include "data/scripts/pc.inc"
+ .include "data/scripts/move_relearner.inc"
@ scripts/notices.inc? signs.inc? See comment about text/notices.inc
Common_EventScript_ShowPokemartSign::
@@ -834,7 +840,7 @@ EventScript_UnusedBoardFerry::
delay 30
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0
- showobjectat LOCALID_PLAYER, 0
+ showplayer
delay 30
applymovement LOCALID_PLAYER, Movement_UnusedBoardFerry
waitmovement 0
@@ -849,7 +855,7 @@ Common_EventScript_FerryDepartIsland::
call_if_eq VAR_FACING, DIR_SOUTH, Ferry_EventScript_DepartIslandSouth
call_if_eq VAR_FACING, DIR_WEST, Ferry_EventScript_DepartIslandWest
delay 30
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
call Common_EventScript_FerryDepart
return
@@ -879,6 +885,7 @@ Common_EventScript_PlayerHandedOverTheItem::
.include "data/text/pkmn_center_nurse.inc"
.include "data/text/mart_clerk.inc"
.include "data/text/obtain_item.inc"
+ .include "data/text/move_relearner.inc"
@ The below and surf.inc could be split into some text/notices.inc
gText_PokemartSign::
@@ -1111,9 +1118,6 @@ EventScript_VsSeekerChargingDone::
.include "data/scripts/cable_club.inc"
.include "data/text/cable_club.inc"
.include "data/scripts/contest_hall.inc"
- .include "data/text/contest_strings.inc"
- .include "data/text/contest_link.inc"
- .include "data/text/contest_painting.inc"
.include "data/scripts/tv.inc"
.include "data/text/tv.inc"
.include "data/scripts/interview.inc"
@@ -1157,3 +1161,5 @@ EventScript_VsSeekerChargingDone::
.include "data/text/save.inc"
.include "data/text/birch_speech.inc"
.include "data/scripts/dexnav.inc"
+ .include "data/scripts/battle_frontier.inc"
+ .include "data/scripts/apricorn_tree.inc"
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 98ed66a13d39..ce71a102fdb9 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -81,6 +81,9 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_TracksSpot @ FLDEFF_TRACKS_SPOT
.4byte gFieldEffectScript_CaveDust @ FLDEFF_CAVE_DUST
.4byte gFieldEffectScript_Defog @ FLDEFF_DEFOG
+ .4byte gFieldEffectScript_UseRockClimb @ FLDEFF_USE_ROCK_CLIMB
+ .4byte gFieldEffectScript_RockClimbDust @ FLDEFF_ROCK_CLIMB_DUST
+ .4byte gFieldEffectScript_ORASDowse @ FLDEFF_ORAS_DOWSE
gFieldEffectScript_ExclamationMarkIcon1::
field_eff_callnative FldEff_ExclamationMarkIcon
@@ -384,3 +387,16 @@ gFieldEffectScript_CaveDust::
gFieldEffectScript_Defog::
field_eff_callnative FldEff_Defog
field_eff_end
+
+gFieldEffectScript_UseRockClimb:: @ 82DBC3F
+ field_eff_callnative FldEff_UseRockClimb
+ field_eff_end
+
+gFieldEffectScript_RockClimbDust:: @ 82DBB28
+ field_eff_loadfadedpal_callnative gSpritePalette_BigDust, FldEff_RockClimbDust
+ field_eff_end
+
+gFieldEffectScript_ORASDowse::
+ field_eff_callnative FldEff_ORASDowsing
+ field_eff_end
+
diff --git a/data/map_events.s b/data/map_events.s
index 729f9725dfef..13064da0255f 100644
--- a/data/map_events.s
+++ b/data/map_events.s
@@ -13,6 +13,7 @@
#include "constants/trainer_types.h"
#include "constants/berry.h"
#include "constants/species.h"
+#include "constants/apricorn_tree.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
diff --git a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
index 7969ca9eb779..fdcd609bc8dd 100644
--- a/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
@@ -182,10 +182,14 @@ BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons::
BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLv50::
msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMonsLvOpen::
msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed::
@@ -409,7 +413,9 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLvOpen:
.string "different kinds of POKΓ©MON.\p"
.string "They also must not hold the same\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsEnd:
.string "When you have made your preparations,\n"
.string "please do return.$"
@@ -423,9 +429,7 @@ BattleFrontier_BattleArenaLobby_Text_NotEnoughValidMonsLv50:
.string "must all be Level 50 or lower.\p"
.string "They also must not hold the same\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "When you have made your preparations,\n"
- .string "please do return.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleArenaLobby_Text_GuideYouToArena:
.string "I shall now guide you to\n"
diff --git a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
index cf6510189c4d..f3522ccfb684 100644
--- a/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
@@ -210,10 +210,14 @@ BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons::
BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLv50::
msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMonsLvOpen::
msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed::
@@ -486,7 +490,9 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLvOpen:
.string "You don't have three eligible POKΓ©MON.\p"
.string "Also, the POKΓ©MON must be holding\n"
.string "different kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsEnd:
.string "Please come see me when you are ready.$"
BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50:
@@ -496,8 +502,7 @@ BattleFrontier_BattleDomeLobby_Text_NotEnoughValidMonsLv50:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleDomeLobby_Text_ShowYouToBattleDome:
.string "I will now show you to\n"
diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
index e06284c2caaf..3406d4121c30 100644
--- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
@@ -18,6 +18,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnFrame:
BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
+ delay 1
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
setvar VAR_TEMP_0, 1
applymovement LOCALID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
index d80eaa49c296..9ef4479f2ef4 100644
--- a/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
@@ -202,10 +202,14 @@ BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons::
BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLv50::
msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMonsLvOpen::
msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed::
@@ -427,7 +431,9 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLv50:
.string "Level 50 or lower.\p"
.string "They also must not be holding\n"
.string "the same kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsEnd:
.string "Come back when you have made\n"
.string "your preparations.$"
@@ -439,9 +445,7 @@ BattleFrontier_BattlePalaceLobby_Text_NotEnoughValidMonsLvOpen:
.string "different kinds of POKΓ©MON.\p"
.string "They also must not be holding\n"
.string "the same kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Come back when you have made\n"
- .string "your preparations.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons:
.string "Good. Now, you must select your\n"
diff --git a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
index 6e72a30ec0cd..db0067355017 100644
--- a/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
@@ -172,10 +172,14 @@ BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons::
BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLv50::
msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMonsLvOpen::
msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePikeLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed::
@@ -315,7 +319,9 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLv50:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsEnd:
.string "Please come see me when\n"
.string "you are readyβ¦$"
@@ -327,9 +333,7 @@ BattleFrontier_BattlePikeLobby_Text_NotEnoughValidMonsLvOpen:
.string "POKΓ©MON to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when\n"
- .string "you are readyβ¦$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons:
.string "Please choose the three POKΓ©MON\n"
diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
index a8f949ca58fe..75f3c37cd823 100644
--- a/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
@@ -184,10 +184,14 @@ BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons::
BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLv50::
msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMonsLvOpen::
msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_EndCancelChallenge
BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed::
@@ -573,9 +577,7 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLvOpen:
.string "POKΓ©MON qualified for the challenge.\p"
.string "Please also remember to take all\n"
.string "items from your POKΓ©MON.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "When you are ready, please have\n"
- .string "a word with me.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50:
.string "A slight problem, adventurer!\p"
@@ -585,7 +587,9 @@ BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsLv50:
.string "and each no higher than Level 50.\p"
.string "Please also remember to take all\n"
.string "items from your POKΓ©MON.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattlePyramidLobby_Text_NotEnoughValidMonsEnd:
.string "When you are ready, please have\n"
.string "a word with me.$"
diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
index 945335f7b73c..3240683f954e 100644
--- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
@@ -543,16 +543,22 @@ BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50::
case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles
case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Singles::
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLv50Doubles::
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
@@ -561,16 +567,22 @@ BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpen::
case FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles
case FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenSingles::
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMonsLvOpenDoubles::
msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles, MSGBOX_DEFAULT
+ call BattleFrontier_ShowCaughtBannedSpecies
+ msgbox BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndCancelChallenge
end
@@ -1083,7 +1095,9 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
+ .string "EGGS{STR_VAR_1}.$"
+
+BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsEnd:
.string "Please come see me when you are ready.$"
@ Unused
@@ -1094,8 +1108,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpen:
.string "to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles:
.string "Excuse me!\p"
@@ -1104,8 +1117,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Singles:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles:
.string "Excuse me!\p"
@@ -1114,8 +1126,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenSingles:
.string "to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles:
.string "Excuse me!\p"
@@ -1124,8 +1135,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Doubles:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles:
.string "Excuse me!\p"
@@ -1134,8 +1144,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenDoubles:
.string "to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis:
.string "Excuse me!\p"
@@ -1144,8 +1153,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLv50Multis:
.string "of Level 50 or less to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis:
.string "Excuse me!\p"
@@ -1154,8 +1162,7 @@ BattleFrontier_BattleTowerLobby_Text_NotEnoughValidMonsLvOpenMultis:
.string "to enter.\p"
.string "They also must be holding different\n"
.string "kinds of items.\p"
- .string "EGGS{STR_VAR_1} ineligible.\p"
- .string "Please come see me when you are ready.$"
+ .string "EGGS{STR_VAR_1}.$"
BattleFrontier_BattleTowerLobby_Text_WelcomSingleBattle:
.string "Where the talents of TRAINERS\n"
diff --git a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
index 8dd70b9b0490..ea58d275dfe4 100644
--- a/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
+++ b/data/maps/FallarborTown_MoveRelearnersHouse/scripts.inc
@@ -22,6 +22,7 @@ FallarborTown_MoveRelearnersHouse_EventScript_AskTeachMove::
FallarborTown_MoveRelearnersHouse_EventScript_ChooseMon::
msgbox FallarborTown_MoveRelearnersHouse_Text_TutorWhichMon, MSGBOX_DEFAULT
+ setmoverelearnerstate MOVE_RELEARNER_LEVEL_UP_MOVES @ Specifically supposed to teach level up moves
special ChooseMonForMoveRelearner
waitstate
goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, FallarborTown_MoveRelearnersHouse_EventScript_ComeBackWithHeartScale
diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc
index 862a5ef37d7b..41db53c954c5 100644
--- a/data/maps/LilycoveCity_ContestLobby/scripts.inc
+++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc
@@ -349,7 +349,11 @@ LilycoveCity_ContestLobby_EventScript_SetMasterContestType::
@ Functionally unused
LilycoveCity_ContestLobby_EventScript_SetDebug::
setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR
- copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
+#ifdef UBFIX
+ setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
+#else
+ copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
+#endif
additem ITEM_CONTEST_PASS
setvar VAR_0x800B, 8
setvar VAR_CONTEST_RANK, CONTEST_RANK_MASTER
diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 9388609ab5b1..89bbb0714ce3 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -333,7 +333,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithSailor::
call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth
call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
delay 30
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
setvar VAR_0x8004, LOCALID_LILYCOVE_HARBOR_SS_TIDAL
call Common_EventScript_FerryDepart
return
@@ -393,7 +393,7 @@ LilycoveCity_Harbor_EventScript_BoardFerry::
call_if_eq VAR_FACING, DIR_NORTH, LilycoveCity_Harbor_EventScript_PlayerBoardFerryNorth
call_if_eq VAR_FACING, DIR_EAST, LilycoveCity_Harbor_EventScript_PlayerBoardFerryEast
delay 30
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
setvar VAR_0x8004, LOCALID_LILYCOVE_HARBOR_SS_TIDAL
call Common_EventScript_FerryDepart
return
diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
index e00c7bcb3c2c..1ac10a401698 100644
--- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
@@ -76,7 +76,11 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall::
applymovement LOCALID_PLAYER, LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft
waitmovement 0
msgbox LilycoveCity_LilycoveMuseum_2F_Text_PleaseObtainPaintingsForExhibit, MSGBOX_SIGN
- copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
+#ifdef UBFIX
+ setvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1
+#else
+ copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 1, warn=FALSE
+#endif
releaseall
end
diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc
index fd1d970b1349..6a2c6af41bb1 100644
--- a/data/maps/LittlerootTown/scripts.inc
+++ b/data/maps/LittlerootTown/scripts.inc
@@ -156,7 +156,7 @@ LittlerootTown_EventScript_GoInsideWithMom::
waitmovement 0
setflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setvar VAR_LITTLEROOT_INTRO_STATE, 3
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor VAR_0x8004, VAR_0x8005
waitdooranim
clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index 37fd2ccde7e1..cdff230d770c 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -851,4 +851,3 @@ MtChimney_Text_SawyerRematchDefeat:
MtChimney_Text_SawyerPostRematch:
.string "Actually, it really is hot here.\n"
.string "I'm overdressed for these parts.$"
-
diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc
index bad2488f0b49..a530e01113ff 100644
--- a/data/maps/SkyPillar_2F/scripts.inc
+++ b/data/maps/SkyPillar_2F/scripts.inc
@@ -6,7 +6,11 @@ SkyPillar_2F_MapScripts::
SkyPillar_2F_OnTransition:
call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_2F_EventScript_CleanFloor
- copyvar VAR_ICE_STEP_COUNT, 1
+#ifdef UBFIX
+ setvar VAR_ICE_STEP_COUNT, 1
+#else
+ copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
+#endif
end
SkyPillar_2F_EventScript_CleanFloor::
diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc
index 9e8f1e80ea49..603144f04bd1 100644
--- a/data/maps/SkyPillar_4F/scripts.inc
+++ b/data/maps/SkyPillar_4F/scripts.inc
@@ -6,7 +6,11 @@ SkyPillar_4F_MapScripts::
SkyPillar_4F_OnTransition:
call_if_lt VAR_SKY_PILLAR_STATE, 2, SkyPillar_4F_EventScript_CleanFloor
- copyvar VAR_ICE_STEP_COUNT, 1
+#ifdef UBFIX
+ setvar VAR_ICE_STEP_COUNT, 1
+#else
+ copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
+#endif
end
SkyPillar_4F_EventScript_CleanFloor::
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index ebcd40ab0caa..52fd04ec65fd 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -228,7 +228,7 @@ SlateportCity_Harbor_EventScript_BoardFerry::
call_if_eq VAR_FACING, DIR_NORTH, SlateportCity_Harbor_EventScript_BoardFerryNorth
call_if_eq VAR_FACING, DIR_EAST, SlateportCity_Harbor_EventScript_BoardFerryEast
delay 30
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
setvar VAR_0x8004, LOCALID_SLATEPORT_HARBOR_SS_TIDAL
call Common_EventScript_FerryDepart
return
diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
index 70463728f34e..c46099e39ac2 100644
--- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
@@ -433,4 +433,3 @@ SlateportCity_OceanicMuseum_2F_Text_SSAnneReplica:
.string "βS.S. ANNE\p"
.string "βA replica of the luxury liner that\n"
.string "circles the globe.β$"
-
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 8a90679c8ddb..78e82055f6f2 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -620,72 +620,5 @@
],
"gMapGroup_IndoorRoute124": [
"Route124_DivingTreasureHuntersHouse"
- ],
- "connections_include_order": [
- "LittlerootTown",
- "OldaleTown",
- "DewfordTown",
- "LavaridgeTown",
- "FallarborTown",
- "VerdanturfTown",
- "PacifidlogTown",
- "PetalburgCity",
- "SlateportCity",
- "MauvilleCity",
- "RustboroCity",
- "FortreeCity",
- "LilycoveCity",
- "MossdeepCity",
- "SootopolisCity",
- "EverGrandeCity",
- "Route101",
- "Route102",
- "Route103",
- "Route104",
- "Route105",
- "Route106",
- "Route107",
- "Route108",
- "Route109",
- "Route110",
- "Route111",
- "Route112",
- "Route113",
- "Route114",
- "Route115",
- "Route116",
- "Route117",
- "Route118",
- "Route119",
- "Route120",
- "Route121",
- "Route122",
- "Route123",
- "Route124",
- "Route125",
- "Route126",
- "Route127",
- "Route128",
- "Route129",
- "Route130",
- "Route131",
- "Route132",
- "Route133",
- "Route134",
- "Underwater_Route105",
- "Underwater_Route124",
- "Underwater_Route125",
- "Underwater_Route126",
- "Underwater_Route127",
- "Underwater_Route128",
- "Underwater_Route129",
- "SafariZone_Northwest",
- "SafariZone_North",
- "SafariZone_Southwest",
- "SafariZone_South",
- "SafariZone_Northeast",
- "SafariZone_Southeast",
- "BattleFrontier_OutsideWest",
- "BattleFrontier_OutsideEast"
]
}
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 457ff8f67016..a3defef83ef1 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -146,7 +146,7 @@ gScriptCmdTable::
script_cmd_table_entry SCR_OP_GIVEMON ScrCmd_nop1, requests_effects=1 @ 0x79
script_cmd_table_entry SCR_OP_GIVEEGG ScrCmd_giveegg, requests_effects=1 @ 0x7a
script_cmd_table_entry SCR_OP_SETMONMOVE ScrCmd_setmonmove, requests_effects=1 @ 0x7b
- script_cmd_table_entry SCR_OP_CHECKPARTYMOVE ScrCmd_checkpartymove, requests_effects=1 @ 0x7c
+ script_cmd_table_entry SCR_OP_CHECKFIELDMOVE ScrCmd_checkfieldmove, requests_effects=1 @ 0x7c
script_cmd_table_entry SCR_OP_BUFFERSPECIESNAME ScrCmd_bufferspeciesname, requests_effects=1 @ 0x7d
script_cmd_table_entry SCR_OP_BUFFERLEADMONSPECIESNAME ScrCmd_bufferleadmonspeciesname, requests_effects=1 @ 0x7e
script_cmd_table_entry SCR_OP_BUFFERPARTYMONNICK ScrCmd_bufferpartymonnick, requests_effects=1 @ 0x7f
@@ -251,6 +251,7 @@ gScriptCmdTable::
script_cmd_table_entry SCR_OP_BUFFERITEMNAMEPLURAL ScrCmd_bufferitemnameplural, requests_effects=1 @ 0xe2
script_cmd_table_entry SCR_OP_DYNMULTICHOICE ScrCmd_dynmultichoice, requests_effects=1 @ 0xe3
script_cmd_table_entry SCR_OP_DYNMULTIPUSH ScrCmd_dynmultipush, requests_effects=1 @ 0xe4
+ script_cmd_table_entry SCR_OP_HIDEFOLLOWER ScrCmd_hidefollower, requests_effects=1 @ 0xe5
.if ALLOCATE_SCRIPT_CMD_TABLE
gScriptCmdTableEnd::
diff --git a/data/scripts/apricorn_tree.inc b/data/scripts/apricorn_tree.inc
new file mode 100644
index 000000000000..019b2b76b0fb
--- /dev/null
+++ b/data/scripts/apricorn_tree.inc
@@ -0,0 +1,89 @@
+ApricornTreeScript::
+ lock
+ faceplayer
+ message ApricornTree_Text_Intro
+ waitmessage
+ special ObjectEventInteractionGetApricornTreeData
+ goto_if_gt VAR_0x8005, 0, ApricornTree_EventScript_WantToPick
+ message ApricornTree_Text_Empty
+ waitmessage
+ waitbuttonpress
+ release
+ end
+
+ApricornTree_EventScript_WantToPick::
+ buffernumberstring STR_VAR_2, VAR_0x8005
+ msgbox ApricornTree_Text_WantToPick, MSGBOX_YESNO
+ goto_if_eq VAR_RESULT, YES, ApricornTree_EventScript_PickApricorn
+ goto_if_eq VAR_RESULT, NO, ApricornTree_EventScript_CancelPickingApricorn
+
+.set APRICORN_NORMAL_BAG_FULL, 0
+.set APRICORN_NORMAL_SPACE_IN_BAG, 1
+
+ApricornTree_EventScript_PickApricorn::
+ special ObjectEventInteractionPickApricornTree
+ call EventScript_BufferPocketNameAndTryFanfare
+ goto_if_eq VAR_0x8006, APRICORN_NORMAL_BAG_FULL, ApricornTree_EventScript_PocketFull
+ message ApricornTree_Text_PickedTheApricorn
+.if OW_SHOW_ITEM_DESCRIPTIONS != OW_ITEM_DESCRIPTIONS_OFF
+ copyvar VAR_0x8006 VAR_0x8004
+.endif
+ delay 10
+.if OW_SHOW_ITEM_DESCRIPTIONS != OW_ITEM_DESCRIPTIONS_OFF
+ showberrydescription
+.endif
+ playfanfare MUS_OBTAIN_BERRY
+ waitmessage
+ waitfanfare
+ waitbuttonpress
+ message ApricornTree_Text_PutAwayApricorn
+ waitmessage
+ waitbuttonpress
+.if OW_SHOW_ITEM_DESCRIPTIONS != OW_ITEM_DESCRIPTIONS_OFF
+ hideitemdescription
+.endif
+ release
+ end
+
+ApricornTree_EventScript_PocketFull::
+ message ApricornTree_Text_PocketFull
+ waitmessage
+ waitbuttonpress
+ release
+ end
+
+ApricornTree_EventScript_CancelPickingApricorn::
+ message ApricornTree_Text_ApricornLeftUnpicked
+ waitmessage
+ waitbuttonpress
+ release
+ end
+
+ApricornTree_Text_Intro:
+ .string "It's an Apricorn Tree!$"
+
+ApricornTree_Text_Empty:
+ .string "There are no Apricornsβ¦$"
+
+ApricornTree_Text_WantToPick:
+ .string "β¦It's {STR_VAR_2} {STR_VAR_1}!\p"
+ .string "Do you want to pick the\n"
+ .string "{STR_VAR_1}?$"
+
+ApricornTree_Text_PickedTheApricorn:
+ .string "{PLAYER} obtained\n"
+ .string "{STR_VAR_2} {STR_VAR_1}.$"
+
+ApricornTree_Text_PutAwayApricorn:
+ .string "{PLAYER} put away the\n"
+ .string "{STR_VAR_1} in\l"
+ .string "the BAG's {STR_VAR_3} POCKET.$"
+
+ApricornTree_Text_PocketFull:
+ .string "The BAG's {STR_VAR_3} POCKET is full.\p"
+ .string "{PLAYER} gave up on the\p"
+ .string "{STR_VAR_1}β¦$"
+
+ApricornTree_Text_ApricornLeftUnpicked:
+ .string "{PLAYER} gave up on the\p"
+ .string "{STR_VAR_1}β¦$"
diff --git a/data/scripts/battle_frontier.inc b/data/scripts/battle_frontier.inc
new file mode 100644
index 000000000000..cbfd1ac5eeee
--- /dev/null
+++ b/data/scripts/battle_frontier.inc
@@ -0,0 +1,13 @@
+BattleFrontier_ShowCaughtBannedSpecies::
+ goto_if_eq VAR_0x8005, 0, BattleFrontier_ShowCaughtBannedSpeciesEnd
+ msgbox BattleFrontier_DoYouWantToSeeTheListOfCaughtBannedSpecies, MSGBOX_YESNO
+ goto_if_eq VAR_RESULT, NO, BattleFrontier_ShowCaughtBannedSpeciesEnd
+ callnative ShowBattleFrontierCaughtBannedSpecies
+ waitstate
+BattleFrontier_ShowCaughtBannedSpeciesEnd:
+ return
+
+
+BattleFrontier_DoYouWantToSeeTheListOfCaughtBannedSpecies:
+ .string "Do you want to see the list of\n"
+ .string "POKΓ©MON species you can't bring?$"
diff --git a/data/scripts/battle_pike.inc b/data/scripts/battle_pike.inc
index 2108becd06e6..c4612609b07c 100644
--- a/data/scripts/battle_pike.inc
+++ b/data/scripts/battle_pike.inc
@@ -85,6 +85,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_RightRoomWarp::
end
BattleFrontier_BattlePikeThreePathRoom_EventScript_RoomWarp::
+ clearflag FLAG_SAFE_FOLLOWER_MOVEMENT
pike_get PIKE_DATA_WIN_STREAK
addvar VAR_RESULT, 1
pike_set PIKE_DATA_WIN_STREAK, VAR_RESULT
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index 227981578f5b..1c547f89804c 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -356,7 +356,7 @@ CableClub_EventScript_EnterColosseum::
waitdooranim
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor 9, 1
waitdooranim
release
@@ -450,7 +450,7 @@ CableClub_EventScript_EnterTradeCenter::
waitdooranim
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor 9, 1
waitdooranim
release
@@ -515,7 +515,7 @@ CableClub_EventScript_EnterRecordCorner::
waitdooranim
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor 9, 1
waitdooranim
release
@@ -902,7 +902,7 @@ CableClub_EventScript_EnterUnionRoom::
waitdooranim
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor 5, 1
waitdooranim
special Script_ResetUnionRoomTrade
@@ -1202,7 +1202,7 @@ CableClub_EventScript_EnterWirelessLinkRoom::
waitdooranim
applymovement LOCALID_PLAYER, Movement_PlayerEnterLinkRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
closedoor 9, 1
waitdooranim
release
@@ -1384,7 +1384,7 @@ MossdeepCity_GameCorner_1F_EventScript_EnterMinigameRoom::
closemessage
applymovement LOCALID_PLAYER, Movement_PlayerEnterMinigameRoom
waitmovement 0
- hideobjectat LOCALID_PLAYER, 0
+ hideplayer
release
waitstate
end
diff --git a/data/scripts/cave_hole.inc b/data/scripts/cave_hole.inc
index fc4962912af3..e6f9084705a5 100644
--- a/data/scripts/cave_hole.inc
+++ b/data/scripts/cave_hole.inc
@@ -3,7 +3,11 @@ CaveHole_CheckFallDownHole:
.2byte 0
CaveHole_FixCrackedGround:
- copyvar VAR_ICE_STEP_COUNT, 1
+#ifdef UBFIX
+ setvar VAR_ICE_STEP_COUNT, 1
+#else
+ copyvar VAR_ICE_STEP_COUNT, 1, warn=FALSE
+#endif
end
EventScript_FallDownHole::
diff --git a/data/scripts/debug.inc b/data/scripts/debug.inc
index d82ce2f358b6..921a3247e4e4 100644
--- a/data/scripts/debug.inc
+++ b/data/scripts/debug.inc
@@ -87,6 +87,15 @@ Debug_FlagsNotSetBattleConfigMessage_Text:
.string "Please define a usable flag in:\l"
.string "'include/config/battle.h'!$"
+Debug_VarsNotSetBattleConfigMessage::
+ message Debug_VarsNotSetBattleConfigMessage_Text
+ goto Debug_MessageEnd
+
+Debug_VarsNotSetBattleConfigMessage_Text:
+ .string "Feature unavailable!\n"
+ .string "Please define a usable var in:\l"
+ .string "'include/config/battle.h'!$"
+
Debug_BoxFilledMessage::
message Debug_BoxFilledMessage_Text
goto Debug_MessageEnd
@@ -270,6 +279,24 @@ Debug_ShowExpansionVersion::
Debug_ExpansionVersion:
.string "pokeemerald-expansion {STR_VAR_1}$"
+Debug_Follower_NPC_Not_Enabled::
+ msgbox Debug_Enable_To_Use_Follower_NPCs, MSGBOX_DEFAULT
+ release
+ end
+
+Debug_Enable_To_Use_Follower_NPCs:
+ .string "Feature unavailable.\nSet FNPC_ENABLE_NPC_FOLLOWERS to\lTRUE in 'include/config/follower_npc.h'.$"
+
+Debug_Follower_NPC_Event_Script::
+ lock
+ facefollowernpc
+ msgbox Debug_Follower_NPC_Test_Message, MSGBOX_DEFAULT
+ releaseall
+ end
+
+Debug_Follower_NPC_Test_Message:
+ .string "This is a Follower NPC test.$"
+
Debug_EventScript_Steven_Multi::
call MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle
release
@@ -335,6 +362,66 @@ Debug_EventScript_InflictStatus1_Single:
releaseall
end
+Debug_EventScript_SetHiddenNature::
+ special ChoosePartyMon
+ waitstate
+ goto_if_ge VAR_0x8004, PARTY_SIZE, Debug_EventScript_InflictStatus1_Close
+ specialvar VAR_RESULT, ScriptGetPartyMonSpecies
+ goto_if_eq VAR_RESULT, SPECIES_EGG, Debug_EventScript_InflictStatus1_Close
+ dynmultipush Debug_EventScript_ChangeNature_Text_Hardy, 0
+ dynmultipush Debug_EventScript_ChangeNature_Text_Lonely, 1
+ dynmultipush Debug_EventScript_ChangeNature_Text_Brave, 2
+ dynmultipush Debug_EventScript_ChangeNature_Text_Adamant, 3
+ dynmultipush Debug_EventScript_ChangeNature_Text_Naughty, 4
+ dynmultipush Debug_EventScript_ChangeNature_Text_Bold, 5
+ dynmultipush Debug_EventScript_ChangeNature_Text_Docile, 6
+ dynmultipush Debug_EventScript_ChangeNature_Text_Relaxed, 7
+ dynmultipush Debug_EventScript_ChangeNature_Text_Impish, 8
+ dynmultipush Debug_EventScript_ChangeNature_Text_Lax, 9
+ dynmultipush Debug_EventScript_ChangeNature_Text_Timid, 10
+ dynmultipush Debug_EventScript_ChangeNature_Text_Hasty, 11
+ dynmultipush Debug_EventScript_ChangeNature_Text_Serious, 12
+ dynmultipush Debug_EventScript_ChangeNature_Text_Jolly, 13
+ dynmultipush Debug_EventScript_ChangeNature_Text_Naive, 14
+ dynmultipush Debug_EventScript_ChangeNature_Text_Modest, 15
+ dynmultipush Debug_EventScript_ChangeNature_Text_Mild, 16
+ dynmultipush Debug_EventScript_ChangeNature_Text_Quiet, 17
+ dynmultipush Debug_EventScript_ChangeNature_Text_Bashful, 18
+ dynmultipush Debug_EventScript_ChangeNature_Text_Rash, 19
+ dynmultipush Debug_EventScript_ChangeNature_Text_Calm, 20
+ dynmultipush Debug_EventScript_ChangeNature_Text_Gentle, 21
+ dynmultipush Debug_EventScript_ChangeNature_Text_Sassy, 22
+ dynmultipush Debug_EventScript_ChangeNature_Text_Careful, 23
+ dynmultipush Debug_EventScript_ChangeNature_Text_Quirky, 24
+ dynmultistack 0, 0, TRUE, 7, FALSE, 0, NULL
+ switch VAR_RESULT
+ case MULTI_B_PRESSED, Debug_EventScript_InflictStatus1_Close
+ special SetHiddenNature
+ releaseall
+ end
+
+Debug_EventScript_SetAbility::
+ special ChoosePartyMon
+ waitstate
+ callnative DebugNative_GetAbilityNames
+ dynmultipush gStringVar1, 0
+ dynmultipush gStringVar2, 1
+ dynmultipush gStringVar3, 2
+ dynmultistack 0, 0, FALSE, 3 FALSE, 0, NULL
+ switch VAR_RESULT
+ case MULTI_B_PRESSED, Debug_EventScript_SetAbilityClose
+ special SetAbility
+Debug_EventScript_SetAbilityClose:
+ releaseall
+ end
+
+Debug_EventScript_SetFriendship::
+ special ChoosePartyMon
+ waitstate
+ callnative DebugNative_Party_SetFriendship
+ releaseall
+ end
+
Debug_EventScript_InflictStatus1_Single_Poison:
setstatus1 STATUS1_POISON, VAR_0x8004
releaseall
@@ -443,6 +530,57 @@ Debug_EventScript_InflictStatus1_Text_Freeze:
Debug_EventScript_InflictStatus1_Text_Frostbite:
.string "Frostbite$"
+Debug_EventScript_ChangeNature_Text_Hardy:
+ .string "Hardy$"
+Debug_EventScript_ChangeNature_Text_Lonely:
+ .string "Lonely$"
+Debug_EventScript_ChangeNature_Text_Brave:
+ .string "Brave$"
+Debug_EventScript_ChangeNature_Text_Adamant:
+ .string "Adamant$"
+Debug_EventScript_ChangeNature_Text_Naughty:
+ .string "Naughty$"
+Debug_EventScript_ChangeNature_Text_Bold:
+ .string "Bold$"
+Debug_EventScript_ChangeNature_Text_Docile:
+ .string "Docile$"
+Debug_EventScript_ChangeNature_Text_Relaxed:
+ .string "Relaxed$"
+Debug_EventScript_ChangeNature_Text_Impish:
+ .string "Impish$"
+Debug_EventScript_ChangeNature_Text_Lax:
+ .string "Lax$"
+Debug_EventScript_ChangeNature_Text_Timid:
+ .string "Timid$"
+Debug_EventScript_ChangeNature_Text_Hasty:
+ .string "Hasty$"
+Debug_EventScript_ChangeNature_Text_Serious:
+ .string "Serious$"
+Debug_EventScript_ChangeNature_Text_Jolly:
+ .string "Jolly$"
+Debug_EventScript_ChangeNature_Text_Naive:
+ .string "Naive$"
+Debug_EventScript_ChangeNature_Text_Modest:
+ .string "Modest$"
+Debug_EventScript_ChangeNature_Text_Mild:
+ .string "Mild$"
+Debug_EventScript_ChangeNature_Text_Quiet:
+ .string "Quiet$"
+Debug_EventScript_ChangeNature_Text_Bashful:
+ .string "Bashful$"
+Debug_EventScript_ChangeNature_Text_Rash:
+ .string "Rash$"
+Debug_EventScript_ChangeNature_Text_Calm:
+ .string "Calm$"
+Debug_EventScript_ChangeNature_Text_Gentle:
+ .string "Gentle$"
+Debug_EventScript_ChangeNature_Text_Sassy:
+ .string "Sassy$"
+Debug_EventScript_ChangeNature_Text_Careful:
+ .string "Careful$"
+Debug_EventScript_ChangeNature_Text_Quirky:
+ .string "Quirky$"
+
Debug_EventScript_EWRAMCounters::
callnative CheckEWRAMCounters
msgbox Debug_EventScript_EWRAMCounters_Text, MSGBOX_DEFAULT
diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc
index 1845e1029787..84d45c962ac1 100644
--- a/data/scripts/field_move_scripts.inc
+++ b/data/scripts/field_move_scripts.inc
@@ -1,8 +1,7 @@
@ Interact with cuttable tree
EventScript_CutTree::
lockall
- goto_if_unset FLAG_BADGE01_GET, EventScript_CheckTreeCantCut
- checkpartymove MOVE_CUT
+ checkfieldmove FIELD_MOVE_CUT, TRUE
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CheckTreeCantCut
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
@@ -64,8 +63,7 @@ EventScript_UseRockSmash::
@ Interact with smashable rock
EventScript_RockSmash::
lockall
- goto_if_unset FLAG_BADGE03_GET, EventScript_CantSmashRock
- checkpartymove MOVE_ROCK_SMASH
+ checkfieldmove FIELD_MOVE_ROCK_SMASH, TRUE
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSmashRock
setfieldeffectargument 0, VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
@@ -225,9 +223,8 @@ Text_CantSmash:
EventScript_StrengthBoulder::
lockall
- goto_if_unset FLAG_BADGE04_GET, EventScript_CantStrength
goto_if_set FLAG_SYS_USE_STRENGTH, EventScript_CheckActivatedBoulder
- checkpartymove MOVE_STRENGTH
+ checkfieldmove FIELD_MOVE_STRENGTH, TRUE
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantStrength
setfieldeffectargument 0, VAR_RESULT
msgbox Text_WantToStrength, MSGBOX_YESNO
@@ -286,7 +283,7 @@ Text_StrengthActivated:
EventScript_UseWaterfall::
lockall
- checkpartymove MOVE_WATERFALL
+ checkfieldmove FIELD_MOVE_WATERFALL
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantWaterfall
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -321,7 +318,7 @@ Text_MonUsedWaterfall:
EventScript_UseDive::
lockall
- checkpartymove MOVE_DIVE
+ checkfieldmove FIELD_MOVE_DIVE
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantDive
copyvar 0x8004 VAR_RESULT
bufferpartymonnick STR_VAR_1, VAR_RESULT
@@ -348,7 +345,7 @@ EventScript_EndDive::
EventScript_UseDiveUnderwater::
lockall
- checkpartymove MOVE_DIVE
+ checkfieldmove FIELD_MOVE_DIVE
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantSurface
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
@@ -444,3 +441,36 @@ EventScript_UseDefog::
waitstate
releaseall
end
+
+EventScript_UseRockClimb::
+ lockall
+ checkfieldmove FIELD_MOVE_ROCK_CLIMB
+ goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_CantRockClimb
+ bufferpartymonnick STR_VAR_1, VAR_RESULT
+ setfieldeffectargument 0, VAR_RESULT
+ msgbox Text_WantToRockClimb, MSGBOX_YESNO
+ goto_if_eq VAR_RESULT, NO, EventScript_EndRockClimb
+ msgbox Text_MonUsedRockClimb, MSGBOX_DEFAULT
+ closemessage
+ dofieldeffect FLDEFF_USE_ROCK_CLIMB
+ waitstate
+ goto EventScript_EndRockClimb
+ end
+
+EventScript_CantRockClimb::
+ msgbox Text_CantRockClimb, MSGBOX_DEFAULT
+
+EventScript_EndRockClimb::
+ releaseall
+ end
+
+Text_WantToRockClimb:
+ .string "The cliff is steep.\n"
+ .string "Would you like to use Rock Climb?$"
+
+Text_MonUsedRockClimb:
+ .string "{STR_VAR_1} used Rock Climb!$"
+
+Text_CantRockClimb:
+ .string "The cliff is steep.\n"
+ .string "A PokΓ©mon may be able to climb it.$"
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index ddda34ebaae6..1d89bcfdfded 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -29,9 +29,9 @@ EventScript_FrontierFieldWhiteOut::
waitbuttonpress
pike_inchallenge
goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePike_EventScript_Retire
- pyramid_inchallenge
- goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @ On Pyramid floor
- goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost @ On Pyramid peak
+ pyramid_getlocation
+ goto_if_eq VAR_RESULT, PYRAMID_LOCATION_FLOOR, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
+ goto_if_eq VAR_RESULT, PYRAMID_LOCATION_TOP, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
trainerhill_inchallenge
goto_if_eq VAR_RESULT, TRUE, TrainerHill_1F_EventScript_Lost
special Script_FadeOutMapMusic
diff --git a/data/scripts/move_relearner.inc b/data/scripts/move_relearner.inc
new file mode 100644
index 000000000000..15c80733df06
--- /dev/null
+++ b/data/scripts/move_relearner.inc
@@ -0,0 +1,105 @@
+Common_EventScript_MoveRelearner::
+ lockall
+ faceplayer
+ message MoveRelearner_Text_WouldLearnNewMoves
+ waitmessage
+ goto Common_EventScript_MoveRelearnerDynMultiChoice
+ end
+
+Common_EventScript_MoveRelearnerDynMultiChoice::
+ dynmultipush MoveRelearner_Text_LevelUpMoves, 0
+.if P_ENABLE_MOVE_RELEARNERS == TRUE
+ dynmultipush MoveRelearner_Text_EggMoves, 1
+ dynmultipush MoveRelearner_Text_TMMoves, 2
+ dynmultipush MoveRelearner_Text_TutormoveMoves, 3
+.else
+ call_if_set P_FLAG_EGG_MOVES, MoveRelearner_EventScript_PushEggMoves
+ istmrelearneractive MoveRelearner_EventScript_PushTMMoves
+ call_if_set P_FLAG_TUTOR_MOVES, MoveRelearner_EventScript_PushTutorMoves
+.endif @ P_ENABLE_MOVE_RELEARNERS
+ dynmultipush MoveRelearner_Text_SeeYa, 4
+ dynmultistack 0, 0, FALSE, 5, 0, 0, DYN_MULTICHOICE_CB_NONE
+ closemessage
+ switch VAR_RESULT
+ case 0, MoveRelearner_EventScript_TeachLevelUpMoves
+ case 1, MoveRelearner_EventScript_TeachEggMoves
+ case 2, MoveRelearner_EventScript_TeachTMMoves
+ case 3, MoveRelearner_EventScript_TeachTutorMoves
+ case 4, MoveRelearner_EventScript_PleaseComeAgain
+MoveRelearner_EventScript_PleaseComeAgain:
+ msgbox MoveRelearner_Text_ThankYouComeAgain, MSGBOX_DEFAULT
+ releaseall
+ end
+
+MoveRelearner_EventScript_PushEggMoves:
+ dynmultipush MoveRelearner_Text_EggMoves, 1
+ return
+
+MoveRelearner_EventScript_PushTMMoves:
+ dynmultipush MoveRelearner_Text_TMMoves, 2
+ return
+
+MoveRelearner_EventScript_PushTutorMoves:
+ dynmultipush MoveRelearner_Text_TutormoveMoves, 3
+ return
+
+MoveRelearner_EventScript_TeachLevelUpMoves:
+ setmoverelearnerstate MOVE_RELEARNER_LEVEL_UP_MOVES
+ bufferstring STR_VAR_3, MoveRelearner_Text_LevelUpMoveLWR
+ goto MoveRelearner_EventScript_TeachMove
+ end
+
+MoveRelearner_EventScript_TeachEggMoves:
+ setmoverelearnerstate MOVE_RELEARNER_EGG_MOVES
+ bufferstring STR_VAR_3, MoveRelearner_Text_EggMoveLWR
+ goto MoveRelearner_EventScript_TeachMove
+ end
+
+MoveRelearner_EventScript_TeachTMMoves:
+ setmoverelearnerstate MOVE_RELEARNER_TM_MOVES
+ bufferstring STR_VAR_3, MoveRelearner_Text_TMMoveLWR
+ goto MoveRelearner_EventScript_TeachMove
+ end
+
+MoveRelearner_EventScript_TeachTutorMoves:
+ setmoverelearnerstate MOVE_RELEARNER_TUTOR_MOVES
+ bufferstring STR_VAR_3, MoveRelearner_Text_TutorMoveLWR
+ goto MoveRelearner_EventScript_TeachMove
+ end
+
+MoveRelearner_EventScript_TeachMove::
+ getpartysize
+ goto_if_eq VAR_RESULT, 0, MoveRelearner_EventScript_NoPkmn
+ msgbox MoveRelearner_Text_ChoosePkmn, MSGBOX_DEFAULT
+ special ChooseMonForMoveRelearner
+ waitstate
+ call_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, MoveRelearner_EventScript_AnythingElse
+ special IsSelectedMonEgg
+ call_if_eq VAR_RESULT, YES, MoveRelearner_EventScript_CantTeachMoveToEgg
+ call_if_eq VAR_0x8005, NO, MoveRelearner_EventScript_CantTeachMoveToPkmn
+ msgbox MoveRelearner_Text_WhichXmoveShouldTeach, MSGBOX_DEFAULT
+ special TeachMoveRelearnerMove
+ waitstate
+ goto MoveRelearner_EventScript_AnythingElse
+ end
+
+MoveRelearner_EventScript_NoPkmn:
+ msgbox MoveRelearner_Text_HaveNoPkmn, MSGBOX_AUTOCLOSE
+ releaseall
+ end
+
+MoveRelearner_EventScript_CantTeachMoveToEgg:
+ msgbox MoveRelearner_Text_CantTeachMoveToEgg, MSGBOX_AUTOCLOSE
+ goto MoveRelearner_EventScript_AnythingElse
+ end
+
+MoveRelearner_EventScript_CantTeachMoveToPkmn:
+ msgbox MoveRelearner_Text_CantTeachMoveToPkmn, MSGBOX_AUTOCLOSE
+ goto MoveRelearner_EventScript_AnythingElse
+ end
+
+MoveRelearner_EventScript_AnythingElse::
+ message MoveRelearner_Text_AnythingElse
+ waitmessage
+ goto Common_EventScript_MoveRelearnerDynMultiChoice
+ end
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
index c54b2f8dc560..3eb7f4f0d4ed 100644
--- a/data/scripts/obtain_item.inc
+++ b/data/scripts/obtain_item.inc
@@ -133,8 +133,8 @@ EventScript_PickUpItem::
waitfanfare
waitmessage
bufferitemnameplural STR_VAR_2, VAR_0x8004, VAR_0x8005
- pyramid_inchallenge
- goto_if_eq VAR_RESULT, TRUE, EventScript_PutBattlePyramidItemInBag
+ pyramid_getlocation
+ goto_if_eq VAR_RESULT, PYRAMID_LOCATION_FLOOR, EventScript_PutBattlePyramidItemInBag
msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
hideitemdescription
return
@@ -205,6 +205,7 @@ EventScript_FoundHiddenItem::
end
EventScript_PutHiddenItemInPocket::
+ callnative Script_ClearDowsingColor
delay 10
showitemdescription
waitmessage
@@ -215,6 +216,7 @@ EventScript_PutHiddenItemInPocket::
hideitemdescription
special TryPutTreasureInvestigatorsOnAir
special SetHiddenItemFlag
+ callnative Script_UpdateDowseState
releaseall
end
diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc
index 15faddfa9d31..ed5e8594093b 100644
--- a/data/scripts/secret_base.inc
+++ b/data/scripts/secret_base.inc
@@ -28,7 +28,7 @@ SecretBase_EventScript_CheckEntrance::
special GetSecretBaseTypeInFrontOfPlayer
special CheckPlayerHasSecretBase
goto_if_eq VAR_RESULT, TRUE, SecretBase_EventScript_AlreadyHasSecretBase
- checkpartymove MOVE_SECRET_POWER
+ checkfieldmove FIELD_MOVE_SECRET_POWER
setfieldeffectargument 0, VAR_RESULT
buffermovename STR_VAR_2, MOVE_SECRET_POWER
goto_if_eq VAR_0x8007, SECRET_BASE_RED_CAVE, SecretBase_EventScript_Cave
@@ -186,7 +186,7 @@ SecretBase_EventScript_EnterPlayersBase::
end
SecretBase_EventScript_AlreadyHasSecretBase::
- checkpartymove MOVE_SECRET_POWER
+ checkfieldmove FIELD_MOVE_SECRET_POWER
goto_if_eq VAR_RESULT, PARTY_SIZE, SecretBase_EventScript_NoSecretPower
setfieldeffectargument 0, VAR_RESULT
setorcopyvar VAR_0x8004, VAR_RESULT
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
index edb116f991ed..630b3f9e6eca 100644
--- a/data/scripts/surf.inc
+++ b/data/scripts/surf.inc
@@ -1,5 +1,5 @@
EventScript_UseSurf::
- checkpartymove MOVE_SURF
+ checkfieldmove FIELD_MOVE_SURF
goto_if_eq VAR_RESULT, PARTY_SIZE, EventScript_EndUseSurf
bufferpartymonnick STR_VAR_1, VAR_RESULT
setfieldeffectargument 0, VAR_RESULT
diff --git a/data/sound_data.s b/data/sound_data.s
index 39bef4b332f1..b52f9d2f861c 100644
--- a/data/sound_data.s
+++ b/data/sound_data.s
@@ -1,7 +1,11 @@
.section .rodata
+ .include "asm/macros.inc"
+ .include "constants/constants.inc"
+
.include "asm/macros/m4a.inc"
.include "asm/macros/music_voice.inc"
+ .include "include/config/general.h"
.include "include/config/pokemon.h"
.include "sound/voice_groups.inc"
.include "sound/keysplit_tables.inc"
diff --git a/data/specials.inc b/data/specials.inc
index c95cea9a7e05..f80933c0112c 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -563,3 +563,7 @@ gSpecials::
def_special UseBlankMessageToCancelPokemonPic
def_special EnterCode
def_special GetCodeFeedback
+ def_special SetHiddenNature
+ def_special SetAbility
+ def_special ObjectEventInteractionGetApricornTreeData
+ def_special ObjectEventInteractionPickApricornTree
diff --git a/data/text/contest_link.inc b/data/text/contest_link.inc
deleted file mode 100644
index f2f1469e0f80..000000000000
--- a/data/text/contest_link.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-@ With the exception of Link standby, none of the below texts are used
-
-gTest_MissedTurn::
- .string "Missed turn$"
-
-gText_LinkStandby4::
- .string "Link standby!$"
-
-gText_WinnerIsPlayersMonCongrats::
- .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!\n"
- .string "Congratulations!$"
-
-gText_WinnerIsPlayersMon::
- .string "The winner is {STR_VAR_1}'s {STR_VAR_2}!{PAUSE_UNTIL_PRESS}$"
-
-gText_PrimaryJudgingNumX::
- .string "Primary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
-
-gText_SecondaryJudgingNumX::
- .string "Secondary judging: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
-
-gText_SetEventNumX::
- .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
-
-gText_MoveUsedMostOften::
- .string "The move used most often:\n"
- .string "{STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
-
-gText_MostImpressiveMon::
- .string "The most impressive POKΓ©MON:\n"
- .string "{STR_VAR_1}'s {STR_VAR_2}{PAUSE_UNTIL_PRESS}$"
-
-gText_SetEventNumX2::
- .string "Set event: No. {STR_VAR_1}{PAUSE_UNTIL_PRESS}$"
-
-gText_LinkTVProgramWillNotBeMadeTrainerLost::
- .string "A link TV program will not be made\n"
- .string "because the TRAINER lost.{PAUSE_UNTIL_PRESS}$"
diff --git a/data/text/contest_painting.inc b/data/text/contest_painting.inc
deleted file mode 100644
index 5152cb3bb8e9..000000000000
--- a/data/text/contest_painting.inc
+++ /dev/null
@@ -1,96 +0,0 @@
-gContestHallPaintingCaption::
- .string "{STR_VAR_1}\n"
- .string "{STR_VAR_2}'s {STR_VAR_3}$"
-
-@ Unused
-gContestPaintingContest::
- .string "CONTEST$"
-
-gContestRankNormal::
- .string "NORMAL RANK$"
-
-gContestRankSuper::
- .string "SUPER RANK$"
-
-gContestRankHyper::
- .string "HYPER RANK$"
-
-gContestRankMaster::
- .string "MASTER RANK$"
-
-gContestLink::
- .string "LINK$"
-
-gContestCoolness::
- .string "COOLNESS$"
-
-gContestBeauty::
- .string "BEAUTY$"
-
-gContestCuteness::
- .string "CUTENESS$"
-
-gContestSmartness::
- .string "SMARTNESS$"
-
-gContestToughness::
- .string "TOUGHNESS$"
-
-gContestPaintingCool1::
- .string "Nonstop supercool--\n"
- .string "the inestimable {STR_VAR_1}$"
-
-gContestPaintingCool2::
- .string "Hey, there!\n"
- .string "The good-looking POKΓ©MON {STR_VAR_1}$"
-
-gContestPaintingCool3::
- .string "The marvelous, wonderful, and\n"
- .string "very great {STR_VAR_1}$"
-
-gContestPaintingBeauty1::
- .string "This century's last Venus--\n"
- .string "the beautiful {STR_VAR_1}$"
-
-gContestPaintingBeauty2::
- .string "{STR_VAR_1}'s dazzling,\n"
- .string "glittering smile$"
-
-gContestPaintingBeauty3::
- .string "POKΓ©MON CENTER's super idol--\n"
- .string "the incomparable {STR_VAR_1}$"
-
-gContestPaintingCute1::
- .string "The lovely and sweet {STR_VAR_1}$"
-
-gContestPaintingCute2::
- .string "The pretty {STR_VAR_1}'s\n"
- .string "winning portrait$"
-
-gContestPaintingCute3::
- .string "Give us a wink!\n"
- .string "The cutie POKΓ©MON {STR_VAR_1}$"
-
-gContestPaintingSmart1::
- .string "The smartness maestro--\n"
- .string "the wise POKΓ©MON {STR_VAR_1}$"
-
-gContestPaintingSmart2::
- .string "{STR_VAR_1}--the one chosen\n"
- .string "above all POKΓ©MON$"
-
-gContestPaintingSmart3::
- .string "The excellent {STR_VAR_1}'s\n"
- .string "moment of elegance$"
-
-gContestPaintingTough1::
- .string "The powerfully muscular\n"
- .string "speedster {STR_VAR_1}$"
-
-gContestPaintingTough2::
- .string "The strong, stronger, and\n"
- .string "strongest {STR_VAR_1}$"
-
-gContestPaintingTough3::
- .string "The mighty tough\n"
- .string "hyper POKΓ©MON {STR_VAR_1}$"
diff --git a/data/text/contest_strings.inc b/data/text/contest_strings.inc
deleted file mode 100644
index 4b144a21bcea..000000000000
--- a/data/text/contest_strings.inc
+++ /dev/null
@@ -1,314 +0,0 @@
-gText_AppealNumWhichMoveWillBePlayed::
- .string "Appeal no. {STR_VAR_1}!\n"
- .string "Which move will be played?$"
-
-gText_AppealNumButItCantParticipate::
- .string "Appeal no. {STR_VAR_1}!\n"
- .string "But it can't participate!$"
-
-gText_MonAppealedWithMove::
- .string "{STR_VAR_1} appealed with\n"
- .string "{STR_VAR_2}!$"
-
-gText_MonWasWatchingOthers::
- .string "{STR_VAR_1} was watching\n"
- .string "the others.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_AllOutOfAppealTime::
- .string "We're all out of\n"
- .string "Appeal Time!{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-@ Appeal result texts
-
-gText_BecameMoreConsciousOfOtherMons::
- .string "It became more conscious\n"
- .string "of the other POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonCantMakeAnAppealAfterThis::
- .string "{STR_VAR_1} can't make an\n"
- .string "appeal after this.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_SettledDownJustLittleBit::
- .string "It settled down just a\n"
- .string "little bit.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_BecameObliviousToOtherMons::
- .string "It became oblivious to\n"
- .string "the other POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_BecameLessAwareOfOtherMons::
- .string "It became less aware of\n"
- .string "the other POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_StoppedCaringAboutOtherMons::
- .string "It stopped caring about\n"
- .string "other POKΓ©MON much.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_TriedToStartleOtherMons::
- .string "It tried to startle the\n"
- .string "other POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_TriedToDazzleOthers::
- .string "It tried to dazzle the\n"
- .string "others.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_JudgeLookedAwayFromMon::
- .string "The JUDGE looked away\n"
- .string "from {STR_VAR_1}.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_TriedToUnnerveNextMon::
- .string "It tried to unnerve the\n"
- .string "next POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonBecameNervous::
- .string "{STR_VAR_1} became\n"
- .string "nervous.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_AppealTriedToUnnerveWaitingMons::
- .string "The appeal tried to\n"
- .string "unnerve waiting POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_TauntedMonsDoingWell::
- .string "It taunted POKΓ©MON\n"
- .string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonRegainedItsForm::
- .string "{STR_VAR_1} regained its\n"
- .string "form.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_TriedToJamMonDoingWell::
- .string "It tried to jam POKΓ©MON\n"
- .string "doing well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_StandoutMonHustledEvenMore::
- .string "The standout {STR_VAR_1}\n"
- .string "hustled even more.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_LargelyUnnoticedMonWorkedHard::
- .string "The largely unnoticed\n"
- .string "{STR_VAR_1} worked hard.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_WorkedAsMuchAsMonBefore::
- .string "It worked as much as\n"
- .string "POKΓ©MON before it.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealDidNotGoWell::
- .string "{STR_VAR_1}'s appeal did\n"
- .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_WorkedAsMuchAsPrecedingMon::
- .string "It worked as much as the\n"
- .string "preceding POKΓ©MON.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealDidNotGoWell2::
- .string "{STR_VAR_1}'s appeal did\n"
- .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealDidNotGoWell3::
- .string "{STR_VAR_1}'s appeal did\n"
- .string "not go well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentSlightlyWell::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentPrettyWell::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentExcellently::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWasDud::
- .string "{STR_VAR_1}'s appeal was\n"
- .string "a dud.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealDidNotWorkVeryWell::
- .string "{STR_VAR_1}'s appeal did\n"
- .string "not work very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentSlightlyWell2::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went slightly well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentPrettyWell2::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went pretty well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentVeryWell::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went very well.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsAppealWentExcellently2::
- .string "{STR_VAR_1}'s appeal\n"
- .string "went excellently.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_SameTypeAsOneBeforeGood::
- .string "It's the same type as the\n"
- .string "POKΓ©MON before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_NotSameTypeAsOneBeforeGood::
- .string "It's not the same type as\n"
- .string "the one before--good!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_StoodOutMuchMoreThanMonBefore::
- .string "It stood out much more\n"
- .string "than the POKΓ©MON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_DidntDoAsWellAsMonBefore::
- .string "It didn't do as well as the\n"
- .string "POKΓ©MON before.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsConditionRoseAboveUsual::
- .string "{STR_VAR_1}'s condition\n"
- .string "rose above usual.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MonsHotStatusMadeGreatAppeal::
- .string "{STR_VAR_1}'s hot status\n"
- .string "made it a great appeal!{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MovedUpInLineForNextAppeal::
- .string "It moved up in line for\n"
- .string "the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_MovedBackInLineForNextAppeal::
- .string "It moved back in line once\n"
- .string "for the next appeal.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_ScrambledUpOrderForNextTurn::
- .string "It scrambled up the\n"
- .string "order for the next turn.{PAUSE 15}{PAUSE 15}{PAUSE 15}{PAUSE 15}$"
-
-gText_JudgeLookedAtMonExpectantly::
- .string "The JUDGE looked at\n"
- .string "{STR_VAR_1} expectantly.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_AppealComboWentOverWell::
- .string "The appeal combo went\n"
- .string "over well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_AppealComboWentOverVeryWell::
- .string "The appeal combo went\n"
- .string "over very well.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_AppealComboWentOverExcellently::
- .string "The appeal combo went\n"
- .string "over excellently.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonManagedToAvertGaze::
- .string "{STR_VAR_1} managed to\n"
- .string "avert its gaze.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonManagedToAvoidSeeingIt::
- .string "{STR_VAR_1} managed to\n"
- .string "avoid seeing it.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonIsntFazedByThatSortOfThing::
- .string "{STR_VAR_1} isn't fazed\n"
- .string "by that sort of thing.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonBecameALittleDistracted::
- .string "{STR_VAR_1} became a\n"
- .string "little distracted.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_TriedToStartleOtherPokemon::
- .string "It tried to startle the\n"
- .string "other POKΓ©MON.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonLookedDownOutOfDistraction::
- .string "{STR_VAR_1} looked down\n"
- .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonTurnedBackOutOfDistraction::
- .string "{STR_VAR_1} turned back\n"
- .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonCouldntHelpUtteringCry::
- .string "{STR_VAR_1} couldn't help\n"
- .string "uttering a cry.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonCouldntHelpLeapingUp::
- .string "{STR_VAR_1} couldn't help\n"
- .string "leaping up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonTrippedOutOfDistraction::
- .string "{STR_VAR_1} tripped over\n"
- .string "out of distraction.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonWasTooNervousToMove::
- .string "{STR_VAR_1} was too\n"
- .string "nervous to move.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_ButItMessedUp2::
- .string "But it messed up.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_ButItFailedToMakeTargetNervous::
- .string "But it failed to make\n"
- .string "the target nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_ButItFailedToMakeAnyoneNervous::
- .string "But it failed to make\n"
- .string "anyone nervous.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_ButItWasIgnored::
- .string "But it was ignoredβ¦{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_CouldntImproveItsCondition::
- .string "But it couldn't improve\n"
- .string "its conditionβ¦{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_BadConditionResultedInWeakAppeal::
- .string "Its bad condition\n"
- .string "resulted in a weak appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonWasUnaffected::
- .string "{STR_VAR_1} was\n"
- .string "unaffected.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_RepeatedAppeal::
- .string "{STR_VAR_1} disappointed\n"
- .string "by repeating an appeal.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonsXWentOverGreat::
- .string "{STR_VAR_1}'s {STR_VAR_3}\n"
- .string "went over great.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonsXDidntGoOverWell::
- .string "{STR_VAR_1}'s {STR_VAR_3}\n"
- .string "didn't go over well hereβ¦{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonsXGotTheCrowdGoing::
- .string "{STR_VAR_1}'s {STR_VAR_3}\n"
- .string "got the crowd going.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonCantAppealNextTurn::
- .string "{STR_VAR_1} can't appeal\n"
- .string "next turnβ¦{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_AttractedCrowdsAttention::
- .string "It attracted the crowd's\n"
- .string "attention.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_CrowdContinuesToWatchMon::
- .string "The crowd continues to\n"
- .string "watch {STR_VAR_3}.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_MonsMoveIsIgnored::
- .string "{STR_VAR_1}'s\n"
- .string "{STR_VAR_2} is ignored.{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}{PAUSE 0x0F}$"
-
-gText_Contest_Shyness::
- .string "shyness$"
-
-gText_Contest_Anxiety::
- .string "anxiety$"
-
-gText_Contest_Laziness::
- .string "laziness$"
-
-gText_Contest_Hesitancy::
- .string "hesitancy$"
-
-gText_Contest_Fear::
- .string "fear$"
diff --git a/data/text/move_relearner.inc b/data/text/move_relearner.inc
new file mode 100644
index 000000000000..b9400fd62b5f
--- /dev/null
+++ b/data/text/move_relearner.inc
@@ -0,0 +1,55 @@
+MoveRelearner_Text_WouldLearnNewMoves:
+ .string "Hi, I'm the Move Relearner.\n"
+ .string "Would you like to learn new moves?$"
+
+MoveRelearner_Text_LevelUpMoves:
+ .string "Level Up Moves$"
+
+MoveRelearner_Text_EggMoves:
+ .string "Egg Moves$"
+
+MoveRelearner_Text_TMMoves:
+ .string "TM Moves$"
+
+MoveRelearner_Text_TutormoveMoves:
+ .string "Tutor Moves$"
+
+MoveRelearner_Text_SeeYa:
+ .string "See ya!$"
+
+MoveRelearner_Text_AnythingElse:
+ .string "Is there anything else I may do for you?$"
+
+MoveRelearner_Text_ChoosePkmn:
+ .string "Please choose your PokΓ©mon.$"
+
+MoveRelearner_Text_HaveNoPkmn:
+ .string "You have no PokΓ©mon.$"
+
+MoveRelearner_Text_CantTeachMoveToEgg:
+ .string "Sorryβ¦\n"
+ .string "But an Egg can't learn moves.$"
+
+MoveRelearner_Text_CantTeachMoveToPkmn:
+ .string "Sorryβ¦\p"
+ .string "It doesn't appear as if I have any move\n"
+ .string "I can teach that PokΓ©mon.$"
+
+MoveRelearner_Text_LevelUpMoveLWR::
+ .string "level up move$"
+
+MoveRelearner_Text_EggMoveLWR::
+ .string "egg move$"
+
+MoveRelearner_Text_TMMoveLWR::
+ .string "TM move$"
+
+MoveRelearner_Text_TutorMoveLWR::
+ .string "tutor move$"
+
+MoveRelearner_Text_WhichXmoveShouldTeach:
+ .string "Which {STR_VAR_3} should I teach?$"
+
+MoveRelearner_Text_ThankYouComeAgain:
+ .string "Thank you for using our services.\n"
+ .string "Please come again!$"
diff --git a/docs/FEATURES.md b/docs/FEATURES.md
new file mode 100644
index 000000000000..892a07c16b0a
--- /dev/null
+++ b/docs/FEATURES.md
@@ -0,0 +1 @@
+{{#include ../FEATURES.md}}
diff --git a/docs/SUMMARY.md b/docs/SUMMARY.md
index fa03ca20ee5c..e5835ea07b72 100644
--- a/docs/SUMMARY.md
+++ b/docs/SUMMARY.md
@@ -1,25 +1,61 @@
# Summary
- [README](./README.md)
+- [FEATURES](./FEATURES.md)
- [Installation](./INSTALL.md)
- [Setting up WSL1 (Legacy Portion)](./legacy_WSL1_INSTALL.md)
+ - [ChromeOS](./install/chromeos/CHROME_OS.md)
+ - [Linux]()
+ - [ARCH_LINUX](./install/linux/ARCH_LINUX.md)
+ - [DEBIAN](./install/linux/DEBIAN.md)
+ - [FEDORA](./install/linux/FEDORA.md)
+ - [NIXOS](./install/linux/NIXOS.md)
+ - [OTHERS](./install/linux/OTHERS.md)
+ - [UBUNTU](./install/linux/UBUNTU.md)
+ - [macOS](./install/mac/MAC_OS.md)
+ - [Windows]()
+ - [CYGWIN](./install/windows/CYGWIN.md)
+ - [MSYS2](./install/windows/MSYS2.md)
+ - [WSL](./install/windows/WSL.md)
- [Run documentation site locally](local_mdbook/index.md)
- [Ubuntu WSL1/WSL2](local_mdbook/ubuntu_WSL.md)
- [Contributing](./CONTRIBUTING.md)
+- [Styleguide and Principles](./STYLEGUIDE.md)
- [Credits](./CREDITS.md)
- [Tutorials]()
- [What are AI Flags?](tutorials/ai_flags.md)
- [How to add new AI Flags](tutorials/ai_logic.md)
- [How to add new battle script commands/macros](tutorials/how_to_battle_script_command_macro.md)
- [How to add a new move](tutorials/how_to_new_move.md)
- - [How to add a new trainer class](tutorials/how_to_trainer_class.md)
+ - [How to add a new trainer class]()
+ - [How to add a new trainer front pic](tutorials/how_to_trainer_front_pic.md)
+ - [How to add a new trainer back pic](tutorials/how_to_trainer_back_pic.md)
- [How to add a new PokΓ©mon](tutorials/how_to_new_pokemon.md)
- [v1.6.x and earlier](tutorials/how_to_new_pokemon_1_6_0.md)
- [How to use the Testing System](tutorials/how_to_testing_system.md)
- [How to add new Trainer Slides](tutorials/how_to_new_trainer_slide.md)
- [Day/Night System FAQ](tutorials/dns.md)
+ - [How to use the code entry system](tutorials/how_to_code_entry.md)
+ - [How to use Follower NPCs](tutorials/how_to_follower_npc.md)
+ - [Time-Based Encounters](tutorials/how_to_time_of_day_encounters.md)
+ - [How to use Trainer Party Pools](tutorials/how_to_trainer_party_pool.md)
+ - [How to Apricorn Tree](tutorials/how_to_apricorn_tree.md)
+ - [How to Namebox](tutorials/how_to_namebox.md)
+ - [Vs. Seeker](tutorials/vs_seeker.md)
- [Changelog](./CHANGELOG.md)
+ - [1.14.x]()
+ - [Version 1.14.1](changelogs/1.14.x/1.14.1.md)
+ - [Version 1.14.0](changelogs/1.14.x/1.14.0.md)
+ - [1.13.x]()
+ - [Version 1.13.4](changelogs/1.13.x/1.13.4.md)
+ - [Version 1.13.3](changelogs/1.13.x/1.13.3.md)
+ - [Version 1.13.2](changelogs/1.13.x/1.13.2.md)
+ - [Version 1.13.1](changelogs/1.13.x/1.13.1.md)
+ - [Version 1.13.0](changelogs/1.13.x/1.13.0.md)
- [1.12.x]()
+ - [Version 1.12.3](changelogs/1.12.x/1.12.3.md)
+ - [Version 1.12.2](changelogs/1.12.x/1.12.2.md)
+ - [Version 1.12.1](changelogs/1.12.x/1.12.1.md)
- [Version 1.12.0](changelogs/1.12.x/1.12.0.md)
- [1.11.x]()
- [Version 1.11.4](changelogs/1.11.x/1.11.4.md)
@@ -32,6 +68,7 @@
- [Version 1.10.2](changelogs/1.10.x/1.10.2.md)
- [Version 1.10.1](changelogs/1.10.x/1.10.1.md)
- [Version 1.10.0](changelogs/1.10.x/1.10.0.md)
+ - [Megaman Battle Network Style Names](./mmbn_style_names.md)
- [1.9.x]()
- [Version 1.9.4](changelogs/1.9.x/1.9.4.md)
- [Version 1.9.3](changelogs/1.9.x/1.9.3.md)
@@ -80,4 +117,5 @@
- [Team Procedures]()
- [How to make an Expansion version](team_procedures/expansion_versions.md)
- [Release Schedule and Process](team_procedures/schedule.md)
+ - [Merge Checklist](team_procedures/merge_checklist.md)
- [Scope Guidelines](team_procedures/scope.md)
diff --git a/docs/book.toml b/docs/book.toml
index 3282d8c8e7ad..a1e994eff305 100644
--- a/docs/book.toml
+++ b/docs/book.toml
@@ -1,6 +1,5 @@
[book]
language = "en"
-multilingual = false
src = "."
title = "pokeemerald-expansion"
diff --git a/docs/changelogs/1.12.x/1.12.0.md b/docs/changelogs/1.12.x/1.12.0.md
index b223e040dab2..965ae27b275d 100644
--- a/docs/changelogs/1.12.x/1.12.0.md
+++ b/docs/changelogs/1.12.x/1.12.0.md
@@ -121,7 +121,7 @@
- Added option to disable object event shadows
- Added option to turn DNS on or off, `OW_ENABLE_DNS`
- Added option to for vanilla shadow behaviour, `OW_OBJECT_VANILLA_SHADOWS`
- - Scripts containing consecutive `removeobject