dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

Browse Source
This commit is contained in:
GriffinR
2023-01-18 11:07:12 -05:00
parent f4a2040843 4a9c4951ab
commit 0cc10a1ada
1149 changed files with 44393 additions and 46317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/calcrom/calcrom.pl
+12 -8
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
)) ))
@@ -112,7 +119,7 @@ my $undocumented = $undocumented_as_string + 0;
$partial_documented_as_string =~ s/^\s+|\s+$//g; $partial_documented_as_string =~ s/^\s+|\s+$//g;
my $partial_documented = $partial_documented_as_string + 0; my $partial_documented = $partial_documented_as_string + 0;
(($partial_documented != 0) or (($partial_documented == 0) and ($partial_documented_as_string eq "0"))) (($partial_documented != 0) or (($partial_documented == 0) and ($partial_documented_as_string eq "0")))
or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'"; or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
$total_syms_as_string =~ s/^\s+|\s+$//g; $total_syms_as_string =~ s/^\s+|\s+$//g;
my $total_syms = $total_syms_as_string + 0; my $total_syms = $total_syms_as_string + 0;
@@ -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);
.gitignore
+2 -1
View File
@@ -30,7 +30,8 @@ build/
.DS_Store .DS_Store
*.ddump *.ddump
.idea/ .idea/
porymap.project.cfg porymap.*.cfg
prefabs.json
.vscode/ .vscode/
*.a *.a
.fuse_hidden* .fuse_hidden*
INSTALL.md
+5 -5
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).
@@ -106,7 +106,7 @@ cd /mnt/c/Users/<user>/Desktop/decomps
> Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`. > Note 2: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "/mnt/c/users/<user>/Desktop/decomp folder"`.
> Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed > Note 3: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details> </details>
If this works, then proceed to [Installation](#installation). If this works, then proceed to [Installation](#installation).
Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)), or continue reading below for [Windows instructions using msys2](#windows-msys2).
@@ -216,7 +216,7 @@ Note that the directory **must exist** in Windows. If you want to store pokeemer
> Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`. > Note 1: If the path has spaces, then the path must be wrapped with quotations, e.g. `cd "c:/users/<user>/Desktop/decomp folder"`.
> Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed > Note 2: Windows path names are case-insensitive so adhering to capitalization isn't needed
</details> </details>
If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)). If this works, then proceed to [Installation](#installation). Otherwise, ask for help on Discord or IRC (see [README.md](README.md)).
## macOS ## macOS
@@ -539,7 +539,7 @@ devkitARM is now installed.
devkitARM is now installed. devkitARM is now installed.
### Installing devkitARM on Arch Linux ### Installing devkitARM on Arch Linux
1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages. 1. Follow [devkitPro's instructions](https://devkitpro.org/wiki/devkitPro_pacman#Customising_Existing_Pacman_Install) to configure `pacman` to download devkitPro packages.
2. Install `gba-dev`: run the following command as root. 2. Install `gba-dev`: run the following command as root.
Makefile
+2 -2
View File
@@ -254,7 +254,7 @@ tidynonmodern:
tidymodern: tidymodern:
rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME) rm -f $(MODERN_ROM_NAME) $(MODERN_ELF_NAME) $(MODERN_MAP_NAME)
rm -rf $(MODERN_OBJ_DIR_NAME) rm -rf $(MODERN_OBJ_DIR_NAME)
ifneq ($(MODERN),0) ifneq ($(MODERN),0)
$(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member $(C_BUILDDIR)/berry_crush.o: override CFLAGS += -Wno-address-of-packed-member
endif endif
@@ -410,7 +410,7 @@ 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
else else
LD_SCRIPT := ld_script_modern.txt LD_SCRIPT := ld_script_modern.txt
LD_SCRIPT_DEPS := LD_SCRIPT_DEPS :=
endif endif
$(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS) $(OBJ_DIR)/ld_script.ld: $(LD_SCRIPT) $(LD_SCRIPT_DEPS)
asm/macros/battle_ai_script.inc
+13 -13
View File
@@ -550,38 +550,38 @@
.2byte \param1 .2byte \param1
.4byte \param2 .4byte \param2
.endm .endm
@ useful script macros @ useful script macros
.macro get_curr_move_type .macro get_curr_move_type
get_type AI_TYPE_MOVE get_type AI_TYPE_MOVE
.endm .endm
.macro get_user_type1 .macro get_user_type1
get_type AI_TYPE1_USER get_type AI_TYPE1_USER
.endm .endm
.macro get_user_type2 .macro get_user_type2
get_type AI_TYPE2_USER get_type AI_TYPE2_USER
.endm .endm
.macro get_target_type1 .macro get_target_type1
get_type AI_TYPE1_TARGET get_type AI_TYPE1_TARGET
.endm .endm
.macro get_target_type2 .macro get_target_type2
get_type AI_TYPE2_TARGET get_type AI_TYPE2_TARGET
.endm .endm
.macro if_ability battler:req, ability:req, ptr:req .macro if_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability check_ability \battler, \ability
if_equal 1, \ptr if_equal 1, \ptr
.endm .endm
.macro if_no_ability battler:req, ability:req, ptr:req .macro if_no_ability battler:req, ability:req, ptr:req
check_ability \battler, \ability check_ability \battler, \ability
if_equal 0, \ptr if_equal 0, \ptr
.endm .endm
.macro if_type battler:req, type:req, ptr:req .macro if_type battler:req, type:req, ptr:req
is_of_type \battler, \type is_of_type \battler, \type
if_equal 1, \ptr if_equal 1, \ptr
@@ -591,20 +591,20 @@
is_of_type \battler, \type is_of_type \battler, \type
if_equal 0, \ptr if_equal 0, \ptr
.endm .endm
.macro if_target_faster ptr:req .macro if_target_faster ptr:req
if_user_goes 1, \ptr if_user_goes 1, \ptr
.endm .endm
.macro if_user_faster ptr:req .macro if_user_faster ptr:req
if_user_goes 0, \ptr if_user_goes 0, \ptr
.endm .endm
.macro if_double_battle ptr:req .macro if_double_battle ptr:req
is_double_battle is_double_battle
if_equal 1, \ptr if_equal 1, \ptr
.endm .endm
.macro if_not_double_battle ptr:req .macro if_not_double_battle ptr:req
is_double_battle is_double_battle
if_equal 0, \ptr if_equal 0, \ptr
@@ -613,7 +613,7 @@
.macro if_any_move_disabled battler:req, ptr:req .macro if_any_move_disabled battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 0, \ptr if_any_move_disabled_or_encored \battler, 0, \ptr
.endm .endm
.macro if_any_move_encored battler:req, ptr:req .macro if_any_move_encored battler:req, ptr:req
if_any_move_disabled_or_encored \battler, 1, \ptr if_any_move_disabled_or_encored \battler, 1, \ptr
.endm .endm
asm/macros/battle_anim_script.inc
+3 -3
View File
@@ -270,16 +270,16 @@
.macro stopsound .macro stopsound
.byte 0x2f .byte 0x2f
.endm .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
.endm .endm
.macro jumprettrue ptr:req .macro jumprettrue ptr:req
jumpreteq TRUE, \ptr jumpreteq TRUE, \ptr
.endm .endm
.macro jumpretfalse ptr:req .macro jumpretfalse ptr:req
jumpreteq FALSE, \ptr jumpreteq FALSE, \ptr
.endm .endm
asm/macros/battle_script.inc
+50 -50
View File
@@ -410,33 +410,33 @@
.byte \endMode .byte \endMode
.byte \endState .byte \endState
.endm .endm
@ Help macros for 5 uses of moveend command @ Help macros for 5 uses of moveend command
@ All cases @ All cases
.macro moveendall .macro moveendall
setbyte sMOVEEND_STATE, 0 setbyte sMOVEEND_STATE, 0
moveend 0, 0 moveend 0, 0
.endm .endm
@ Chosen case @ Chosen case
.macro moveendcase case:req .macro moveendcase case:req
setbyte sMOVEEND_STATE, \case setbyte sMOVEEND_STATE, \case
moveend 1, 0 moveend 1, 0
.endm .endm
@ All cases from (inclusive) @ All cases from (inclusive)
.macro moveendfrom from:req .macro moveendfrom from:req
setbyte sMOVEEND_STATE, \from setbyte sMOVEEND_STATE, \from
moveend 0, 0 moveend 0, 0
.endm .endm
@ All cases from 0 to (not inclusive) @ All cases from 0 to (not inclusive)
.macro moveendto to:req .macro moveendto to:req
setbyte sMOVEEND_STATE, 0 setbyte sMOVEEND_STATE, 0
moveend 2, \to moveend 2, \to
.endm .endm
@ Cases from (inclusive) to (not inclusive) @ Cases from (inclusive) to (not inclusive)
.macro moveendfromto from:req, to:req .macro moveendfromto from:req, to:req
setbyte sMOVEEND_STATE, \from setbyte sMOVEEND_STATE, \from
@@ -1252,165 +1252,165 @@
.byte 0xf8 .byte 0xf8
.byte \position .byte \position
.endm .endm
@ various command changed to more readable macros @ various command changed to more readable macros
.macro cancelmultiturnmoves battler:req .macro cancelmultiturnmoves battler:req
various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES various \battler, VARIOUS_CANCEL_MULTI_TURN_MOVES
.endm .endm
.macro setmagiccoattarget battler:req .macro setmagiccoattarget battler:req
various \battler, VARIOUS_SET_MAGIC_COAT_TARGET various \battler, VARIOUS_SET_MAGIC_COAT_TARGET
.endm .endm
.macro getifcantrunfrombattle battler:req .macro getifcantrunfrombattle battler:req
various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE various \battler, VARIOUS_IS_RUNNING_IMPOSSIBLE
.endm .endm
.macro getmovetarget battler:req .macro getmovetarget battler:req
various \battler, VARIOUS_GET_MOVE_TARGET various \battler, VARIOUS_GET_MOVE_TARGET
.endm .endm
.macro getbattlerfainted battler:req .macro getbattlerfainted battler:req
various \battler, VARIOUS_GET_BATTLER_FAINTED various \battler, VARIOUS_GET_BATTLER_FAINTED
.endm .endm
.macro resetintimidatetracebits battler:req .macro resetintimidatetracebits battler:req
various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS
.endm .endm
.macro updatechoicemoveonlvlup battler:req .macro updatechoicemoveonlvlup battler:req
various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP various \battler, VARIOUS_UPDATE_CHOICE_MOVE_ON_LVL_UP
.endm .endm
.macro resetplayerfainted .macro resetplayerfainted
various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED various BS_ATTACKER, VARIOUS_RESET_PLAYER_FAINTED
.endm .endm
.macro palaceflavortext battler:req .macro palaceflavortext battler:req
various \battler, VARIOUS_PALACE_FLAVOR_TEXT various \battler, VARIOUS_PALACE_FLAVOR_TEXT
.endm .endm
.macro arenajudgmentwindow .macro arenajudgmentwindow
various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW various BS_ATTACKER, VARIOUS_ARENA_JUDGMENT_WINDOW
.endm .endm
.macro arenaopponentmonlost .macro arenaopponentmonlost
various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST various BS_ATTACKER, VARIOUS_ARENA_OPPONENT_MON_LOST
.endm .endm
.macro arenaplayermonlost .macro arenaplayermonlost
various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST various BS_ATTACKER, VARIOUS_ARENA_PLAYER_MON_LOST
.endm .endm
.macro arenabothmonlost .macro arenabothmonlost
various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST various BS_ATTACKER, VARIOUS_ARENA_BOTH_MONS_LOST
.endm .endm
.macro forfeityesnobox battler:req .macro forfeityesnobox battler:req
various \battler, VARIOUS_EMIT_YESNOBOX various \battler, VARIOUS_EMIT_YESNOBOX
.endm .endm
.macro arenadrawreftextbox .macro arenadrawreftextbox
various BS_ATTACKER, VARIOUS_DRAW_ARENA_REF_TEXT_BOX various BS_ATTACKER, VARIOUS_DRAW_ARENA_REF_TEXT_BOX
.endm .endm
.macro arenaerasereftextbox .macro arenaerasereftextbox
various BS_ATTACKER, VARIOUS_ERASE_ARENA_REF_TEXT_BOX various BS_ATTACKER, VARIOUS_ERASE_ARENA_REF_TEXT_BOX
.endm .endm
.macro arenajudgmentstring id:req .macro arenajudgmentstring id:req
various \id, VARIOUS_ARENA_JUDGMENT_STRING various \id, VARIOUS_ARENA_JUDGMENT_STRING
.endm .endm
.macro arenawaitmessage id:req .macro arenawaitmessage id:req
various \id, VARIOUS_ARENA_WAIT_STRING various \id, VARIOUS_ARENA_WAIT_STRING
.endm .endm
.macro waitcry battler:req .macro waitcry battler:req
various \battler, VARIOUS_WAIT_CRY various \battler, VARIOUS_WAIT_CRY
.endm .endm
.macro returnopponentmon1toball battler:req .macro returnopponentmon1toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON1 various \battler, VARIOUS_RETURN_OPPONENT_MON1
.endm .endm
.macro returnopponentmon2toball battler:req .macro returnopponentmon2toball battler:req
various \battler, VARIOUS_RETURN_OPPONENT_MON2 various \battler, VARIOUS_RETURN_OPPONENT_MON2
.endm .endm
.macro volumedown .macro volumedown
various BS_ATTACKER, VARIOUS_VOLUME_DOWN various BS_ATTACKER, VARIOUS_VOLUME_DOWN
.endm .endm
.macro volumeup .macro volumeup
various BS_ATTACKER, VARIOUS_VOLUME_UP various BS_ATTACKER, VARIOUS_VOLUME_UP
.endm .endm
.macro setalreadystatusedmoveattempt battler:req .macro setalreadystatusedmoveattempt battler:req
various \battler, VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT various \battler, VARIOUS_SET_ALREADY_STATUS_MOVE_ATTEMPT
.endm .endm
.macro palacetryescapestatus battler:req .macro palacetryescapestatus battler:req
various \battler, VARIOUS_PALACE_TRY_ESCAPE_STATUS various \battler, VARIOUS_PALACE_TRY_ESCAPE_STATUS
.endm .endm
.macro setoutcomeonteleport battler:req .macro setoutcomeonteleport battler:req
various \battler, VARIOUS_SET_TELEPORT_OUTCOME various \battler, VARIOUS_SET_TELEPORT_OUTCOME
.endm .endm
.macro playtrainerdefeatbgm battler:req .macro playtrainerdefeatbgm battler:req
various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC various \battler, VARIOUS_PLAY_TRAINER_DEFEATED_MUSIC
.endm .endm
@ helpful macros @ helpful macros
.macro setstatchanger stat:req, stages:req, down:req .macro setstatchanger stat:req, stages:req, down:req
setbyte sSTATCHANGER, \stat | \stages << 4 | \down << 7 setbyte sSTATCHANGER, \stat | \stages << 4 | \down << 7
.endm .endm
.macro setmoveeffect effect:req .macro setmoveeffect effect:req
setbyte cEFFECT_CHOOSER, \effect setbyte cEFFECT_CHOOSER, \effect
.endm .endm
.macro chosenstatus1animation battler:req, status:req .macro chosenstatus1animation battler:req, status:req
chosenstatusanimation \battler, 0x0, \status chosenstatusanimation \battler, 0x0, \status
.endm .endm
.macro chosenstatus2animation battler:req, status:req .macro chosenstatus2animation battler:req, status:req
chosenstatusanimation \battler, 0x1, \status chosenstatusanimation \battler, 0x1, \status
.endm .endm
.macro sethword dst:req, value:req .macro sethword dst:req, value:req
setbyte \dst, (\value) & 0xFF setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF setbyte \dst + 1, ((\value) >> 8) & 0xFF
.endm .endm
.macro setword dst:req, value:req .macro setword dst:req, value:req
setbyte \dst, (\value) & 0xFF setbyte \dst, (\value) & 0xFF
setbyte \dst + 1, ((\value) >> 8) & 0xFF setbyte \dst + 1, ((\value) >> 8) & 0xFF
setbyte \dst + 2, ((\value) >> 16) & 0xFF setbyte \dst + 2, ((\value) >> 16) & 0xFF
setbyte \dst + 3, ((\value) >> 24) & 0xFF setbyte \dst + 3, ((\value) >> 24) & 0xFF
.endm .endm
.macro copybyte dst:req, src:req .macro copybyte dst:req, src:req
copyarray \dst, \src, 0x1 copyarray \dst, \src, 0x1
.endm .endm
.macro copyhword dst:req, src:req .macro copyhword dst:req, src:req
copyarray \dst, \src, 0x2 copyarray \dst, \src, 0x2
.endm .endm
.macro copyword dst:req, src:req .macro copyword dst:req, src:req
copyarray \dst, \src, 0x4 copyarray \dst, \src, 0x4
.endm .endm
.macro jumpifbytenotequal byte1:req, byte2:req, jumpptr:req .macro jumpifbytenotequal byte1:req, byte2:req, jumpptr:req
jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr jumpifarraynotequal \byte1, \byte2, 0x1, \jumpptr
.endm .endm
.macro jumpifbyteequal byte1:req, byte2:req, jumpptr:req .macro jumpifbyteequal byte1:req, byte2:req, jumpptr:req
jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr jumpifarrayequal \byte1, \byte2, 0x1, \jumpptr
.endm .endm
.macro jumpifmove move:req, jumpptr:req .macro jumpifmove move:req, jumpptr:req
jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr jumpifhalfword CMP_EQUAL, gCurrentMove, \move, \jumpptr
.endm .endm
@@ -1418,23 +1418,23 @@
.macro jumpifnotmove move:req, jumpptr:req .macro jumpifnotmove move:req, jumpptr:req
jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr jumpifhalfword CMP_NOT_EQUAL, gCurrentMove, \move, \jumpptr
.endm .endm
.macro jumpifstatus3 battler:req, status:req, jumpptr:req .macro jumpifstatus3 battler:req, status:req, jumpptr:req
jumpifstatus3condition \battler, \status, FALSE, \jumpptr jumpifstatus3condition \battler, \status, FALSE, \jumpptr
.endm .endm
.macro jumpifnostatus3 battler:req, status:req, jumpptr:req .macro jumpifnostatus3 battler:req, status:req, jumpptr:req
jumpifstatus3condition \battler, \status, TRUE, \jumpptr jumpifstatus3condition \battler, \status, TRUE, \jumpptr
.endm .endm
.macro jumpifmovehadnoeffect jumpptr:req .macro jumpifmovehadnoeffect jumpptr:req
jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_NO_EFFECT, \jumpptr
.endm .endm
.macro jumpifbattletype flags:req, jumpptr:req .macro jumpifbattletype flags:req, jumpptr:req
jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr jumpifword CMP_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm .endm
.macro jumpifnotbattletype flags:req, jumpptr:req .macro jumpifnotbattletype flags:req, jumpptr:req
jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr jumpifword CMP_NO_COMMON_BITS, gBattleTypeFlags, \flags, \jumpptr
.endm .endm
asm/macros/event.inc
+6 -6
View File
@@ -276,7 +276,7 @@
.2byte SPECIAL_\function .2byte SPECIAL_\function
.endm .endm
@ Blocks script execution until a command or C code manually unblocks it. Generally used with specific @ Blocks script execution until a command or C code manually unblocks it. Generally used with specific
@ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue. @ commands and specials. Calling ScriptContext_Enable for instance will allow execution to continue.
.macro waitstate .macro waitstate
.byte 0x27 .byte 0x27
@@ -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
@@ -985,7 +985,7 @@
.endm .endm
@ Gives the player a Pokémon of the specified species and level, holding the specified item. The trailing 0s are unused parameters. @ Gives the player a Pokémon of the specified species and level, holding the specified item. The trailing 0s are unused parameters.
@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome. @ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
.macro givemon species:req, level:req, item=ITEM_NONE .macro givemon species:req, level:req, item=ITEM_NONE
.byte 0x79 .byte 0x79
.2byte \species .2byte \species
@@ -997,7 +997,7 @@
.endm .endm
@ Gives the player an Egg of the specified species. @ Gives the player an Egg of the specified species.
@ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome. @ VAR_RESULT will be set to MON_GIVEN_TO_PARTY, MON_GIVEN_TO_PC, or MON_CANT_GIVE depending on the outcome.
.macro giveegg species:req .macro giveegg species:req
.byte 0x7a .byte 0x7a
.2byte \species .2byte \species
@@ -1415,7 +1415,7 @@
.2byte \out .2byte \out
.endm .endm
@ Gives 'count' coins to the player, up to a total of MAX_COINS. @ Gives 'count' coins to the player, up to a total of MAX_COINS.
@ If the player already has MAX_COINS then VAR_RESULT is set to TRUE, otherwise it is set to FALSE. @ If the player already has MAX_COINS then VAR_RESULT is set to TRUE, otherwise it is set to FALSE.
.macro addcoins count:req .macro addcoins count:req
.byte 0xb4 .byte 0xb4
@@ -1887,7 +1887,7 @@
@ Gives 'amount' of the specified 'item' to the player and prints a message with fanfare. @ Gives 'amount' of the specified 'item' to the player and prints a message with fanfare.
@ If the player doesn't have space for all the items then as many are added as possible, the @ If the player doesn't have space for all the items then as many are added as possible, the
@ message indicates there is no room, and VAR_RESULT is set to FALSE. @ message indicates there is no room, and VAR_RESULT is set to FALSE.
@ Otherwise VAR_RESULT is set to TRUE, and the message indicates they have received the item(s). @ Otherwise VAR_RESULT is set to TRUE, and the message indicates they have received the item(s).
.macro giveitem item:req, amount=1 .macro giveitem item:req, amount=1
setorcopyvar VAR_0x8000, \item setorcopyvar VAR_0x8000, \item
asm/macros/movement.inc
+2 -2
View File
@@ -152,8 +152,8 @@
create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT create_movement_action walk_slow_diag_northeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_RIGHT
create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT create_movement_action walk_slow_diag_southwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_LEFT
create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT create_movement_action walk_slow_diag_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
create_movement_action store_lock_anim, MOVEMENT_ACTION_STORE_AND_LOCK_ANIM create_movement_action lock_anim, MOVEMENT_ACTION_LOCK_ANIM
create_movement_action free_unlock_anim, MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM create_movement_action unlock_anim, MOVEMENT_ACTION_UNLOCK_ANIM
create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE create_movement_action walk_left_affine, MOVEMENT_ACTION_WALK_LEFT_AFFINE
create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE create_movement_action walk_right_affine, MOVEMENT_ACTION_WALK_RIGHT_AFFINE
create_movement_action levitate, MOVEMENT_ACTION_LEVITATE create_movement_action levitate, MOVEMENT_ACTION_LEVITATE
charmap.txt
+2 -2
View File
@@ -416,13 +416,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
data/battle_ai_scripts.s
+506 -506
View File
File diff suppressed because it is too large Load Diff
data/battle_anim_scripts.s
+10 -10
View File
@@ -798,14 +798,14 @@ Move_DOUBLE_EDGE:
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 4, -10, 0, ANIM_TARGET, 0
createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3 createsprite gSlideMonToOffsetSpriteTemplate, ANIM_ATTACKER, 2, 1, -32, 0, 0, 3
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 0
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 0
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_ATTACKER, 4, 0, 12, 1
createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1 createvisualtask AnimTask_ShakeMonInPlace, 2, ANIM_TARGET, 4, 0, 12, 1
createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE createsprite gSimplePaletteBlendSpriteTemplate, ANIM_ATTACKER, 2, F_PAL_BG, 2, 16, 0, RGB_WHITE
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 0, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_ATTACKER, 1
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, 1, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 8, -256, ANIM_TARGET, 1
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 0, 5
delay 3 delay 3
@@ -2441,7 +2441,7 @@ Move_HORN_ATTACK:
Move_FURY_ATTACK: Move_FURY_ATTACK:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
loadspritegfx ANIM_TAG_HORN_HIT loadspritegfx ANIM_TAG_HORN_HIT
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, 0, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 4, 256, ANIM_ATTACKER, 2
choosetwoturnanim FuryAttackRight, FuryAttackLeft choosetwoturnanim FuryAttackRight, FuryAttackLeft
FuryAttackContinue: FuryAttackContinue:
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 5, 0, 6, 1
@@ -2590,7 +2590,7 @@ Move_LOW_KICK:
createsprite gSlidingKickSpriteTemplate, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0 createsprite gSlidingKickSpriteTemplate, ANIM_TARGET, 2, -24, 28, 40, 8, 160, 0
delay 4 delay 4
createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2 createsprite gBasicHitSplatSpriteTemplate, ANIM_TARGET, 2, -8, 8, ANIM_TARGET, 2
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, 1, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 6, 384, ANIM_TARGET, 2
playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET playsewithpan SE_M_VITAL_THROW2, SOUND_PAN_TARGET
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4 createsprite gSlideMonToOriginalPosSpriteTemplate, ANIM_ATTACKER, 2, 0, 1, 4
@@ -2835,7 +2835,7 @@ SkullBashSetUpHeadDown:
createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, -24, 0, 0, 10, 0
playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER playsewithpan SE_M_TAKE_DOWN, SOUND_PAN_ATTACKER
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, 0, 2 createvisualtask AnimTask_RotateMonSpriteToSide, 2, 16, 96, ANIM_ATTACKER, 2
waitforvisualfinish waitforvisualfinish
createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 10, 1 createsprite gSlideMonToOffsetAndBackSpriteTemplate, ANIM_ATTACKER, 2, ANIM_ATTACKER, 24, 0, 0, 10, 1
waitforvisualfinish waitforvisualfinish
@@ -3958,7 +3958,7 @@ Move_MIST_BALL:
createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 1, 1, RGB(23, 16, 31), 16, RGB_WHITE, 16 createsprite gComplexPaletteBlendSpriteTemplate, ANIM_ATTACKER, 0, F_PAL_BG, 1, 1, RGB(23, 16, 31), 16, RGB_WHITE, 16
delay 0 delay 0
playsewithpan SE_M_HAZE, 0 playsewithpan SE_M_HAZE, 0
createvisualtask AnimTask_LoadMistTiles, 5 createvisualtask AnimTask_MistBallFog, 5
createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 16, RGB_WHITE createvisualtask AnimTask_BlendBattleAnimPal, 10, F_PAL_TARGET, 3, 0, 16, RGB_WHITE
delay 8 delay 8
createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0 createvisualtask AnimTask_ShakeMon, 2, ANIM_TARGET, 4, 0, 70, 0
@@ -8570,14 +8570,14 @@ Move_ARM_THRUST:
loadspritegfx ANIM_TAG_IMPACT loadspritegfx ANIM_TAG_IMPACT
splitbgprio ANIM_TARGET splitbgprio ANIM_TARGET
setalpha 12, 8 setalpha 12, 8
createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 0 createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 0
delay 6 delay 6
createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3 createsprite gHorizontalLungeSpriteTemplate, ANIM_ATTACKER, 2, 4, 3
delay 4 delay 4
playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET playsewithpan SE_M_SWAGGER, SOUND_PAN_TARGET
createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3 createsprite gArmThrustHandSpriteTemplate, ANIM_TARGET, 2, 10, -8, 14, 3
waitforvisualfinish waitforvisualfinish
createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, 0, 1 createvisualtask AnimTask_RotateMonSpriteToSide, 5, 8, 5, ANIM_ATTACKER, 1
playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET playsewithpan SE_M_DOUBLE_SLAP, SOUND_PAN_TARGET
choosetwoturnanim ArmThrustRight, ArmThrustLeft choosetwoturnanim ArmThrustRight, ArmThrustLeft
ArmThrustContinue: ArmThrustContinue:
data/battle_scripts_1.s
+10 -8
View File
@@ -1,6 +1,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/battle_arena.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"
@@ -14,7 +15,7 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
.align 2 .align 2
gBattleScriptsForMoveEffects:: gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectHit @ EFFECT_HIT .4byte BattleScript_EffectHit @ EFFECT_HIT
@@ -1927,8 +1928,8 @@ BattleScript_EffectTeleport::
ppreduce ppreduce
jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed jumpifbattletype BATTLE_TYPE_TRAINER, BattleScript_ButItFailed
getifcantrunfrombattle BS_ATTACKER getifcantrunfrombattle BS_ATTACKER
jumpifbyte CMP_EQUAL, gBattleCommunication, 1, BattleScript_ButItFailed jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FORBIDDEN, BattleScript_ButItFailed
jumpifbyte CMP_EQUAL, gBattleCommunication, 2, BattleScript_PrintAbilityMadeIneffective jumpifbyte CMP_EQUAL, gBattleCommunication, BATTLE_RUN_FAILURE, BattleScript_PrintAbilityMadeIneffective
attackanimation attackanimation
waitanimation waitanimation
printstring STRINGID_PKMNFLEDFROMBATTLE printstring STRINGID_PKMNFLEDFROMBATTLE
@@ -2825,7 +2826,7 @@ BattleScript_GiveExp::
setbyte sGIVEEXP_STATE, 0 setbyte sGIVEEXP_STATE, 0
getexp BS_TARGET getexp BS_TARGET
end2 end2
BattleScript_HandleFaintedMon:: BattleScript_HandleFaintedMon::
checkteamslost BattleScript_LinkHandleFaintedMonMultiple checkteamslost BattleScript_LinkHandleFaintedMonMultiple
jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd jumpifbyte CMP_NOT_EQUAL, gBattleOutcome, 0, BattleScript_FaintedMonEnd
@@ -4045,7 +4046,7 @@ BattleScript_IntimidatePrevented:
printstring STRINGID_PREVENTEDFROMWORKING printstring STRINGID_PREVENTEDFROMWORKING
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
goto BattleScript_IntimidateActivatesLoopIncrement goto BattleScript_IntimidateActivatesLoopIncrement
BattleScript_DroughtActivates:: BattleScript_DroughtActivates::
pause B_WAIT_TIME_SHORT pause B_WAIT_TIME_SHORT
printstring STRINGID_PKMNSXINTENSIFIEDSUN printstring STRINGID_PKMNSXINTENSIFIEDSUN
@@ -4482,7 +4483,7 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_THATS_IT arenajudgmentstring B_MSG_REF_THATS_IT
arenawaitmessage B_MSG_REF_THATS_IT arenawaitmessage B_MSG_REF_THATS_IT
pause B_WAIT_TIME_LONG pause B_WAIT_TIME_LONG
setbyte gBattleCommunication, 0 setbyte gBattleCommunication, 0 @ Reset state for arenajudgmentwindow
arenajudgmentwindow arenajudgmentwindow
pause B_WAIT_TIME_LONG pause B_WAIT_TIME_LONG
arenajudgmentwindow arenajudgmentwindow
@@ -4495,8 +4496,9 @@ BattleScript_ArenaDoJudgment::
arenajudgmentstring B_MSG_REF_JUDGE_BODY arenajudgmentstring B_MSG_REF_JUDGE_BODY
arenawaitmessage B_MSG_REF_JUDGE_BODY arenawaitmessage B_MSG_REF_JUDGE_BODY
arenajudgmentwindow arenajudgmentwindow
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 3, BattleScript_ArenaJudgmentPlayerLoses jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_PLAYER_LOST, BattleScript_ArenaJudgmentPlayerLoses
jumpifbyte CMP_EQUAL, gBattleCommunication + 1, 4, BattleScript_ArenaJudgmentDraw jumpifbyte CMP_EQUAL, gBattleCommunication + 1, ARENA_RESULT_TIE, BattleScript_ArenaJudgmentDraw
@ ARENA_RESULT_PLAYER_WON
arenajudgmentstring B_MSG_REF_PLAYER_WON arenajudgmentstring B_MSG_REF_PLAYER_WON
arenawaitmessage B_MSG_REF_PLAYER_WON arenawaitmessage B_MSG_REF_PLAYER_WON
arenajudgmentwindow arenajudgmentwindow
data/contest_ai_scripts.s
+18 -2
View File
@@ -435,11 +435,15 @@ AI_CGM_BetterWhenAudienceExcited:
AI_CGM_BetterWhenAudienceExcited_1stUp: AI_CGM_BetterWhenAudienceExcited_1stUp:
@ BUG: Should be if_appeal_num_eq 0 @ BUG: Should be if_appeal_num_eq 0
@ 1st up on 1st appeal excitement will always be 0 @ 1st up on 1st appeal excitement will always be 0
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_Not1stAppeal .ifdef BUGFIX
if_appeal_num_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.else
if_appeal_num_not_eq 0, AI_CGM_BetterWhenAudienceExcited_1stAppeal
.endif
if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax if_excitement_eq 4, AI_CGM_BetterWhenAudienceExcited_1AwayFromMax
if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax if_excitement_eq 3, AI_CGM_BetterWhenAudienceExcited_2AwayFromMax
end end
AI_CGM_BetterWhenAudienceExcited_Not1stAppeal: AI_CGM_BetterWhenAudienceExcited_1stAppeal:
if_random_less_than 125, AI_CGM_End if_random_less_than 125, AI_CGM_End
score -15 score -15
end end
@@ -542,7 +546,11 @@ AI_CGM_TargetMonWithJudgesAttention:
end end
AI_CGM_TargetMonWithJudgesAttention_CheckMon1: AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_cannot_participate MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.ifdef BUGFIX
if_not_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.else
if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_used_combo_starter MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
score +2 score +2
if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2 if_not_completed_combo MON_1, AI_CGM_TargetMonWithJudgesAttention_CheckMon2
@@ -551,7 +559,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon1:
AI_CGM_TargetMonWithJudgesAttention_CheckMon2: AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
if_user_order_eq MON_2, AI_CGM_End if_user_order_eq MON_2, AI_CGM_End
if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_cannot_participate MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.ifdef BUGFIX
if_not_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.else
if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_used_combo_starter MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
.endif
if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_random_less_than 125, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
score +2 score +2
if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3 if_not_completed_combo MON_2, AI_CGM_TargetMonWithJudgesAttention_CheckMon3
@@ -560,7 +572,11 @@ AI_CGM_TargetMonWithJudgesAttention_CheckMon2:
AI_CGM_TargetMonWithJudgesAttention_CheckMon3: AI_CGM_TargetMonWithJudgesAttention_CheckMon3:
if_user_order_eq MON_3, AI_CGM_End if_user_order_eq MON_3, AI_CGM_End
if_cannot_participate MON_3, AI_CGM_End if_cannot_participate MON_3, AI_CGM_End
.ifdef BUGFIX
if_not_used_combo_starter MON_3, AI_CGM_End
.else
if_used_combo_starter MON_3, AI_CGM_End if_used_combo_starter MON_3, AI_CGM_End
.endif
if_random_less_than 125, AI_CGM_End if_random_less_than 125, AI_CGM_End
score +2 score +2
if_not_completed_combo MON_3, AI_CGM_End if_not_completed_combo MON_3, AI_CGM_End
data/maps/AbandonedShip_CaptainsOffice/map.json
+2 -2
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": [],
data/maps/AbandonedShip_Corridors_1F/map.json
+12 -12
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": [],
data/maps/AbandonedShip_Corridors_B1F/map.json
+8 -8
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": [],
data/maps/AbandonedShip_Deck/map.json
+5 -5
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": [],
data/maps/AbandonedShip_HiddenFloorCorridors/map.json
+6 -6
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": [],
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+10 -10
View File
@@ -51,7 +51,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18", "script": "AbandonedShip_HiddenFloorRooms_EventScript_ItemTM18",
"flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18" "flag": "FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM18"
}, },
{ {
"graphics_id": "OBJ_EVENT_GFX_ITEM_BALL", "graphics_id": "OBJ_EVENT_GFX_ITEM_BALL",
@@ -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": [],
data/maps/AbandonedShip_Room_B1F/map.json
+3 -3
View File
@@ -25,7 +25,7 @@
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "AbandonedShip_Room_B1F_EventScript_ItemTM13", "script": "AbandonedShip_Room_B1F_EventScript_ItemTM13",
"flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13" "flag": "FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM13"
} }
], ],
"warp_events": [ "warp_events": [
@@ -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": [],
data/maps/AbandonedShip_Rooms2_1F/map.json
+3 -3
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": [],
data/maps/AbandonedShip_Rooms2_B1F/map.json
+4 -4
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": [],
data/maps/AbandonedShip_Rooms_1F/map.json
+6 -6
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": [],
data/maps/AbandonedShip_Rooms_B1F/map.json
+3 -3
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": [],
data/maps/AbandonedShip_Underwater1/map.json
+2 -2
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": [],
data/maps/AbandonedShip_Underwater2/map.json
+1 -1
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": [],
data/maps/AlteringCave/map.json
+1 -1
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": [],
data/maps/AncientTomb/map.json
+3 -3
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": [],
data/maps/AquaHideout_1F/map.json
+3 -3
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": [],
data/maps/AquaHideout_B1F/map.json
+25 -25
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": [],
data/maps/AquaHideout_B2F/map.json
+10 -10
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": [
data/maps/ArtisanCave_1F/map.json
+2 -2
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": [],
data/maps/ArtisanCave_B1F/map.json
+2 -2
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": [],
data/maps/BattleColosseum_2P/map.json
+4 -4
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": [
data/maps/BattleColosseum_4P/map.json
+8 -8
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": [
data/maps/BattleFrontier_BattleArenaLobby/map.json
+1 -1
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": [],
data/maps/BattleFrontier_BattleDomeCorridor/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattleDomeLobby/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattleDomePreBattleRoom/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattleFactoryLobby/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattlePalaceBattleRoom/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattlePalaceCorridor/map.json
+4 -4
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": [],
data/maps/BattleFrontier_BattlePalaceLobby/map.json
+3 -3
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": [],
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+2 -2
View File
@@ -472,8 +472,8 @@ BattleFrontier_BattlePalaceLobby_Text_FeatWillBeRecorded:
@ Unused @ Unused
BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak: BattleFrontier_BattlePalaceLobby_Text_BattlePointsFor7WinStreak:
.string "For the feat of your 7-win streak,\n" .string "For the feat of your 7-win streak,\n"
.string "we present you with Battle Point(s).$" .string "we present you with Battle Point(s).$"
BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize: BattleFrontier_BattlePalaceLobby_Text_NoSpaceForPrize:
.string "You seem to have no space for\n" .string "You seem to have no space for\n"
data/maps/BattleFrontier_BattlePikeLobby/map.json
+3 -3
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": [],
data/maps/BattleFrontier_BattlePyramidLobby/map.json
+1 -1
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": [],
data/maps/BattleFrontier_BattleTowerBattleRoom/map.json
+2 -2
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": [],
data/maps/BattleFrontier_BattleTowerLobby/map.json
+3 -3
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": [],
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+7 -1
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:
data/maps/BattleFrontier_ExchangeServiceCorner/map.json
+3 -3
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": [],
data/maps/BattleFrontier_Lounge1/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge2/map.json
+2 -2
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": [],
data/maps/BattleFrontier_Lounge3/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge4/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge5/map.json
+2 -2
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": [],
data/maps/BattleFrontier_Lounge6/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge7/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge8/map.json
+1 -1
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": [],
data/maps/BattleFrontier_Lounge9/map.json
+2 -2
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": [],
data/maps/BattleFrontier_Mart/map.json
+2 -2
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": [],
data/maps/BattleFrontier_OutsideEast/map.json
+16 -16
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": [],
data/maps/BattleFrontier_OutsideWest/map.json
+13 -13
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": [],
data/maps/BattleFrontier_PokemonCenter_1F/map.json
+3 -3
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": [],
data/maps/BattleFrontier_PokemonCenter_2F/map.json
+3 -3
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": [],
data/maps/BattleFrontier_RankingHall/map.json
+2 -2
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": [],
data/maps/BattleFrontier_ReceptionGate/map.json
+2 -2
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": [],
data/maps/BattleFrontier_ScottsHouse/map.json
+2 -2
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": [],
data/maps/BirthIsland_Exterior/map.json
+1 -1
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": [],
data/maps/BirthIsland_Harbor/map.json
+1 -1
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": [],
data/maps/CaveOfOrigin_1F/map.json
+2 -2
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": [],
data/maps/CaveOfOrigin_B1F/map.json
+1 -1
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": [],
data/maps/CaveOfOrigin_Entrance/map.json
+2 -2
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": [],
data/maps/CaveOfOrigin_UnusedRubySapphireMap1/map.json
+2 -2
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": [],
data/maps/CaveOfOrigin_UnusedRubySapphireMap2/map.json
+2 -2
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": [],
data/maps/CaveOfOrigin_UnusedRubySapphireMap3/map.json
+2 -2
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": [],
data/maps/DesertRuins/map.json
+3 -3
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": [],
data/maps/DesertUnderpass/map.json
+1 -1
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": [],
data/maps/DewfordTown/map.json
+9 -9
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": [],
data/maps/DewfordTown_Gym/map.json
+2 -2
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": [],
data/maps/DewfordTown_Hall/map.json
+2 -2
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": [],
data/maps/DewfordTown_House1/map.json
+2 -2
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": [],
data/maps/DewfordTown_House2/map.json
+2 -2
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": [],
data/maps/DewfordTown_PokemonCenter_1F/map.json
+3 -3
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": [],
data/maps/DewfordTown_PokemonCenter_2F/map.json
+3 -3
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": [],
data/maps/EverGrandeCity/map.json
+6 -6
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": [
data/maps/EverGrandeCity_ChampionsRoom/map.json
+2 -2
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": [],
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+2 -2
View File
@@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_EnterRoom::
waitmovement 0 waitmovement 0
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
goto EverGrandeCity_ChampionsRoom_EventScript_Wallace goto EverGrandeCity_ChampionsRoom_EventScript_Wallace
releaseall releaseall
end end
EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace: EverGrandeCity_ChampionsRoom_Movement_PlayerApproachWallace:
walk_up walk_up
data/maps/EverGrandeCity_DrakesRoom/map.json
+2 -2
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": [],
data/maps/EverGrandeCity_GlaciasRoom/map.json
+2 -2
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": [],
data/maps/EverGrandeCity_Hall1/map.json
+4 -4
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": [],
data/maps/EverGrandeCity_Hall2/map.json
+4 -4
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": [],
data/maps/EverGrandeCity_Hall3/map.json
+4 -4
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": [],
data/maps/EverGrandeCity_Hall4/map.json
+2 -2
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": [],
data/maps/EverGrandeCity_Hall5/map.json
+4 -4
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": [],
data/maps/EverGrandeCity_HallOfFame/map.json
+1 -1
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": [],
data/maps/EverGrandeCity_PhoebesRoom/map.json
+2 -2
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": [],
data/maps/EverGrandeCity_PokemonCenter_1F/map.json
+3 -3
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": [],
data/maps/EverGrandeCity_PokemonCenter_2F/map.json
+3 -3
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": [],
data/maps/EverGrandeCity_PokemonLeague_1F/map.json
+5 -5
View File
@@ -73,35 +73,35 @@
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY", "dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 10, "x": 10,
"y": 11, "y": 11,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY", "dest_map": "MAP_EVER_GRANDE_CITY",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 9, "x": 9,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL5", "dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 10, "x": 10,
"y": 1, "y": 1,
"elevation": 3, "elevation": 3,
"dest_map": "MAP_EVER_GRANDE_CITY_HALL5", "dest_map": "MAP_EVER_GRANDE_CITY_HALL5",
"dest_warp_id": 0 "dest_warp_id": "0"
}, },
{ {
"x": 1, "x": 1,
"y": 7, "y": 7,
"elevation": 4, "elevation": 4,
"dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F", "dest_map": "MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F",
"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