Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pulled rhh master, i hate merge conflicts

Browse Source
This commit is contained in:
AgustinGDLV 2023-02-22 18:50:54 -08:00
commit 38f462551f
3214 changed files with 74305 additions and 61435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.github/calcrom/calcrom.pl vendored
View File

@ -1,5 +1,11 @@
#!/usr/bin/perl #!/usr/bin/perl
# Usage:
# calcrom.pl <mapfile> [--data]
#
# mapfile: path to .map file output by LD
# data: set to output % breakdown of data
use IPC::Cmd qw[ run ]; use IPC::Cmd qw[ run ];
use Getopt::Long; use Getopt::Long;
@ -65,12 +71,13 @@ my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that # This looks for Unknown_, Unknown_, or sub_, followed by an address. Note that
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown. # it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'"; my $undoc_regex = "'[Uu]nknown_[0-9a-fA-F]\\{5,7\\}\\|sub_[0-9a-fA-F]\\{5,7\\}'";
# This looks for every symbol with an address at the end of it. Some things are # This looks for every symbol with an address at the end of it. Some things are
# given a name based on their type / location, but still have an unknown purpose. # given a name based on their type / location, but still have an unknown purpose.
# For example, FooMap_EventScript_FFFFFFF. # For example, FooMap_EventScript_FFFFFFF.
my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,7\\}'"; # The above may be double counted here, and will need to be filtered out.
my $partial_doc_regex = "'_[0-28][0-9a-fA-F]\\{5,7\\}'";
my $count_cmd = "wc -l"; my $count_cmd = "wc -l";
@ -87,7 +94,7 @@ my $total_syms_as_string;
my $undocumented_as_string; my $undocumented_as_string;
(run ( (run (
command => "$base_cmd | $undoc_cmd | $count_cmd", command => "$base_cmd | grep $undoc_regex | $count_cmd",
buffer => \$undocumented_as_string, buffer => \$undocumented_as_string,
timeout => 60 timeout => 60
)) ))
@ -95,7 +102,7 @@ my $undocumented_as_string;
my $partial_documented_as_string; my $partial_documented_as_string;
(run ( (run (
command => "$base_cmd | $partial_doc_cmd | $count_cmd", command => "$base_cmd | grep $partial_doc_regex | grep -v $undoc_regex | $count_cmd",
buffer => \$partial_documented_as_string, buffer => \$partial_documented_as_string,
timeout => 60 timeout => 60
)) ))
@ -126,9 +133,6 @@ my $total = $src + $asm;
my $srcPct = sprintf("%.4f", 100 * $src / $total); my $srcPct = sprintf("%.4f", 100 * $src / $total);
my $asmPct = sprintf("%.4f", 100 * $asm / $total); my $asmPct = sprintf("%.4f", 100 * $asm / $total);
# partial_documented is double-counting the unknown_* and sub_* symbols.
$partial_documented = $partial_documented - $undocumented;
my $documented = $total_syms - ($undocumented + $partial_documented); my $documented = $total_syms - ($undocumented + $partial_documented);
my $docPct = sprintf("%.4f", 100 * $documented / $total_syms); my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms); my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms);

11
.github/workflows/build.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
repository: pret/agbcc repository: pret/agbcc
- name: Install binutils - name: Install binutils
run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi run: sudo apt install gcc-arm-none-eabi binutils-arm-none-eabi libelf-dev
# build-essential, git, and libpng-dev are already installed # build-essential, git, and libpng-dev are already installed
# gcc-arm-none-eabi is only needed for the modern build # gcc-arm-none-eabi is only needed for the modern build
# as an alternative to dkP # as an alternative to dkP
@ -41,10 +41,15 @@ jobs:
working-directory: agbcc working-directory: agbcc
- name: Agbcc - name: Agbcc
run: make -j${nproc} all run: make -j${nproc} -O all
- name: Modern - name: Modern
env: env:
MODERN: 1 MODERN: 1
COMPARE: 0 COMPARE: 0
run: make -j${nproc} all run: make -j${nproc} -O all
- name: Test
run: |
make -j${nproc} -O pokeemerald-test.elf
make -j${nproc} check

16
.github/workflows/manual.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: Close issues related to a merged pull request based on master branch.
on:
pull_request:
types: [closed]
branches:
- upcoming
jobs:
closeIssueOnPrMergeTrigger:
runs-on: ubuntu-latest
steps:
- name: Closes issues related to a merged pull request.
uses: ldez/gha-mjolnir@v1.0.3

6
INSTALL.md
View File

@ -9,7 +9,7 @@ If you run into trouble, ask for help on Discord or IRC (see [README.md](README.
## Windows ## Windows
Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors. Windows has instructions for building with three possible terminals, providing 3 different options in case the user stumbles upon unexpected errors.
- [Windows 10 (WSL1)](#windows-10-wsl1) (**Fastest, highly recommended**, Windows 10 only) - [Windows 10/11 (WSL1)](#windows-1011-wsl1) (**Fastest, highly recommended**, Windows 10 and 11 only)
- [Windows (msys2)](#windows-msys2) (Second fastest) - [Windows (msys2)](#windows-msys2) (Second fastest)
- [Windows (Cygwin)](#windows-cygwin) (Slowest) - [Windows (Cygwin)](#windows-cygwin) (Slowest)
@ -26,7 +26,7 @@ All of the Windows instructions assume that the default drive is C:\\. If this d
**A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions. **A note of caution**: As Windows 7 is officially unsupported by Microsoft and Windows 8 has very little usage, some maintainers are unwilling to maintain the Windows 7/8 instructions. Thus, these instructions may break in the future with fixes taking longer than fixes to the Windows 10 instructions.
## Windows 10 (WSL1) ## Windows 10/11 (WSL1)
WSL1 is the preferred terminal to build **pokeemerald**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL). WSL1 is the preferred terminal to build **pokeemerald**. The following instructions will explain how to install WSL1 (referred to interchangeably as WSL).
- If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1). - If WSL (Debian or Ubuntu) is **not installed**, then go to [Installing WSL1](#Installing-WSL1).
- Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1). - Otherwise, if WSL is installed, but it **hasn't previously been set up for another decompilation project**, then go to [Setting up WSL1](#Setting-up-WSL1).
@ -358,7 +358,7 @@ If this works, then proceed to [Installation](#installation). Otherwise, ask for
1. If pokeemerald is not already downloaded (some users may prefer to download pokeemerald via a git client like GitHub Desktop), run: 1. If pokeemerald is not already downloaded (some users may prefer to download pokeemerald via a git client like GitHub Desktop), run:
```bash ```bash
git clone https://github.com/pret/pokeemerald git clone https://github.com/rh-hideout/pokeemerald-expansion
``` ```
<details> <details>

66
Makefile
View File

@ -79,6 +79,9 @@ ELF = $(ROM:.gba=.elf)
MAP = $(ROM:.gba=.map) MAP = $(ROM:.gba=.map)
SYM = $(ROM:.gba=.sym) SYM = $(ROM:.gba=.sym)
TESTELF = $(ROM:.gba=-test.elf)
HEADLESSELF = $(ROM:.gba=-test-headless.elf)
C_SUBDIR = src C_SUBDIR = src
GFLIB_SUBDIR = gflib GFLIB_SUBDIR = gflib
ASM_SUBDIR = asm ASM_SUBDIR = asm
@ -88,6 +91,7 @@ SONG_SUBDIR = sound/songs
MID_SUBDIR = sound/songs/midi MID_SUBDIR = sound/songs/midi
SAMPLE_SUBDIR = sound/direct_sound_samples SAMPLE_SUBDIR = sound/direct_sound_samples
CRY_SUBDIR = sound/direct_sound_samples/cries CRY_SUBDIR = sound/direct_sound_samples/cries
TEST_SUBDIR = test
C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR) C_BUILDDIR = $(OBJ_DIR)/$(C_SUBDIR)
GFLIB_BUILDDIR = $(OBJ_DIR)/$(GFLIB_SUBDIR) GFLIB_BUILDDIR = $(OBJ_DIR)/$(GFLIB_SUBDIR)
@ -95,6 +99,7 @@ ASM_BUILDDIR = $(OBJ_DIR)/$(ASM_SUBDIR)
DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR) DATA_ASM_BUILDDIR = $(OBJ_DIR)/$(DATA_ASM_SUBDIR)
SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR) SONG_BUILDDIR = $(OBJ_DIR)/$(SONG_SUBDIR)
MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR) MID_BUILDDIR = $(OBJ_DIR)/$(MID_SUBDIR)
TEST_BUILDDIR = $(OBJ_DIR)/$(TEST_SUBDIR)
ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN) ASFLAGS := -mcpu=arm7tdmi --defsym MODERN=$(MODERN)
@ -131,10 +136,14 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen$(EXE)
FIX := tools/gbafix/gbafix$(EXE) FIX := tools/gbafix/gbafix$(EXE)
MAPJSON := tools/mapjson/mapjson$(EXE) MAPJSON := tools/mapjson/mapjson$(EXE)
JSONPROC := tools/jsonproc/jsonproc$(EXE) JSONPROC := tools/jsonproc/jsonproc$(EXE)
PATCHELF := tools/patchelf/patchelf$(EXE)
ROMTEST ?= $(shell { command -v mgba-rom-test || command -v tools/mgba/mgba-rom-test$(EXE); } 2>/dev/null)
ROMTESTHYDRA := tools/mgba-rom-test-hydra/mgba-rom-test-hydra$(EXE)
PERL := perl PERL := perl
TOOLDIRS := $(filter-out tools/agbcc tools/binutils,$(wildcard tools/*)) TOOLDIRS := tools/aif2pcm tools/bin2c tools/gbafix tools/gbagfx tools/jsonproc tools/mapjson tools/mid2agb tools/preproc tools/ramscrgen tools/rsfont tools/scaninc
CHECKTOOLDIRS = tools/patchelf tools/mgba-rom-test-hydra
TOOLBASE = $(TOOLDIRS:tools/%=%) TOOLBASE = $(TOOLDIRS:tools/%=%)
TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE)) TOOLS = $(foreach tool,$(TOOLBASE),tools/$(tool)/$(tool)$(EXE))
@ -150,7 +159,7 @@ MAKEFLAGS += --no-print-directory
# Secondary expansion is required for dependency variables in object rules. # Secondary expansion is required for dependency variables in object rules.
.SECONDEXPANSION: .SECONDEXPANSION:
.PHONY: all rom clean compare tidy tools mostlyclean clean-tools $(TOOLDIRS) libagbsyscall modern tidymodern tidynonmodern .PHONY: all rom clean compare tidy tools check-tools mostlyclean clean-tools clean-check-tools $(TOOLDIRS) $(CHECKTOOLDIRS) libagbsyscall modern tidymodern tidynonmodern check
infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line)))) infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst __SPACE__, ,$(line))))
@ -158,7 +167,7 @@ infoshell = $(foreach line, $(shell $1 | sed "s/ /__SPACE__/g"), $(info $(subst
# Disable dependency scanning for clean/tidy/tools # Disable dependency scanning for clean/tidy/tools
# Use a separate minimal makefile for speed # Use a separate minimal makefile for speed
# Since we don't need to reload most of this makefile # Since we don't need to reload most of this makefile
ifeq (,$(filter-out all rom compare modern libagbsyscall syms,$(MAKECMDGOALS))) ifeq (,$(filter-out all rom compare modern check libagbsyscall syms,$(MAKECMDGOALS)))
$(call infoshell, $(MAKE) -f make_tools.mk) $(call infoshell, $(MAKE) -f make_tools.mk)
else else
NODEP ?= 1 NODEP ?= 1
@ -168,9 +177,9 @@ endif
ifeq (,$(MAKECMDGOALS)) ifeq (,$(MAKECMDGOALS))
SCAN_DEPS ?= 1 SCAN_DEPS ?= 1
else else
# clean, tidy, tools, mostlyclean, clean-tools, $(TOOLDIRS), tidymodern, tidynonmodern don't even build the ROM # clean, tidy, tools, check-tools, mostlyclean, clean-tools, clean-check-tools, $(TOOLDIRS), $(CHECKTOOLDIRS), tidymodern, tidynonmodern don't even build the ROM
# libagbsyscall does its own thing # libagbsyscall does its own thing
ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS))) ifeq (,$(filter-out clean tidy tools mostlyclean clean-tools $(TOOLDIRS) clean-check-tools $(CHECKTOOLDIRS) tidymodern tidynonmodern libagbsyscall,$(MAKECMDGOALS)))
SCAN_DEPS ?= 0 SCAN_DEPS ?= 0
else else
SCAN_DEPS ?= 1 SCAN_DEPS ?= 1
@ -182,6 +191,11 @@ C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src))) C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS)) C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
TEST_SRCS_IN := $(wildcard $(TEST_SUBDIR)/*.c $(TEST_SUBDIR)/*/*.c $(TEST_SUBDIR)/*/*/*.c)
TEST_SRCS := $(foreach src,$(TEST_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
TEST_OBJS := $(patsubst $(TEST_SUBDIR)/%.c,$(TEST_BUILDDIR)/%.o,$(TEST_SRCS))
TEST_OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(TEST_OBJS))
GFLIB_SRCS := $(wildcard $(GFLIB_SUBDIR)/*.c) GFLIB_SRCS := $(wildcard $(GFLIB_SUBDIR)/*.c)
GFLIB_OBJS := $(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o,$(GFLIB_SRCS)) GFLIB_OBJS := $(patsubst $(GFLIB_SUBDIR)/%.c,$(GFLIB_BUILDDIR)/%.o,$(GFLIB_SRCS))
@ -206,7 +220,7 @@ MID_OBJS := $(patsubst $(MID_SUBDIR)/%.mid,$(MID_BUILDDIR)/%.o,$(MID_SRCS))
OBJS := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS) OBJS := $(C_OBJS) $(GFLIB_OBJS) $(C_ASM_OBJS) $(ASM_OBJS) $(DATA_ASM_OBJS) $(SONG_OBJS) $(MID_OBJS)
OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS)) OBJS_REL := $(patsubst $(OBJ_DIR)/%,%,$(OBJS))
SUBDIRS := $(sort $(dir $(OBJS))) SUBDIRS := $(sort $(dir $(OBJS) $(dir $(TEST_OBJS))))
$(shell mkdir -p $(SUBDIRS)) $(shell mkdir -p $(SUBDIRS))
endif endif
@ -216,11 +230,16 @@ all: rom
tools: $(TOOLDIRS) tools: $(TOOLDIRS)
check-tools: $(CHECKTOOLDIRS)
syms: $(SYM) syms: $(SYM)
$(TOOLDIRS): $(TOOLDIRS):
@$(MAKE) -C $@ @$(MAKE) -C $@
$(CHECKTOOLDIRS):
@$(MAKE) -C $@
rom: $(ROM) rom: $(ROM)
ifeq ($(COMPARE),1) ifeq ($(COMPARE),1)
@$(SHA1) rom.sha1 @$(SHA1) rom.sha1
@ -229,11 +248,14 @@ endif
# For contributors to make sure a change didn't affect the contents of the ROM. # For contributors to make sure a change didn't affect the contents of the ROM.
compare: all compare: all
clean: mostlyclean clean-tools clean: mostlyclean clean-tools clean-check-tools
clean-tools: clean-tools:
@$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);) @$(foreach tooldir,$(TOOLDIRS),$(MAKE) clean -C $(tooldir);)
clean-check-tools:
@$(foreach tooldir,$(CHECKTOOLDIRS),$(MAKE) clean -C $(tooldir);)
mostlyclean: tidynonmodern tidymodern mostlyclean: tidynonmodern tidymodern
rm -f $(SAMPLE_SUBDIR)/*.bin rm -f $(SAMPLE_SUBDIR)/*.bin
rm -f $(CRY_SUBDIR)/*.bin rm -f $(CRY_SUBDIR)/*.bin
@ -407,6 +429,14 @@ $(OBJ_DIR)/sym_common.ld: sym_common.txt $(C_OBJS) $(wildcard common_syms/*.txt)
$(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt $(OBJ_DIR)/sym_ewram.ld: sym_ewram.txt
$(RAMSCRGEN) ewram_data $< ENGLISH > $@ $(RAMSCRGEN) ewram_data $< ENGLISH > $@
# NOTE: Based on C_DEP above, but without NODEP and KEEP_TEMPS handling.
define TEST_DEP
$1: $2 $$(shell $(SCANINC) -I include -I tools/agbcc/include -I gflib -I test $2)
@echo "$$(CC1) <flags> -o $$@ $$<"
@$$(CPP) $$(CPPFLAGS) $$< | $$(PREPROC) $$< charmap.txt -i | $$(CC1) $$(CFLAGS) -o - - | cat - <(echo -e ".text\n\t.align\t2, 0") | $$(AS) $$(ASFLAGS) -o $$@ -
endef
$(foreach src, $(TEST_SRCS), $(eval $(call TEST_DEP,$(patsubst $(TEST_SUBDIR)/%.c,$(TEST_BUILDDIR)/%.o,$(src)),$(src),$(patsubst $(TEST_SUBDIR)/%.c,%,$(src)))))
ifeq ($(MODERN),0) ifeq ($(MODERN),0)
LD_SCRIPT := ld_script.txt LD_SCRIPT := ld_script.txt
LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld LD_SCRIPT_DEPS := $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_common.ld $(OBJ_DIR)/sym_ewram.ld
@ -429,6 +459,28 @@ $(ROM): $(ELF)
modern: all modern: all
LD_SCRIPT_TEST := ld_script_test.txt
$(OBJ_DIR)/ld_script_test.ld: $(LD_SCRIPT_TEST) $(LD_SCRIPT_DEPS)
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 check-tools
@echo "cd $(OBJ_DIR) && $(LD) -T ld_script_test.ld -o ../../$@ <objects> <test-objects> <lib>"
@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) --silent
$(PATCHELF) $(TESTELF) gTestRunnerArgv "$(TESTS)\0"
ifeq ($(GITHUB_REPOSITORY_OWNER),rh-hideout)
TEST_SKIP_IS_FAIL := \x01
else
TEST_SKIP_IS_FAIL := \x00
endif
check: $(TESTELF)
@cp $< $(HEADLESSELF)
$(PATCHELF) $(HEADLESSELF) gTestRunnerHeadless '\x01' gTestRunnerSkipIsFail "$(TEST_SKIP_IS_FAIL)"
$(ROMTESTHYDRA) $(ROMTEST) $(HEADLESSELF)
libagbsyscall: libagbsyscall:
@$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN) @$(MAKE) -C libagbsyscall TOOLCHAIN=$(TOOLCHAIN) MODERN=$(MODERN)

44
asm/macros/battle_anim_script.inc
View File

@ -271,6 +271,50 @@
.byte 0x2f .byte 0x2f
.endm .endm
@ same as createvisualtask except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
.macro createvisualtaskontargets addr:req, priority:req, battlerargindex:req, argv:vararg
.byte 0x30
.4byte \addr
.byte \priority
.byte \battlerargindex
.byte (.Lcreatetask_\@_2 - .Lcreatetask_\@_1) / 2 @ num_args
.Lcreatetask_\@_1:
.2byte \argv
.Lcreatetask_\@_2:
.endm
@ same as createsprite except takes in battlerargindex, which is the battle anim arg index of the battler to loop through
.macro createspriteontargets template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
.byte 0x31
.4byte \template
.if \anim_battler == ANIM_TARGET
.byte 0x80 | (\subpriority_offset & 0x7F)
.else
.byte (\subpriority_offset & 0x7F)
.endif
.byte \battlerargindex
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
.Lsprite_\@_1:
.2byte \argv
.Lsprite_\@_2:
.endm
@ does not overwrite gBattleAnimArgs[battlerargindex], some sprite templates are too dependent on the value (e.g. heal block)
.macro createspriteontargets_onpos template:req, anim_battler:req, subpriority_offset:req, battlerargindex:req, argv:vararg
.byte 0x32
.4byte \template
.if \anim_battler == ANIM_TARGET
.byte 0x80 | (\subpriority_offset & 0x7F)
.else
.byte (\subpriority_offset & 0x7F)
.endif
.byte \battlerargindex
.byte (.Lsprite_\@_2 - .Lsprite_\@_1) / 2
.Lsprite_\@_1:
.2byte \argv
.Lsprite_\@_2:
.endm
@ useful macros @ useful macros
.macro jumpreteq value:req, ptr:req .macro jumpreteq value:req, ptr:req
jumpargeq ARG_RET_ID, \value, \ptr jumpargeq ARG_RET_ID, \value, \ptr

969
asm/macros/battle_script.inc
View File

File diff suppressed because it is too large Load Diff

2
asm/macros/event.inc
View File

@ -469,7 +469,7 @@
formatwarp \map, \a, \b, \c formatwarp \map, \a, \b, \c
.endm .endm
@ Sets the dynamic warp destination. Warps with a destination map of MAP_NONE will target this destination. @ Sets the dynamic warp destination. Warps with a destination map of MAP_DYNAMIC will target this destination.
@ Warp commands can be given either the id of which warp location to go to on the destination map @ Warp commands can be given either the id of which warp location to go to on the destination map
@ or a pair of x/y coordinates to go to directly on the destination map. @ or a pair of x/y coordinates to go to directly on the destination map.
.macro setdynamicwarp map:req, a, b, c .macro setdynamicwarp map:req, a, b, c

4
charmap.txt
View File

@ -426,13 +426,13 @@ SHADOW = FC 03 @ same as fc 01
COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes COLOR_HIGHLIGHT_SHADOW = FC 04 @ takes 3 bytes
PALETTE = FC 05 @ used in credits PALETTE = FC 05 @ used in credits
FONT = FC 06 @ Given a font id, or use font constants below instead FONT = FC 06 @ Given a font id, or use font constants below instead
RESET_SIZE = FC 07 RESET_FONT = FC 07
PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them PAUSE = FC 08 @ manually print the wait byte after this, havent mapped them
PAUSE_UNTIL_PRESS = FC 09 PAUSE_UNTIL_PRESS = FC 09
WAIT_SE = FC 0A WAIT_SE = FC 0A
PLAY_BGM = FC 0B PLAY_BGM = FC 0B
ESCAPE = FC 0C ESCAPE = FC 0C
SHIFT_TEXT = FC 0D SHIFT_RIGHT = FC 0D
SHIFT_DOWN = FC 0E SHIFT_DOWN = FC 0E
FILL_WINDOW = FC 0F FILL_WINDOW = FC 0F
PLAY_SE = FC 10 PLAY_SE = FC 10

1
common_syms/main.txt
View File

@ -7,3 +7,4 @@ gIntrTable
gLinkVSyncDisabled gLinkVSyncDisabled
IntrMain_Buffer IntrMain_Buffer
gPcmDmaCounter gPcmDmaCounter
gAgbMainLoop_sp

3
common_syms/window.txt
View File

@ -1,5 +1,2 @@
gUnusedWindowVar1
gUnusedWindowVar2
gTransparentTileNumber gTransparentTileNumber
gUnusedWindowVar3
gWindowBgTilemapBuffers gWindowBgTilemapBuffers

383
data/battle_anim_scripts.s
View File

@ -1,4 +1,5 @@
#include "config.h" #include "config.h"
#include "config/battle.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/rgb.h" #include "constants/rgb.h"
@ -7,7 +8,6 @@
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/battle_config.h"
.include "asm/macros.inc" .include "asm/macros.inc"
.include "asm/macros/battle_anim_script.inc" .include "asm/macros/battle_anim_script.inc"
.include "constants/constants.inc" .include "constants/constants.inc"
@ -805,6 +805,55 @@ gBattleAnims_Moves::
.4byte Move_SANDSEAR_STORM .4byte Move_SANDSEAR_STORM
.4byte Move_LUNAR_BLESSING .4byte Move_LUNAR_BLESSING
.4byte Move_TAKE_HEART .4byte Move_TAKE_HEART
@@@@@@@@@@@@ GEN 9 @@@@@@@@@@@@
.4byte Move_TERA_BLAST
.4byte Move_SILK_TRAP
.4byte Move_AXE_KICK
.4byte Move_LAST_RESPECTS
.4byte Move_LUMINA_CRASH
.4byte Move_ORDER_UP
.4byte Move_JET_PUNCH
.4byte Move_SPICY_EXTRACT
.4byte Move_SPIN_OUT
.4byte Move_POPULATION_BOMB
.4byte Move_ICE_SPINNER
.4byte Move_GLAIVE_RUSH
.4byte Move_REVIVAL_BLESSING
.4byte Move_SALT_CURE
.4byte Move_TRIPLE_DIVE
.4byte Move_MORTAL_SPIN
.4byte Move_DOODLE
.4byte Move_FILLET_AWAY
.4byte Move_KOWTOW_CLEAVE
.4byte Move_FLOWER_TRICK
.4byte Move_TORCH_SONG
.4byte Move_AQUA_STEP
.4byte Move_RAGING_BULL
.4byte Move_MAKE_IT_RAIN
.4byte Move_RUINATION
.4byte Move_COLLISION_COURSE
.4byte Move_ELECTRO_DRIFT
.4byte Move_SHED_TAIL
.4byte Move_CHILLY_RECEPTION
.4byte Move_TIDY_UP
.4byte Move_SNOWSCAPE
.4byte Move_POUNCE
.4byte Move_TRAILBLAZE
.4byte Move_CHILLING_WATER
.4byte Move_HYPER_DRILL
.4byte Move_TWIN_BEAM
.4byte Move_RAGE_FIST
.4byte Move_ARMOR_CANNON
.4byte Move_BITTER_BLADE
.4byte Move_DOUBLE_SHOCK
.4byte Move_GIGATON_HAMMER
.4byte Move_COMEUPPANCE
.4byte Move_AQUA_CUTTER
.4byte Move_BLAZING_TORQUE
.4byte Move_WICKED_TORQUE
.4byte Move_NOXIOUS_TORQUE
.4byte Move_COMBAT_TORQUE
.4byte Move_MAGICAL_TORQUE
@@@@ Z MOVES @@@@ Z MOVES
.4byte Move_BREAKNECK_BLITZ .4byte Move_BREAKNECK_BLITZ
.4byte Move_ALL_OUT_PUMMELING .4byte Move_ALL_OUT_PUMMELING
@ -1041,7 +1090,7 @@ Move_HAMMER_ARM:
Move_GYRO_BALL: Move_GYRO_BALL:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER playsewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER
waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8 waitplaysewithpan SE_M_SWAGGER, SOUND_PAN_ATTACKER, 8
@ -1217,7 +1266,7 @@ Move_METAL_BURST:
loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_ECLIPSING_ORB
loadspritegfx ANIM_TAG_RED_ORB loadspritegfx ANIM_TAG_RED_ORB
loopsewithpan SE_M_TRI_ATTACK, -64, 18, 3 loopsewithpan SE_M_TRI_ATTACK, -64, 18, 3
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE
createvisualtask AnimTask_DefenseCurlDeformMon, 5 createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish waitforvisualfinish
setarg 7, -1 setarg 7, -1
@ -1232,7 +1281,7 @@ Move_METAL_BURST:
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 20, 192 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 20, 192
createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224 createsprite gHiddenPowerOrbScatterSpriteTemplate, ANIM_TARGET, 2, 224
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -1464,22 +1513,22 @@ Move_HEAL_BLOCK:
loadspritegfx ANIM_TAG_BLUE_STAR loadspritegfx ANIM_TAG_BLUE_STAR
monbg ANIM_TARGET monbg ANIM_TARGET
createsoundtask SoundTask_PlaySeChangingVolume, SE_M_ABSORB_2, SOUND_PAN_TARGET, 256, -16, 0, 2 createsoundtask SoundTask_PlaySeChangingVolume, SE_M_ABSORB_2, SOUND_PAN_TARGET, 256, -16, 0, 2
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, 0, -5, ANIM_TARGET, 0
delay 7 delay 7
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, -15, 10, ANIM_TARGET, 0
delay 7 delay 7
createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | 4, 4, 2, 12, 0, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 4, 2, 12, 0, RGB_BLACK
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 0, -5, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, 0, -5, ANIM_TARGET, 0
delay 7 delay 7
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, 10, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, -15, 10, ANIM_TARGET, 0
delay 7 delay 7
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, -15, -15, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, -15, -15, ANIM_TARGET, 0
delay 7 delay 7
createsprite gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 10, -5, 1, 0 createspriteontargets_onpos gHealingBlueStarSpriteTemplate, ANIM_TARGET, 2, 2, 10, -5, ANIM_TARGET, 0
delay 7 delay 7
waitforvisualfinish waitforvisualfinish
delay 11 delay 11
createvisualtask AnimTask_BlendBattleAnimPal, 10, 1 | 4, 4, 2, 0, 12, RGB_BLACK createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_DEF_SIDE, 4, 2, 0, 12, RGB_BLACK
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
end end
@ -2616,7 +2665,6 @@ GigaImpactContinuity:
delay 11 delay 11
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 0, 26, 0, 0, 5
delay 6 delay 6
waitbgfadeout
createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0 createsprite gBasicHitSplatSpriteTemplate, 4, 4, -10, 0, 1, 0
playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET playsewithpan SE_M_MEGA_KICK2, SOUND_PAN_TARGET
delay 1 delay 1
@ -3010,7 +3058,10 @@ Move_MUD_BOMB:
Move_PSYCHO_CUT: Move_PSYCHO_CUT:
loadspritegfx ANIM_TAG_SPIRAL loadspritegfx ANIM_TAG_SPIRAL
loadspritegfx ANIM_TAG_PSYCHO_CUT loadspritegfx ANIM_TAG_PSYCHO_CUT
loadspritegfx ANIM_TAG_CROSS_IMPACT
monbg ANIM_ATK_PARTNER monbg ANIM_ATK_PARTNER
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_CROSS_IMPACT, 0, 9, 9, RGB_PURPLE
createvisualtask AnimTask_SwayMon, 5, 0, 6, 2048, 2, ANIM_ATTACKER
createsprite gPsychoCutSpiralSpriteTemplate, 2, 4, 0, 0, 0, 0 createsprite gPsychoCutSpiralSpriteTemplate, 2, 4, 0, 0, 0, 0
createvisualtask AnimTask_BlendBattleAnimPal, 1, 1, 2, 0, 4, RGB_BLACK 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, 2, 2, 0, 10, RGB(20, 12, 23)
@ -3021,8 +3072,10 @@ Move_PSYCHO_CUT:
splitbgprio ANIM_TARGET splitbgprio ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER, playsewithpan SE_M_RAZOR_WIND2, SOUND_PAN_ATTACKER,
createsprite gPsychoCutSpriteTemplate, 130, 5, 20, 0, -8, 0, 20 createsprite gPsychoCutSpriteTemplate, ANIM_TARGET, 2, 20, 0, -8, 0, 20
waitforvisualfinish 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, 1, 2, 4, 0, RGB_BLACK
createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 10, 0, RGB(20, 12, 23) createvisualtask AnimTask_BlendBattleAnimPal, 1, 2, 2, 10, 0, RGB(20, 12, 23)
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
@ -3064,7 +3117,7 @@ Move_ZEN_HEADBUTT:
Move_MIRROR_SHOT: Move_MIRROR_SHOT:
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT loadspritegfx ANIM_TAG_WHITE_CIRCLE_OF_LIGHT
@ -3128,7 +3181,7 @@ Move_FLASH_CANNON:
playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER playsewithpan SE_M_LEER, SOUND_PAN_ATTACKER
createvisualtask AnimTask_Flash, 2 createvisualtask AnimTask_Flash, 2
createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 16, 0, 0x1f createvisualtask AnimTask_BlendBattleAnimPal, 10, 4, 1, 16, 0, 0x1f
createvisualtask AnimTask_ShakeMon2, 2, 1, 2, 0, 15, 1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 2, 0, 15, 1
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
end end
@ -3599,7 +3652,7 @@ Move_IRON_HEAD:
loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0 createsprite gBowMonSpriteTemplate, ANIM_ATTACKER, 2, 0
playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER playsewithpan SE_M_HEADBUTT, SOUND_PAN_ATTACKER
@ -3613,7 +3666,7 @@ Move_IRON_HEAD:
createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1 createsprite gFlashingHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, 1, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -4300,12 +4353,12 @@ Move_SPACIAL_REND:
waitbgfadein waitbgfadein
loopsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET, 3, 5 loopsewithpan SE_M_RAZOR_WIND, SOUND_PAN_TARGET, 3, 5
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xb0, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xb0, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff40, 0xf0, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xf0, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, SOUND_PAN_ATTACKER, 0xff60, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff40, 0xff90, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff40, 0xff90, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xa0, 0x30, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xa0, 0x30, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0xff20, 0xffe0, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0xff20, 0xffe0, 0x28
createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 5, 0, 10, 0x70, 0xff80, 0x28 createsprite gSpacialRendBladesTemplate2, ANIM_TARGET, 1, 0, 10, 0x70, 0xff80, 0x28
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 0, 3, 15, 1
waitforvisualfinish waitforvisualfinish
restorebg restorebg
@ -4588,18 +4641,18 @@ ShadowForcePrep:
monbg ANIM_ATTACKER monbg ANIM_ATTACKER
playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER, playsewithpan SE_M_FAINT_ATTACK, SOUND_PAN_ATTACKER,
createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 0, 16, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, FALSE
createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3 createvisualtask AnimTask_TranslateMonEllipticalRespectSide, 2, ANIM_ATTACKER, 18, 6, 1, 3
createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1 createvisualtask AnimTask_AttackerFadeToInvisible, 2, 1
delay 80 delay 80
createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate ANIM_ATTACKER, 2, 1, 3, 16, 0, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_TARGET, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATK_PARTNER, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_DEF_PARTNER, TRUE
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
invisible 0 invisible 0
@ -4615,7 +4668,7 @@ ShadowForceAttack:
playsewithpan SOUND_PAN_ATTACKER, 192 playsewithpan SOUND_PAN_ATTACKER, 192
createvisualtask AnimTask_NightShadeClone, 5, 85 createvisualtask AnimTask_NightShadeClone, 5, 85
delay 70 delay 70
createvisualtask AnimTask_ShakeMon2 2, 1, 2, 0, 12, 1 createvisualtask AnimTask_ShakeMon2 2, ANIM_TARGET, 2, 0, 12, 1
createvisualtask AnimTask_BlendColorCycle 2, 4, 0, 2, 0, 13, 0 createvisualtask AnimTask_BlendColorCycle 2, 4, 0, 2, 0, 13, 0
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_ATTACKER clearmonbg ANIM_ATTACKER
@ -4977,7 +5030,7 @@ Move_HEAVY_SLAM:
loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_CLAW_SLASH
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
@ -5062,7 +5115,7 @@ Move_ELECTRO_BALL:
createsprite gElectroBallCannonBallTemplate, ANIM_TARGET, 2, 16, 16, 8 createsprite gElectroBallCannonBallTemplate, ANIM_TARGET, 2, 16, 16, 8
waitforvisualfinish waitforvisualfinish
playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET playsewithpan SE_M_SAND_ATTACK, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon2, 0x2, ANIM_TARGET, 0x4, 0x0, 0x8, 0x1 createvisualtask AnimTask_ShakeMon2, 2, ANIM_TARGET, 4, 0, 8, 1
call ElectricityEffect call ElectricityEffect
waitforvisualfinish waitforvisualfinish
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
@ -5085,7 +5138,7 @@ Move_SOAK:
playsewithpan SE_M_BUBBLE, 192 playsewithpan SE_M_BUBBLE, 192
delay 30 delay 30
playsewithpan SE_M_WATERFALL, 63 playsewithpan SE_M_WATERFALL, 63
createvisualtask AnimTask_ShakeMon2, 5, 1, 4, 0, 17, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_TARGET, 4, 0, 17, 1
createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 2, 0, 12, RGB_BLUE createvisualtask AnimTask_BlendColorCycle, 2, 4, 1, 2, 0, 12, RGB_BLUE
createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 3, 0, 0, 1, 1
createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 0 createsprite gSmallDriftingBubblesSpriteTemplate, ANIM_ATTACKER, 4, 0, 0
@ -6373,11 +6426,7 @@ Move_ELECTROWEB:
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
delay 1 delay 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 5, 1, 2, 9, 0, RGB_BLACK
call ElectricityEffect_OnTargets
@ ElectricityEffect looks ugly against both opponents, to do later
jumpifdoublebattle Move_ELECTROWEB_Wait
call ElectricityEffect
Move_ELECTROWEB_Wait: Move_ELECTROWEB_Wait:
waitforvisualfinish waitforvisualfinish
end end
@ -9246,16 +9295,16 @@ Move_EERIE_IMPULSE::
Move_VENOM_DRENCH:: Move_VENOM_DRENCH::
loadspritegfx ANIM_TAG_POISON_BUBBLE loadspritegfx ANIM_TAG_POISON_BUBBLE
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xfffb 0x1 0xfffb 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xfffb 0x1 0xfffb 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x5 0x0 0x6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x5 0x0 0x6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x13 0x1 0xa 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x13 0x1 0xa 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffe9 0x2 0xfff6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffe9 0x2 0xfff6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
call AcidDrench call AcidDrench
@ -9264,28 +9313,28 @@ Move_VENOM_DRENCH::
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
AcidDrench: AcidDrench:
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffec 0x0 0xfff6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffec 0x0 0xfff6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x1c 0x1 0xa 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x1c 0x1 0xa 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xfff6 0x1 0xfffb 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xfff6 0x1 0xfffb 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xa 0x0 0x6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xa 0x0 0x6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x18 0x1 0xa 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x18 0x1 0xa 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffe0 0x2 0xfff6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffe0 0x2 0xfff6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffec 0x0 0xfff6 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0xffec 0x0 0xfff6 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x1e 0x2 0xa 0x0 launchtemplate gVenomDrenchAcidTemplate 0x82, 0x4, 0x1e 0x2 0xa 1
playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET playsewithpan SE_M_BUBBLE3, SOUND_PAN_TARGET
delay 0x2 delay 0x2
return return
@ -10046,7 +10095,7 @@ Move_LIGHT_OF_RUIN::
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0xF 0x6B1F launchtask AnimTask_BlendBattleAnimPal 0xa 0x5 ANIM_PAL_BG 0x1 0x0 0xF 0x6B1F
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1 launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, 0x1f, 0x10, 0, 0 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call LightOfRuinBeam call LightOfRuinBeam
call LightOfRuinBeam call LightOfRuinBeam
call LightOfRuinBeam call LightOfRuinBeam
@ -10143,6 +10192,7 @@ Move_ORIGIN_PULSE::
launchtemplate gOriginPulseOrbInwardTemplate 0x82 0x5 0x1 0x0 0xFF2A 0xFFAA 0x10 @between left and upper left launchtemplate gOriginPulseOrbInwardTemplate 0x82 0x5 0x1 0x0 0xFF2A 0xFFAA 0x10 @between left and upper left
launchtemplate gOriginPulseOrbInwardTemplate 0x82 0x5 0x1 0x0 0xFFDA 0xFF94 0x10 @between up and upper left launchtemplate gOriginPulseOrbInwardTemplate 0x82 0x5 0x1 0x0 0xFFDA 0xFF94 0x10 @between up and upper left
waitforvisualfinish waitforvisualfinish
createvisualtaskontargets AnimTask_ShakeMon2, 5, 0, ANIM_TARGET, 2, 0, 18, 1
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
launchtemplate gOriginPulseBasicSplatTemplate 0x83 0x4 0xffb0 0xfff0 0x1 0x1 launchtemplate gOriginPulseBasicSplatTemplate 0x83 0x4 0xffb0 0xfff0 0x1 0x1
stopsound stopsound
@ -12184,7 +12234,7 @@ Move_FLEUR_CANNON::
waitforvisualfinish waitforvisualfinish
panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0 panse SE_M_SOLAR_BEAM, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 0x2, 0x0
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1 launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, 0x1f, 16, 0, 0 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call FleurCannonBeam call FleurCannonBeam
call FleurCannonBeam call FleurCannonBeam
call FleurCannonBeam call FleurCannonBeam
@ -12717,7 +12767,7 @@ Move_MOONGEIST_BEAM::
delay 0x20 delay 0x20
createsoundtask SoundTask_LoopSEAdjustPanning, 0x7, 0xCC, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5 createsoundtask SoundTask_LoopSEAdjustPanning, 0x7, 0xCC, 0xffc0, SOUND_PAN_TARGET, 0x1, 0xf, 0x0, 0x5
launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1 launchtask AnimTask_ShakeMon 0x2 0x5 ANIM_ATTACKER 0x0 0x4 0x32 0x1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, 0x1f, 0x10, 0, 0 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call MoongeistBeamOrbs call MoongeistBeamOrbs
call MoongeistBeamOrbs call MoongeistBeamOrbs
call MoongeistBeamOrbs call MoongeistBeamOrbs
@ -13445,7 +13495,18 @@ Move_DRAGON_DARTS::
end end
Move_TEATIME:: Move_TEATIME::
goto Move_MILK_DRINK loadspritegfx ANIM_TAG_TEAPOT
loadspritegfx ANIM_TAG_THOUGHT_BUBBLE
createsprite gThoughtBubbleSpriteTemplate, ANIM_ATTACKER, 11, 0, 100
playsewithpan SE_M_ICY_WIND, SOUND_PAN_ATTACKER
delay 6
createsprite gTeapotSpriteTemplate, ANIM_ATTACKER, 12, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATTACKER, 2, 0
createvisualtask AnimTask_RockMonBackAndForth, 5, ANIM_ATK_PARTNER, 2, 0
delay 24
loopsewithpan SE_M_HEAL_BELL, SOUND_PAN_ATTACKER, 22, 3
waitforvisualfinish
end
Move_OCTOLOCK:: Move_OCTOLOCK::
loadspritegfx ANIM_TAG_TENDRILS loadspritegfx ANIM_TAG_TENDRILS
@ -13959,11 +14020,12 @@ Move_STRANGE_STEAM::
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
end end
StrangeSteamCloud: StrangeSteamCloud:
launchtemplate gStrangeSteamPinkCloudTemplate 0x82 0x5 0xf 0xf 0x14 0x0 0x0 createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0, 0
launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xa 0x5 createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xa, 0x5
launchtemplate gStrangeSteamPinkCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xfff6 0xfffb createsprite gStrangeSteamPinkCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xfff6, 0xfffb
launchtemplate gStrangeSteamGreenCloudTemplate 0x82 0x5 0xf 0xf 0x14 0x14 0xa delay 0x1
launchtemplate gStrangeSteamBlueCloudTemplate 0x82 0x5 0xf 0xf 0x14 0xffec 0xfff6 createsprite gStrangeSteamGreenCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0x14, 0xa
createsprite gStrangeSteamBlueCloudTemplate, ANIM_TARGET, 2, 0xf, 0xf, 0x14, 0xffec, 0xfff6
delay 0x2 delay 0x2
return return
@ -14062,7 +14124,7 @@ Move_ETERNA_BEAM::
Move_STEEL_BEAM:: Move_STEEL_BEAM::
loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
delay 48 delay 48
loadspritegfx ANIM_TAG_ELECTRIC_ORBS loadspritegfx ANIM_TAG_ELECTRIC_ORBS
loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_GUST
@ -14327,6 +14389,21 @@ Move_SCORCHING_SANDS::
Move_JUNGLE_HEALING:: Move_JUNGLE_HEALING::
goto Move_AROMATHERAPY goto Move_AROMATHERAPY
Move_SILK_TRAP::
loadspritegfx ANIM_TAG_PROTECT
loadspritegfx ANIM_TAG_SPIDER_WEB
splitbgprio ANIM_ATTACKER
playsewithpan SE_M_STRING_SHOT2, SOUND_PAN_TARGET
createsprite gSpiderWebSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, FALSE
waitforvisualfinish
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_PROTECT, 0, 10, 10, RGB_LIME_GREEN
monbg ANIM_ATK_PARTNER
waitplaysewithpan SE_M_REFLECT, SOUND_PAN_ATTACKER, 0x10
createsprite gProtectSpriteTemplate, ANIM_ATTACKER, 2, 24, 0, 90
waitforvisualfinish
clearmonbg ANIM_ATK_PARTNER
end
Move_WICKED_BLOW:: Move_WICKED_BLOW::
Move_SURGING_STRIKES:: Move_SURGING_STRIKES::
Move_THUNDER_CAGE:: Move_THUNDER_CAGE::
@ -14361,6 +14438,53 @@ Move_WILDBOLT_STORM::
Move_SANDSEAR_STORM:: Move_SANDSEAR_STORM::
Move_LUNAR_BLESSING:: Move_LUNAR_BLESSING::
Move_TAKE_HEART:: Move_TAKE_HEART::
Move_TERA_BLAST::
Move_AXE_KICK::
Move_LAST_RESPECTS::
Move_LUMINA_CRASH::
Move_ORDER_UP::
Move_JET_PUNCH::
Move_SPICY_EXTRACT::
Move_SPIN_OUT::
Move_POPULATION_BOMB::
Move_ICE_SPINNER::
Move_GLAIVE_RUSH::
Move_REVIVAL_BLESSING::
Move_SALT_CURE::
Move_TRIPLE_DIVE::
Move_MORTAL_SPIN::
Move_DOODLE::
Move_FILLET_AWAY::
Move_KOWTOW_CLEAVE::
Move_FLOWER_TRICK::
Move_TORCH_SONG::
Move_AQUA_STEP::
Move_RAGING_BULL::
Move_MAKE_IT_RAIN::
Move_RUINATION::
Move_COLLISION_COURSE::
Move_ELECTRO_DRIFT::
Move_SHED_TAIL::
Move_CHILLY_RECEPTION::
Move_TIDY_UP::
Move_SNOWSCAPE::
Move_POUNCE::
Move_TRAILBLAZE::
Move_CHILLING_WATER::
Move_HYPER_DRILL::
Move_TWIN_BEAM::
Move_RAGE_FIST::
Move_ARMOR_CANNON::
Move_BITTER_BLADE::
Move_DOUBLE_SHOCK::
Move_GIGATON_HAMMER::
Move_COMEUPPANCE::
Move_AQUA_CUTTER::
Move_BLAZING_TORQUE::
Move_WICKED_TORQUE::
Move_NOXIOUS_TORQUE::
Move_COMBAT_TORQUE::
Move_MAGICAL_TORQUE::
end @to do end @to do
@@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@ GEN 1-3 @@@@@@@@@@@@@@@@@@@@@@@
@ -15402,11 +15526,11 @@ FuryCutterStrongest:
Move_SELF_DESTRUCT: Move_SELF_DESTRUCT:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB_RED createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_ATTACKER, 1, 0, 9, RGB_RED
createvisualtask AnimTask_ShakeMon2, 5, 4, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 6, 0, 38, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 6, 0, 38, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 6, 0, 38, 1
call SelfDestructExplode call SelfDestructExplode
call SelfDestructExplode call SelfDestructExplode
waitforvisualfinish waitforvisualfinish
@ -15568,11 +15692,11 @@ RisingWaterHitEffect:
Move_EXPLOSION: Move_EXPLOSION:
loadspritegfx ANIM_TAG_EXPLOSION loadspritegfx ANIM_TAG_EXPLOSION
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 9, RGB(26, 8, 8), 8, RGB_BLACK, 8
createvisualtask AnimTask_ShakeMon2, 5, 4, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 5, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_PLAYER_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 6, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_LEFT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 7, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_OPPONENT_RIGHT, 8, 0, 40, 1
createvisualtask AnimTask_ShakeMon2, 5, 8, 8, 0, 40, 1 createvisualtask AnimTask_ShakeMon2, 5, ANIM_ATTACKER_FORCE, 8, 0, 40, 1
call Explosion1 call Explosion1
call Explosion1 call Explosion1
waitforvisualfinish waitforvisualfinish
@ -15601,12 +15725,12 @@ Explosion1:
Move_DEFENSE_CURL: Move_DEFENSE_CURL:
loadspritegfx ANIM_TAG_ECLIPSING_ORB loadspritegfx ANIM_TAG_ECLIPSING_ORB
loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3 loopsewithpan SE_M_TRI_ATTACK, SOUND_PAN_ATTACKER, 18, 3
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, FALSE
createvisualtask AnimTask_DefenseCurlDeformMon, 5 createvisualtask AnimTask_DefenseCurlDeformMon, 5
waitforvisualfinish waitforvisualfinish
createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1 createsprite gEclipsingOrbSpriteTemplate, ANIM_ATTACKER, 2, 0, 6, 0, 1
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -17860,22 +17984,22 @@ Move_LUSTER_PURGE:
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23) createvisualtask AnimTask_BlendParticle, 5, ANIM_TAG_IMPACT, 0, 12, 12, RGB(0, 0, 23)
waitforvisualfinish waitforvisualfinish
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
delay 3 delay 3
createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, 1, 2 createsprite gRandomPosHitSplatSpriteTemplate, ANIM_TARGET, 3, ANIM_TARGET, 2
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_HYPER_BEAM, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA createvisualtask AnimTask_BlendBattleAnimPalExclude, 5, 5, 2, 16, 0, RGB_WHITEALPHA
@ -18300,7 +18424,7 @@ Move_AERIAL_ACE:
Move_IRON_DEFENSE: Move_IRON_DEFENSE:
loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_SHINY, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 8, 2, RGB_WHITEALPHA, 14, RGB_WHITEALPHA, 0
waitforvisualfinish waitforvisualfinish
end end
@ -18313,7 +18437,7 @@ Move_BLOCK:
Move_HOWL: Move_HOWL:
loadspritegfx ANIM_TAG_NOISE_LINE loadspritegfx ANIM_TAG_NOISE_LINE
createvisualtask AnimTask_DeepInhale, 2, 0 createvisualtask AnimTask_DeepInhale, 2, ANIM_ATTACKER
delay 12 delay 12
call RoarEffect call RoarEffect
createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3 createvisualtask SoundTask_PlayCryHighPitch, 2, ANIM_ATTACKER, 3
@ -18512,7 +18636,7 @@ Move_SHOCK_WAVE:
Move_HARDEN: Move_HARDEN:
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
end end
@ -19573,7 +19697,7 @@ HydroPumpBeams:
createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, -16 createsprite gHydroPumpOrbSpriteTemplate, ANIM_ATTACKER, 3, 10, 10, 0, -16
delay 1 delay 1
return return
HydroPumpHitSplats : HydroPumpHitSplats:
createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 15, ANIM_TARGET, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, 15, ANIM_TARGET, 1
createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, ANIM_TARGET, 1 createsprite gWaterHitSplatSpriteTemplate, ANIM_ATTACKER, 4, 0, -15, ANIM_TARGET, 1
return return
@ -21027,7 +21151,11 @@ Move_POISON_GAS:
createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0 createsprite gPoisonGasCloudSpriteTemplate, ANIM_TARGET, 0, 64, 0, 0, -32, -6, 4192, 1072, 0
delay 40 delay 40
loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6 loopsewithpan SE_M_MIST, SOUND_PAN_TARGET, 28, 6
.if B_UPDATED_MOVE_DATA >= GEN_5
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_DEF_SIDE, 6, 2, 0, 12, RGB(26, 0, 26)
.else
createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 6, 2, 0, 12, RGB(26, 0, 26) createvisualtask AnimTask_BlendColorCycle, 2, F_PAL_TARGET, 6, 2, 0, 12, RGB(26, 0, 26)
.endif
waitforvisualfinish waitforvisualfinish
blendoff blendoff
clearmonbg ANIM_DEF_PARTNER clearmonbg ANIM_DEF_PARTNER
@ -21147,7 +21275,7 @@ Move_STEEL_WING:
loadspritegfx ANIM_TAG_GUST loadspritegfx ANIM_TAG_GUST
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
monbg ANIM_DEF_PARTNER monbg ANIM_DEF_PARTNER
splitbgprio ANIM_TARGET splitbgprio ANIM_TARGET
@ -21173,7 +21301,7 @@ Move_STEEL_WING:
Move_IRON_TAIL: Move_IRON_TAIL:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 1, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 1, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
monbg ANIM_TARGET monbg ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
@ -21183,7 +21311,7 @@ Move_IRON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
blendoff blendoff
waitforvisualfinish waitforvisualfinish
@ -21203,7 +21331,7 @@ Move_POISON_TAIL:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 3, 0, 6, 1
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_ATTACKER, TRUE
clearmonbg ANIM_TARGET clearmonbg ANIM_TARGET
blendoff blendoff
call PoisonBubblesEffect call PoisonBubblesEffect
@ -21213,7 +21341,7 @@ Move_POISON_TAIL:
Move_METAL_CLAW: Move_METAL_CLAW:
loadspritegfx ANIM_TAG_CLAW_SLASH loadspritegfx ANIM_TAG_CLAW_SLASH
loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2 loopsewithpan SE_M_HARDEN, SOUND_PAN_ATTACKER, 28, 2
createvisualtask AnimTask_MetallicShine, 5, 0, 0, 0 createvisualtask AnimTask_MetallicShine, 5, 0, 0, RGB_BLACK
waitforvisualfinish waitforvisualfinish
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 6, 4
delay 2 delay 2
@ -21875,16 +22003,16 @@ Move_PERISH_SONG:
panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0 panse SE_M_PERISH_SONG, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, +2, 0
delay 80 delay 80
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 0, 16, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 0, 16, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, FALSE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 0 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, FALSE
delay 100 delay 100
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 16, 0, RGB_BLACK createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 3, 16, 0, RGB_BLACK
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 4, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 5, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_PLAYER_RIGHT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 6, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_LEFT, TRUE
createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, 7, 1 createvisualtask AnimTask_SetGrayscaleOrOriginalPal, 5, ANIM_OPPONENT_RIGHT, TRUE
waitforvisualfinish waitforvisualfinish
end end
@ -22030,7 +22158,7 @@ Move_ENCORE:
loadspritegfx ANIM_TAG_SPOTLIGHT loadspritegfx ANIM_TAG_SPOTLIGHT
loadspritegfx ANIM_TAG_TAG_HAND loadspritegfx ANIM_TAG_TAG_HAND
createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish waitforvisualfinish
createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8 createsprite gSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8
createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9 createsprite gClappingHandSpriteTemplate, ANIM_ATTACKER, 2, -2, 0, 0, 0, 9
@ -22041,7 +22169,7 @@ Move_ENCORE:
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 5, ANIM_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
@ -22292,7 +22420,7 @@ Move_HYPER_BEAM:
delay 30 delay 30
createsoundtask SoundTask_LoopSEAdjustPanning, SE_M_HYPER_BEAM2, SOUND_PAN_ATTACKER, SOUND_PAN_TARGET, 1, 15, 0, 5 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_ShakeMon, 2, ANIM_ATTACKER, 0, 4, 50, 1
createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB(31, 0, 0), 16, 0, 0 createvisualtask AnimTask_FlashAnimTagWithColor, 2, ANIM_TAG_ORBS, 1, 12, RGB_RED, 16, 0, 0
call HyperBeamOrbs call HyperBeamOrbs
call HyperBeamOrbs call HyperBeamOrbs
call HyperBeamOrbs call HyperBeamOrbs
@ -22336,7 +22464,7 @@ Move_FLATTER:
loadspritegfx ANIM_TAG_CONFETTI loadspritegfx ANIM_TAG_CONFETTI
createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE2WithPanning, 5, SE_M_ENCORE2, SOUND_PAN_TARGET
createvisualtask AnimTask_CreateSpotlight, 2 createvisualtask AnimTask_CreateSpotlight, 2
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 0, 10, 0 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 0, 10, FALSE
waitforvisualfinish waitforvisualfinish
createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80 createsprite gFlatterSpotlightSpriteTemplate, ANIM_TARGET, 2, 0, -8, 80
delay 0 delay 0
@ -22367,7 +22495,7 @@ Move_FLATTER:
delay 5 delay 5
createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET createvisualtask SoundTask_PlaySE1WithPanning, 5, SE_M_FLATTER, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_HardwarePaletteFade, 2, 248, 3, 10, 0, 1 createvisualtask AnimTask_HardwarePaletteFade, 2, BLDCNT_TGT1_BG3 | BLDCNT_TGT1_OBJ | BLDCNT_TGT1_BD | BLDCNT_EFFECT_DARKEN, 3, 10, 0, TRUE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RemoveSpotlight, 2 createvisualtask AnimTask_RemoveSpotlight, 2
end end
@ -23265,15 +23393,15 @@ Move_OVERHEAT:
waitforvisualfinish waitforvisualfinish
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, ANIM_TARGET, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, -5, 3, ANIM_TARGET, 0
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 10, 0, 25, 1 createvisualtaskontargets AnimTask_ShakeMon, 2, 0, ANIM_TARGET, 10, 0, 25, 1
delay 6 delay 6
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 8, -5, ANIM_TARGET, 0 createspriteontargets gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 2, 8, -5, ANIM_TARGET, 0
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
delay 8 delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 10, 10, ANIM_TARGET, 0 createspriteontargets gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 2, 10, 10, ANIM_TARGET, 0
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
delay 8 delay 8
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 0, 0, ANIM_TARGET, 0 createspriteontargets gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 2, 0, 0, ANIM_TARGET, 0
playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET playsewithpan SE_M_FLAMETHROWER, SOUND_PAN_TARGET
createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1 createvisualtask AnimTask_CopyPalFadedToUnfaded, 5, 1
delay 1 delay 1
@ -23648,10 +23776,10 @@ Move_TWISTER:
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 3, 0, 12, 1 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_DEF_PARTNER, 3, 0, 12, 1
delay 4 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 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4 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 playsewithpan SE_M_COMET_PUNCH, SOUND_PAN_TARGET
delay 4 delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 3, 32, 20, ANIM_TARGET, 3
@ -24099,21 +24227,40 @@ WaterBubblesEffectLong:
ElectricityEffect: ElectricityEffect:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
ElectricityEffectNoSound: ElectricityEffectNoSound:
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 5, 0, 5, 0, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -5, 10, 5, 1, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 15, 20, 5, 2, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -15, -10, 5, 0, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 25, 0, 5, 1, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -8, 8, 5, 2, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 2, -8, 5, 0, ANIM_TARGET
delay 2 delay 2
createsprite gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, -20, 15, 5, 1, ANIM_TARGET
return
ElectricityEffect_OnTargets:
playsewithpan SE_M_THUNDERBOLT2, SOUND_PAN_TARGET
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, 5, 0, 5, 0, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, -5, 10, 5, 1, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, 15, 20, 5, 2, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, -15, -10, 5, 0, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, 25, 0, 5, 1, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, -8, 8, 5, 2, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, 2, -8, 5, 0, ANIM_TARGET
delay 2
createspriteontargets gElectricitySpriteTemplate, ANIM_TARGET, 2, 4, -20, 15, 5, 1, ANIM_TARGET
return return
ConfusionEffect: ConfusionEffect:
@ -24857,7 +25004,7 @@ General_StrongWinds::
General_PrimalReversion:: General_PrimalReversion::
launchtask AnimTask_PrimalReversion 0x5 0x0 launchtask AnimTask_PrimalReversion 0x5 0x0
jumpargeq 0x0, ITEM_RED_ORB, General_PrimalReversion_Omega jumpargeq 0x0, ITEM_RED_ORB, General_PrimalReversion_Omega
jumpargeq 0x1, ITEM_BLUE_ORB, General_PrimalReversion_Alpha jumpargeq 0x0, ITEM_BLUE_ORB, General_PrimalReversion_Alpha
General_PrimalReversion_Alpha: General_PrimalReversion_Alpha:
loadspritegfx ANIM_TAG_ALPHA_STONE loadspritegfx ANIM_TAG_ALPHA_STONE
loadspritegfx ANIM_TAG_MEGA_PARTICLES loadspritegfx ANIM_TAG_MEGA_PARTICLES

914
data/battle_scripts_1.s
View File

File diff suppressed because it is too large Load Diff

2
data/battle_scripts_2.s
View File

@ -1,8 +1,8 @@
#include "config/battle.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_script_commands.h" #include "constants/battle_script_commands.h"
#include "constants/battle_anim.h" #include "constants/battle_anim.h"
#include "constants/battle_string_ids.h" #include "constants/battle_string_ids.h"
#include "constants/battle_config.h"
#include "constants/items.h" #include "constants/items.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"

3
data/event_scripts.s
View File

@ -1,8 +1,9 @@
#include "config/battle.h"
#include "config/item.h"
#include "constants/global.h" #include "constants/global.h"
#include "constants/apprentice.h" #include "constants/apprentice.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_arena.h" #include "constants/battle_arena.h"
#include "constants/battle_config.h"
#include "constants/battle_dome.h" #include "constants/battle_dome.h"
#include "constants/battle_factory.h" #include "constants/battle_factory.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"

4
data/maps/AbandonedShip_CaptainsOffice/map.json
View File

@ -47,14 +47,14 @@
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 8, "x": 8,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [], "coord_events": [],

24
data/maps/AbandonedShip_Corridors_1F/map.json
View File

@ -47,84 +47,84 @@
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 8, "x": 8,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 0, "x": 0,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 1, "x": 1,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_DECK", "dest_map": "MAP_ABANDONED_SHIP_DECK",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 11, "x": 11,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 14, "x": 14,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 11, "x": 11,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 14, "x": 14,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_1F",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 3, "x": 3,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 16, "x": 16,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 3, "x": 3,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

16
data/maps/AbandonedShip_Corridors_B1F/map.json
View File

@ -47,56 +47,56 @@
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 3, "x": 3,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS2_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 5, "x": 5,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 8, "x": 8,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 11, "x": 11,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOMS_B1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 11, "x": 11,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F", "dest_map": "MAP_ABANDONED_SHIP_ROOM_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 0, "x": 0,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 10 "dest_warp_id": "10"
}, },
{ {
"x": 8, "x": 8,
"y": 2, "y": 2,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 9 "dest_warp_id": "9"
} }
], ],
"coord_events": [], "coord_events": [],

10
data/maps/AbandonedShip_Deck/map.json
View File

@ -20,35 +20,35 @@
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ROUTE108", "dest_map": "MAP_ROUTE108",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 14, "x": 14,
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ROUTE108", "dest_map": "MAP_ROUTE108",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 13, "x": 13,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 8, "x": 8,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 12, "x": 12,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE", "dest_map": "MAP_ABANDONED_SHIP_CAPTAINS_OFFICE",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

12
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
View File

@ -20,42 +20,42 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 9, "x": 9,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 3, "x": 3,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 6, "x": 6,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 9, "x": 9,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS",
"dest_warp_id": 8 "dest_warp_id": "8"
} }
], ],
"coord_events": [], "coord_events": [],

18
data/maps/AbandonedShip_HiddenFloorRooms/map.json
View File

@ -73,63 +73,63 @@
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 7, "x": 7,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 21, "x": 21,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 22, "x": 22,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 36, "x": 36,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 37, "x": 37,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 6, "x": 6,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 21, "x": 21,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 36, "x": 36,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS", "dest_map": "MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS",
"dest_warp_id": 5 "dest_warp_id": "5"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/AbandonedShip_Room_B1F/map.json
View File

@ -34,14 +34,14 @@
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 5 "dest_warp_id": "5"
}, },
{ {
"x": 5, "x": 5,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 5 "dest_warp_id": "5"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/AbandonedShip_Rooms2_1F/map.json
View File

@ -86,21 +86,21 @@
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 8 "dest_warp_id": "8"
}, },
{ {
"x": 5, "x": 5,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 8 "dest_warp_id": "8"
}, },
{ {
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 11 "dest_warp_id": "11"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/AbandonedShip_Rooms2_B1F/map.json
View File

@ -47,28 +47,28 @@
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 13, "x": 13,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 14, "x": 14,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

12
data/maps/AbandonedShip_Rooms_1F/map.json
View File

@ -73,42 +73,42 @@
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 5, "x": 5,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 13, "x": 13,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 5 "dest_warp_id": "5"
}, },
{ {
"x": 13, "x": 13,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 14, "x": 14,
"y": 16, "y": 16,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_1F",
"dest_warp_id": 5 "dest_warp_id": "5"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/AbandonedShip_Rooms_B1F/map.json
View File

@ -47,21 +47,21 @@
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 13, "x": 13,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 22, "x": 22,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F", "dest_map": "MAP_ABANDONED_SHIP_CORRIDORS_B1F",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/AbandonedShip_Underwater1/map.json
View File

@ -20,14 +20,14 @@
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2", "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER2",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/AbandonedShip_Underwater2/map.json
View File

@ -20,7 +20,7 @@
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1", "dest_map": "MAP_ABANDONED_SHIP_UNDERWATER1",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/AlteringCave/map.json
View File

@ -20,7 +20,7 @@
"y": 22, "y": 22,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE103", "dest_map": "MAP_ROUTE103",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/AncientTomb/map.json
View File

@ -34,21 +34,21 @@
"y": 29, "y": 29,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ROUTE120", "dest_map": "MAP_ROUTE120",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 8, "x": 8,
"y": 20, "y": 20,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ANCIENT_TOMB", "dest_map": "MAP_ANCIENT_TOMB",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 8, "x": 8,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ANCIENT_TOMB", "dest_map": "MAP_ANCIENT_TOMB",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/AquaHideout_1F/map.json
View File

@ -60,21 +60,21 @@
"y": 27, "y": 27,
"elevation": 1, "elevation": 1,
"dest_map": "MAP_LILYCOVE_CITY", "dest_map": "MAP_LILYCOVE_CITY",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 14, "x": 14,
"y": 27, "y": 27,
"elevation": 1, "elevation": 1,
"dest_map": "MAP_LILYCOVE_CITY", "dest_map": "MAP_LILYCOVE_CITY",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 22, "x": 22,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

50
data/maps/AquaHideout_B1F/map.json
View File

@ -138,175 +138,175 @@
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_1F", "dest_map": "MAP_AQUA_HIDEOUT_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 18, "x": 18,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 12, "x": 12,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 3, "x": 3,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 31, "x": 31,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 27, "x": 27,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 8 "dest_warp_id": "8"
}, },
{ {
"x": 20, "x": 20,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 10 "dest_warp_id": "10"
}, },
{ {
"x": 27, "x": 27,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 3, "x": 3,
"y": 15, "y": 15,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 5 "dest_warp_id": "5"
}, },
{ {
"x": 3, "x": 3,
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12 "dest_warp_id": "12"
}, },
{ {
"x": 32, "x": 32,
"y": 19, "y": 19,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 23, "x": 23,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 22 "dest_warp_id": "22"
}, },
{ {
"x": 45, "x": 45,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 9 "dest_warp_id": "9"
}, },
{ {
"x": 42, "x": 42,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 18 "dest_warp_id": "18"
}, },
{ {
"x": 45, "x": 45,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12 "dest_warp_id": "12"
}, },
{ {
"x": 48, "x": 48,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 16 "dest_warp_id": "16"
}, },
{ {
"x": 42, "x": 42,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 15 "dest_warp_id": "15"
}, },
{ {
"x": 45, "x": 45,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 20 "dest_warp_id": "20"
}, },
{ {
"x": 48, "x": 48,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 13 "dest_warp_id": "13"
}, },
{ {
"x": 42, "x": 42,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 24 "dest_warp_id": "24"
}, },
{ {
"x": 45, "x": 45,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 17 "dest_warp_id": "17"
}, },
{ {
"x": 48, "x": 48,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 12 "dest_warp_id": "12"
}, },
{ {
"x": 42, "x": 42,
"y": 17, "y": 17,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 11 "dest_warp_id": "11"
}, },
{ {
"x": 45, "x": 45,
"y": 17, "y": 17,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 17 "dest_warp_id": "17"
}, },
{ {
"x": 48, "x": 48,
"y": 17, "y": 17,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 19 "dest_warp_id": "19"
} }
], ],
"coord_events": [], "coord_events": [],

20
data/maps/AquaHideout_B2F/map.json
View File

@ -99,70 +99,70 @@
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 12, "x": 12,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 3, "x": 3,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 31, "x": 31,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 5 "dest_warp_id": "5"
}, },
{ {
"x": 8, "x": 8,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 8 "dest_warp_id": "8"
}, },
{ {
"x": 5, "x": 5,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 18, "x": 18,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 12, "x": 12,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 31, "x": 31,
"y": 17, "y": 17,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B2F", "dest_map": "MAP_AQUA_HIDEOUT_B2F",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 32, "x": 32,
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_AQUA_HIDEOUT_B1F", "dest_map": "MAP_AQUA_HIDEOUT_B1F",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [ "coord_events": [

4
data/maps/ArtisanCave_1F/map.json
View File

@ -34,14 +34,14 @@
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 13 "dest_warp_id": "13"
}, },
{ {
"x": 6, "x": 6,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_B1F", "dest_map": "MAP_ARTISAN_CAVE_B1F",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/ArtisanCave_B1F/map.json
View File

@ -34,14 +34,14 @@
"y": 48, "y": 48,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 10 "dest_warp_id": "10"
}, },
{ {
"x": 38, "x": 38,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_1F", "dest_map": "MAP_ARTISAN_CAVE_1F",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/BattleColosseum_2P/map.json
View File

@ -33,15 +33,15 @@
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
}, },
{ {
"x": 7, "x": 7,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
} }
], ],
"coord_events": [ "coord_events": [

16
data/maps/BattleColosseum_4P/map.json
View File

@ -19,29 +19,29 @@
"x": 5, "x": 5,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
}, },
{ {
"x": 7, "x": 7,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
}, },
{ {
"x": 8, "x": 8,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_NONE", "dest_map": "MAP_DYNAMIC",
"dest_warp_id": 127 "dest_warp_id": "WARP_ID_DYNAMIC"
} }
], ],
"coord_events": [ "coord_events": [

2
data/maps/BattleFrontier_BattleArenaLobby/map.json
View File

@ -86,7 +86,7 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattleDomeCorridor/map.json
View File

@ -34,14 +34,14 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 7, "x": 7,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattleDomeLobby/map.json
View File

@ -99,14 +99,14 @@
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 12, "x": 12,
"y": 16, "y": 16,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 7, "x": 7,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattleFactoryLobby/map.json
View File

@ -99,14 +99,14 @@
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 10, "x": 10,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
View File

@ -86,14 +86,14 @@
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 1, "x": 1,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/BattleFrontier_BattlePalaceCorridor/map.json
View File

@ -112,28 +112,28 @@
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 9, "x": 9,
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 6, "x": 6,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 10, "x": 10,
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/BattleFrontier_BattlePalaceLobby/map.json
View File

@ -99,21 +99,21 @@
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 13, "x": 13,
"y": 11, "y": 11,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 5, "x": 5,
"y": 4, "y": 4,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/BattleFrontier_BattlePikeLobby/map.json
View File

@ -73,21 +73,21 @@
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 6, "x": 6,
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_BattlePyramidLobby/map.json
View File

@ -73,7 +73,7 @@
"y": 17, "y": 17,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 3 "dest_warp_id": "3"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
View File

@ -60,14 +60,14 @@
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/BattleFrontier_BattleTowerLobby/map.json
View File

@ -138,21 +138,21 @@
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 13, "x": 13,
"y": 9, "y": 9,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 6, "x": 6,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
View File

@ -411,7 +411,13 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
delay 2 delay 2
@ The command tower_save ultimately calls TrySavingData(SAVE_LINK), which writes data in SaveBlock1 and SaveBlock2
@ to the flash, but not data in PokemonStorage. The SaveGame script that follows asks the player to do a full save,
@ which they can opt out of. As a result the player can save their party and quit without having saved the PC.
@ This allows players to clone pokemon and their held items by withdrawing them (or erase them by despositing).
.ifndef BUGFIX
tower_save 0 tower_save 0
.endif
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
@ -911,7 +917,7 @@ BattleFrontier_BattleTowerLobby_EventScript_ExitRules::
end end
@ Unused @ Unused
BattleFrontier_BattleTowerLobby_EventScript_DirectYouToBattleRoom: BattleFrontier_BattleTowerLobby_Text_DirectYouToBattleRoom:
.string "I'll direct you to your BATTLE ROOM now.$" .string "I'll direct you to your BATTLE ROOM now.$"
BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting: BattleFrontier_BattleTowerLobby_Text_DidntSaveBeforeQuitting:

6
data/maps/BattleFrontier_ExchangeServiceCorner/map.json
View File

@ -138,21 +138,21 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 6, "x": 6,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6 "dest_warp_id": "6"
}, },
{ {
"x": 8, "x": 8,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 6 "dest_warp_id": "6"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge1/map.json
View File

@ -60,7 +60,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 5 "dest_warp_id": "5"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_Lounge2/map.json
View File

@ -86,14 +86,14 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 2, "x": 2,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 3 "dest_warp_id": "3"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge3/map.json
View File

@ -86,7 +86,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 9 "dest_warp_id": "9"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge4/map.json
View File

@ -60,7 +60,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 6 "dest_warp_id": "6"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_Lounge5/map.json
View File

@ -73,14 +73,14 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 7 "dest_warp_id": "7"
}, },
{ {
"x": 2, "x": 2,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 7 "dest_warp_id": "7"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge6/map.json
View File

@ -34,7 +34,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 8 "dest_warp_id": "8"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge7/map.json
View File

@ -73,7 +73,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 7 "dest_warp_id": "7"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BattleFrontier_Lounge7/scripts.inc
View File

@ -145,6 +145,7 @@ BattleFrontier_Lounge7_EventScript_ChooseRightTutorMove::
waitmessage waitmessage
special ShowBattlePointsWindow special ShowBattlePointsWindow
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special ShowScrollableMultichoice special ShowScrollableMultichoice
waitstate waitstate
@ -168,6 +169,7 @@ BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove::
message BattleFrontier_Lounge7_Text_TeachWhichMove message BattleFrontier_Lounge7_Text_TeachWhichMove
waitmessage waitmessage
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
setvar VAR_0x8004, SCROLL_MULTI_BF_MOVE_TUTOR_2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special ShowScrollableMultichoice special ShowScrollableMultichoice
waitstate waitstate

2
data/maps/BattleFrontier_Lounge8/map.json
View File

@ -60,7 +60,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 10 "dest_warp_id": "10"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_Lounge9/map.json
View File

@ -34,14 +34,14 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 11 "dest_warp_id": "11"
}, },
{ {
"x": 2, "x": 2,
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 11 "dest_warp_id": "11"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_Mart/map.json
View File

@ -73,14 +73,14 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 4, "x": 4,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [], "coord_events": [],

32
data/maps/BattleFrontier_OutsideEast/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [ "connections": [
{ {
"direction": "left", "map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"offset": 0, "offset": 0,
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST" "direction": "left"
} }
], ],
"object_events": [ "object_events": [
@ -365,98 +365,98 @@
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 39, "x": 39,
"y": 29, "y": 29,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 45, "x": 45,
"y": 56, "y": 56,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 58, "x": 58,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 35, "x": 35,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL", "dest_map": "MAP_BATTLE_FRONTIER_RANKING_HALL",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 44, "y": 44,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE1",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 10, "x": 10,
"y": 28, "y": 28,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER", "dest_map": "MAP_BATTLE_FRONTIER_EXCHANGE_SERVICE_CORNER",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 22, "x": 22,
"y": 51, "y": 51,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE5",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 5, "x": 5,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE6",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 65, "x": 65,
"y": 31, "y": 31,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE3",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 14, "x": 14,
"y": 51, "y": 51,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE8",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 21, "x": 21,
"y": 45, "y": 45,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE9",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 3, "x": 3,
"y": 51, "y": 51,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 28, "x": 28,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_1F", "dest_map": "MAP_ARTISAN_CAVE_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

26
data/maps/BattleFrontier_OutsideWest/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [ "connections": [
{ {
"direction": "right", "map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"offset": 0, "offset": 0,
"map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST" "direction": "right"
} }
], ],
"object_events": [ "object_events": [
@ -339,77 +339,77 @@
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 19, "x": 19,
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 11, "x": 11,
"y": 38, "y": 38,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY", "dest_map": "MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 45, "x": 45,
"y": 44, "y": 44,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE2",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 51, "x": 51,
"y": 51, "y": 51,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_MART", "dest_map": "MAP_BATTLE_FRONTIER_MART",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 44, "x": 44,
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE", "dest_map": "MAP_BATTLE_FRONTIER_SCOTTS_HOUSE",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 53, "x": 53,
"y": 44, "y": 44,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE4",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 5, "x": 5,
"y": 20, "y": 20,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7", "dest_map": "MAP_BATTLE_FRONTIER_LOUNGE7",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 26, "x": 26,
"y": 65, "y": 65,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 26, "x": 26,
"y": 61, "y": 61,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE", "dest_map": "MAP_BATTLE_FRONTIER_RECEPTION_GATE",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 39, "x": 39,
"y": 55, "y": 55,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ARTISAN_CAVE_B1F", "dest_map": "MAP_ARTISAN_CAVE_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/BattleFrontier_PokemonCenter_1F/map.json
View File

@ -86,21 +86,21 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 12 "dest_warp_id": "12"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 12 "dest_warp_id": "12"
}, },
{ {
"x": 1, "x": 1,
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F", "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/BattleFrontier_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F", "dest_map": "MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_UNION_ROOM", "dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 9, "x": 9,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_TRADE_CENTER", "dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_RankingHall/map.json
View File

@ -60,14 +60,14 @@
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 27, "x": 27,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_EAST",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_ReceptionGate/map.json
View File

@ -86,14 +86,14 @@
"y": 13, "y": 13,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 8 "dest_warp_id": "8"
}, },
{ {
"x": 4, "x": 4,
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 9 "dest_warp_id": "9"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/BattleFrontier_ScottsHouse/map.json
View File

@ -34,14 +34,14 @@
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 5 "dest_warp_id": "5"
}, },
{ {
"x": 3, "x": 3,
"y": 7, "y": 7,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST", "dest_map": "MAP_BATTLE_FRONTIER_OUTSIDE_WEST",
"dest_warp_id": 5 "dest_warp_id": "5"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/BirthIsland_Exterior/map.json
View File

@ -47,7 +47,7 @@
"y": 24, "y": 24,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BIRTH_ISLAND_HARBOR", "dest_map": "MAP_BIRTH_ISLAND_HARBOR",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

17
data/maps/BirthIsland_Exterior/scripts.inc
View File

@ -48,21 +48,24 @@ BirthIsland_Exterior_EventScript_Triangle::
special DoDeoxysRockInteraction special DoDeoxysRockInteraction
waitstate waitstate
switch VAR_RESULT switch VAR_RESULT
case 0, BirthIsland_Exterior_EventScript_NotSolved1 case DEOXYS_ROCK_FAILED, BirthIsland_Exterior_EventScript_Failed
case 1, BirthIsland_Exterior_EventScript_NotSolved2 case DEOXYS_ROCK_PROGRESSED, BirthIsland_Exterior_EventScript_Progressed
case 2, BirthIsland_Exterior_EventScript_Deoxys case DEOXYS_ROCK_SOLVED, BirthIsland_Exterior_EventScript_Deoxys
case 3, BirthIsland_Exterior_EventScript_NotSolved3 case DEOXYS_ROCK_COMPLETE, BirthIsland_Exterior_EventScript_Complete
end end
BirthIsland_Exterior_EventScript_NotSolved1:: @ The actual rock triangle movement is handled by DoDeoxysRockInteraction.
@ Unless the player has solved the puzzle and needs to encounter Deoxys,
@ there's nothing else the script needs to do.
BirthIsland_Exterior_EventScript_Failed::
release release
end end
BirthIsland_Exterior_EventScript_NotSolved2:: BirthIsland_Exterior_EventScript_Progressed::
release release
end end
BirthIsland_Exterior_EventScript_NotSolved3:: BirthIsland_Exterior_EventScript_Complete::
release release
end end

2
data/maps/BirthIsland_Harbor/map.json
View File

@ -47,7 +47,7 @@
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_BIRTH_ISLAND_EXTERIOR", "dest_map": "MAP_BIRTH_ISLAND_EXTERIOR",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/CaveOfOrigin_1F/map.json
View File

@ -20,14 +20,14 @@
"y": 17, "y": 17,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE", "dest_map": "MAP_CAVE_OF_ORIGIN_ENTRANCE",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 14, "x": 14,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_B1F", "dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/CaveOfOrigin_B1F/map.json
View File

@ -34,7 +34,7 @@
"y": 3, "y": 3,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F", "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/CaveOfOrigin_Entrance/map.json
View File

@ -20,14 +20,14 @@
"y": 20, "y": 20,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_SOOTOPOLIS_CITY", "dest_map": "MAP_SOOTOPOLIS_CITY",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 9, "x": 9,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F", "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
View File

@ -20,14 +20,14 @@
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_1F", "dest_map": "MAP_CAVE_OF_ORIGIN_1F",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
View File

@ -20,14 +20,14 @@
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1", "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 8, "x": 8,
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3", "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
View File

@ -20,14 +20,14 @@
"y": 14, "y": 14,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2", "dest_map": "MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 12, "x": 12,
"y": 6, "y": 6,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_CAVE_OF_ORIGIN_B1F", "dest_map": "MAP_CAVE_OF_ORIGIN_B1F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/DesertRuins/map.json
View File

@ -34,21 +34,21 @@
"y": 29, "y": 29,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_ROUTE111", "dest_map": "MAP_ROUTE111",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 8, "x": 8,
"y": 20, "y": 20,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DESERT_RUINS", "dest_map": "MAP_DESERT_RUINS",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 8, "x": 8,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_DESERT_RUINS", "dest_map": "MAP_DESERT_RUINS",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/DesertUnderpass/map.json
View File

@ -34,7 +34,7 @@
"y": 12, "y": 12,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL", "dest_map": "MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

18
data/maps/DewfordTown/map.json
View File

@ -14,14 +14,14 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [ "connections": [
{ {
"direction": "up", "map": "MAP_ROUTE106",
"offset": -60, "offset": -60,
"map": "MAP_ROUTE106" "direction": "up"
}, },
{ {
"direction": "right", "map": "MAP_ROUTE107",
"offset": 0, "offset": 0,
"map": "MAP_ROUTE107" "direction": "right"
} }
], ],
"object_events": [ "object_events": [
@ -97,35 +97,35 @@
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HALL", "dest_map": "MAP_DEWFORD_TOWN_HALL",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 2, "x": 2,
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 8, "x": 8,
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_GYM", "dest_map": "MAP_DEWFORD_TOWN_GYM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 17, "x": 17,
"y": 14, "y": 14,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HOUSE1", "dest_map": "MAP_DEWFORD_TOWN_HOUSE1",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 8, "x": 8,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN_HOUSE2", "dest_map": "MAP_DEWFORD_TOWN_HOUSE2",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/DewfordTown_Gym/map.json
View File

@ -125,14 +125,14 @@
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 6, "x": 6,
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/DewfordTown_Hall/map.json
View File

@ -138,14 +138,14 @@
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/DewfordTown_House1/map.json
View File

@ -60,14 +60,14 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 3 "dest_warp_id": "3"
}, },
{ {
"x": 4, "x": 4,
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 3 "dest_warp_id": "3"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/DewfordTown_House2/map.json
View File

@ -47,14 +47,14 @@
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 4 "dest_warp_id": "4"
}, },
{ {
"x": 4, "x": 4,
"y": 8, "y": 8,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 4 "dest_warp_id": "4"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/DewfordTown_PokemonCenter_1F/map.json
View File

@ -60,21 +60,21 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_DEWFORD_TOWN", "dest_map": "MAP_DEWFORD_TOWN",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 1, "x": 1,
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F", "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_2F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/DewfordTown_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F", "dest_map": "MAP_DEWFORD_TOWN_POKEMON_CENTER_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_UNION_ROOM", "dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 9, "x": 9,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_TRADE_CENTER", "dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

12
data/maps/EverGrandeCity/map.json
View File

@ -14,9 +14,9 @@
"battle_scene": "MAP_BATTLE_SCENE_NORMAL", "battle_scene": "MAP_BATTLE_SCENE_NORMAL",
"connections": [ "connections": [
{ {
"direction": "left", "map": "MAP_ROUTE128",
"offset": 40, "offset": 40,
"map": "MAP_ROUTE128" "direction": "left"
} }
], ],
"object_events": [], "object_events": [],
@ -26,28 +26,28 @@
"y": 5, "y": 5,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 27, "x": 27,
"y": 48, "y": 48,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 18, "x": 18,
"y": 41, "y": 41,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_VICTORY_ROAD_1F", "dest_map": "MAP_VICTORY_ROAD_1F",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 18, "x": 18,
"y": 27, "y": 27,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_VICTORY_ROAD_1F", "dest_map": "MAP_VICTORY_ROAD_1F",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [ "coord_events": [

4
data/maps/EverGrandeCity_ChampionsRoom/map.json
View File

@ -60,14 +60,14 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL4", "dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME", "dest_map": "MAP_EVER_GRANDE_CITY_HALL_OF_FAME",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/EverGrandeCity_DrakesRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL3", "dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL4", "dest_map": "MAP_EVER_GRANDE_CITY_HALL4",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/EverGrandeCity_GlaciasRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL2", "dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL3", "dest_map": "MAP_EVER_GRANDE_CITY_HALL3",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/EverGrandeCity_Hall1/map.json
View File

@ -20,28 +20,28 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/EverGrandeCity_Hall2/map.json
View File

@ -20,28 +20,28 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_PHOEBES_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/EverGrandeCity_Hall3/map.json
View File

@ -20,28 +20,28 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_GLACIAS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/EverGrandeCity_Hall4/map.json
View File

@ -20,14 +20,14 @@
"y": 33, "y": 33,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_DRAKES_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

8
data/maps/EverGrandeCity_Hall5/map.json
View File

@ -20,28 +20,28 @@
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 5, "x": 5,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 4, "x": 4,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 6, "x": 6,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
} }
], ],
"coord_events": [], "coord_events": [],

2
data/maps/EverGrandeCity_HallOfFame/map.json
View File

@ -34,7 +34,7 @@
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM", "dest_map": "MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM",
"dest_warp_id": 1 "dest_warp_id": "1"
} }
], ],
"coord_events": [], "coord_events": [],

4
data/maps/EverGrandeCity_PhoebesRoom/map.json
View File

@ -34,14 +34,14 @@
"y": 13, "y": 13,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL1", "dest_map": "MAP_EVER_GRANDE_CITY_HALL1",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL2", "dest_map": "MAP_EVER_GRANDE_CITY_HALL2",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/EverGrandeCity_PokemonCenter_1F/map.json
View File

@ -73,21 +73,21 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY", "dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 6, "x": 6,
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY", "dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 1 "dest_warp_id": "1"
}, },
{ {
"x": 1, "x": 1,
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

6
data/maps/EverGrandeCity_PokemonCenter_2F/map.json
View File

@ -73,21 +73,21 @@
"y": 6, "y": 6,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F",
"dest_warp_id": 2 "dest_warp_id": "2"
}, },
{ {
"x": 5, "x": 5,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_UNION_ROOM", "dest_map": "MAP_UNION_ROOM",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 9, "x": 9,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_TRADE_CENTER", "dest_map": "MAP_TRADE_CENTER",
"dest_warp_id": 0 "dest_warp_id": "0"
} }
], ],
"coord_events": [], "coord_events": [],

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