Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2000 from ultima-soul/master_sync

Browse Source 
Master Upstream Sync
This commit is contained in:
Eduardo Quezada D'Ottone authored and GitHub committed 2021-12-18 11:00:50 -03:00
2 parents a9e9837b25 18afd06f6d
commit bc43b5c650
2040 files changed
+99679 -89108
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/calcrom/calcrom.pl
+22 -17
View File
@@ -1,9 +1,15 @@
#!/usr/bin/perl #!/usr/bin/perl
use IPC::Cmd qw[ run ]; use IPC::Cmd qw[ run ];
use Getopt::Long;
my $usage = "Usage: calcrom.pl file.map [--data]\n";
my $showData;
GetOptions("data" => \$showData) or die $usage;
(@ARGV == 1) (@ARGV == 1)
or die "ERROR: no map file specified.\n"; or die $usage;
open(my $file, $ARGV[0]) open(my $file, $ARGV[0])
or die "ERROR: could not open file '$ARGV[0]'.\n"; or die "ERROR: could not open file '$ARGV[0]'.\n";
@@ -57,14 +63,14 @@ while (my $line = <$file>)
# though. Uniq is pretty fast! # though. Uniq is pretty fast!
my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq"; my $base_cmd = "nm $elffname | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. 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]*\\|sub_[0-9a-fA-F]*'"; my $undoc_cmd = "grep '[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,6\\}'"; my $partial_doc_cmd = "grep '_[0-28][0-9a-fA-F]\\{5,7\\}'";
my $count_cmd = "wc -l"; my $count_cmd = "wc -l";
@@ -98,16 +104,19 @@ my $partial_documented_as_string;
# Performing addition on a string converts it to a number. Any string that fails # Performing addition on a string converts it to a number. Any string that fails
# to convert to a number becomes 0. So if our converted number is 0, but our string # to convert to a number becomes 0. So if our converted number is 0, but our string
# is nonzero, then the conversion was an error. # is nonzero, then the conversion was an error.
$undocumented_as_string =~ s/^\s+|\s+$//g;
my $undocumented = $undocumented_as_string + 0; my $undocumented = $undocumented_as_string + 0;
(($undocumented != 0) and ($undocumented_as_string ne "0")) (($undocumented != 0) or (($undocumented == 0) and ($undocumented_as_string eq "0")))
or die "ERROR: Cannot convert string to num: '$undocumented_as_string'"; or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
$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) and ($partial_documented_as_string ne "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;
my $total_syms = $total_syms_as_string + 0; my $total_syms = $total_syms_as_string + 0;
(($total_syms != 0) and ($total_syms_as_string ne "0")) (($total_syms != 0) or (($total_syms == 0) and ($total_syms_as_string eq "0")))
or die "ERROR: Cannot convert string to num: '$total_syms_as_string'"; or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
($total_syms != 0) ($total_syms != 0)
@@ -149,17 +158,13 @@ else
print "$undocumented symbols undocumented ($undocPct%)\n"; print "$undocumented symbols undocumented ($undocPct%)\n";
} }
print "\n"; if ($showData)
my $dataTotal = $srcdata + $data; {
my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal); print "\n";
my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal); my $dataTotal = $srcdata + $data;
my $srcDataPct = sprintf("%.4f", 100 * $srcdata / $dataTotal);
my $dataPct = sprintf("%.4f", 100 * $data / $dataTotal);
if ($data == 0)
{
print "Data porting to C is 100% complete\n"
}
else
{
print "$dataTotal total bytes of data\n"; print "$dataTotal total bytes of data\n";
print "$srcdata bytes of data in src ($srcDataPct%)\n"; print "$srcdata bytes of data in src ($srcDataPct%)\n";
print "$data bytes of data in data ($dataPct%)\n"; print "$data bytes of data in data ($dataPct%)\n";
.github/calcrom/webhook.sh
+1 -1
View File
@@ -8,4 +8,4 @@ if [ ! -f $map_file ]; then
fi fi
output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g') output=$(perl $(dirname "$0")/calcrom.pl $build_name.map | sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g')
curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`$build_name progress:\\n$output\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL" curl -d "{\"username\": \"$CALCROM_DISCORD_WEBHOOK_USERNAME\", \"avatar_url\": \"$CALCROM_DISCORD_WEBHOOK_AVATAR_URL\", \"content\":\"\`\`\`\\n$build_name progress:\\n$output\\n\`\`\`\"}" -H "Content-Type: application/json" -X POST "$CALCROM_DISCORD_WEBHOOK_URL"
.gitignore
+2
View File
@@ -34,3 +34,5 @@ porymap.project.cfg
*.a *.a
.fuse_hidden* .fuse_hidden*
*.sna *.sna
*.diff
*.sym
README.md
+1 -1
View File
@@ -28,4 +28,4 @@ Other disassembly and/or decompilation projects:
## Contacts ## Contacts
You can find us on [Discord](https://discord.gg/d5dubZ3) and [IRC](https://kiwiirc.com/client/irc.freenode.net/?#pret). You can find us on [Discord](https://discord.gg/d5dubZ3) and [IRC](https://web.libera.chat/?#pret).
asm/macros/battle_ai_script.inc
+6 -6
View File
@@ -251,11 +251,11 @@
.4byte \ptr .4byte \ptr
.endm .endm
.macro nullsub_2A .macro nop_2A
.byte 0x2a .byte 0x2a
.endm .endm
.macro nullsub_2B .macro nop_2B
.byte 0x2b .byte 0x2b
.endm .endm
@@ -287,11 +287,11 @@
.4byte \param1 .4byte \param1
.endm .endm
.macro nullsub_32 .macro nop_32
.byte 0x32 .byte 0x32
.endm .endm
.macro nullsub_33 .macro nop_33
.byte 0x33 .byte 0x33
.endm .endm
@@ -490,12 +490,12 @@
.endm .endm
.macro call_if_move_flag flag ptr .macro call_if_move_flag flag ptr
.byte 0x52 .byte 0x56
.4byte \flag .4byte \flag
.4byte \ptr .4byte \ptr
.endm .endm
.macro nullsub_57 .macro nop_57
.byte 0x57 .byte 0x57
.endm .endm
asm/macros/battle_anim_script.inc
+46 -46
View File
@@ -14,7 +14,7 @@
.byte 0x02 .byte 0x02
.4byte \template .4byte \template
.if \anim_battler == ANIM_TARGET .if \anim_battler == ANIM_TARGET
.byte 0x80 | (\subpriority_offset & 0x7F) .byte ANIMSPRITE_IS_TARGET | (\subpriority_offset & 0x7F)
.else .else
.byte (\subpriority_offset & 0x7F) .byte (\subpriority_offset & 0x7F)
.endif .endif
@@ -34,20 +34,20 @@
.Lcreatetask_\@_2: .Lcreatetask_\@_2:
.endm .endm
.macro delay param0:req .macro delay frames:req
.byte 0x4 .byte 0x4
.byte \param0 .byte \frames
.endm .endm
.macro waitforvisualfinish .macro waitforvisualfinish
.byte 0x5 .byte 0x5
.endm .endm
.macro hang1 .macro nop
.byte 0x6 .byte 0x6
.endm .endm
.macro hang2 .macro nop2
.byte 0x7 .byte 0x7
.endm .endm
@@ -79,30 +79,30 @@
.byte 0xd .byte 0xd
.endm .endm
.macro call param0:req .macro call ptr:req
.byte 0xe .byte 0xe
.4byte \param0 .4byte \ptr
.endm .endm
.macro return .macro return
.byte 0xf .byte 0xf
.endm .endm
.macro setarg param0:req, param1:req .macro setarg argId:req, value:req
.byte 0x10 .byte 0x10
.byte \param0 .byte \argId
.2byte \param1 .2byte \value
.endm .endm
.macro choosetwoturnanim param0:req, param1:req .macro choosetwoturnanim ptr1:req, ptr2:req
.byte 0x11 .byte 0x11
.4byte \param0 .4byte \ptr1
.4byte \param1 .4byte \ptr2
.endm .endm
.macro jumpifmoveturn param0:req, ptr:req .macro jumpifmoveturn value:req, ptr:req
.byte 0x12 .byte 0x12
.byte \param0 .byte \value
.4byte \ptr .4byte \ptr
.endm .endm
@@ -144,13 +144,13 @@
.byte \pan .byte \pan
.endm .endm
.macro panse_1B se:req, param1:req, param2:req, param3:req, param4:req .macro panse se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x1b .byte 0x1b
.2byte \se .2byte \se
.byte \param1 .byte \currentPan
.byte \param2 .byte \targetPan
.byte \param3 .byte \incrementPan
.byte \param4 .byte \delay
.endm .endm
.macro loopsewithpan se:req, pan:req, wait:req, times:req .macro loopsewithpan se:req, pan:req, wait:req, times:req
@@ -168,9 +168,9 @@
.byte \wait .byte \wait
.endm .endm
.macro setbldcnt param0:req .macro setbldcnt bldcnt:req
.byte 0x1e .byte 0x1e
.2byte \param0 .2byte \bldcnt
.endm .endm
.macro createsoundtask addr:req, argv:vararg .macro createsoundtask addr:req, argv:vararg
@@ -186,19 +186,19 @@
.byte 0x20 .byte 0x20
.endm .endm
.macro jumpargeq param0:req, param1:req, ptr:req .macro jumpargeq argId:req, value:req, ptr:req
.byte 0x21 .byte 0x21
.byte \param0 .byte \argId
.2byte \param1 .2byte \value
.4byte \ptr .4byte \ptr
.endm .endm
.macro monbg_22 battler:req .macro monbg_static battler:req
.byte 0x22 .byte 0x22
.byte \battler .byte \battler
.endm .endm
.macro clearmonbg_23 battler:req .macro clearmonbg_static battler:req
.byte 0x23 .byte 0x23
.byte \battler .byte \battler
.endm .endm
@@ -208,41 +208,41 @@
.4byte \ptr .4byte \ptr
.endm .endm
.macro fadetobgfromset param0:req, param1:req, param2:req .macro fadetobgfromset bgOpponent:req, bgPlayer:req, bgContest:req
.byte 0x25 .byte 0x25
.byte \param0 .byte \bgOpponent
.byte \param1 .byte \bgPlayer
.byte \param2 .byte \bgContest
.endm .endm
.macro panse_26 se:req, param1:req, param2:req, param3:req, param4:req .macro panse_adjustnone se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x26 .byte 0x26
.2byte \se .2byte \se
.byte \param1 .byte \currentPan
.byte \param2 .byte \targetPan
.byte \param3 .byte \incrementPan
.byte \param4 .byte \delay
.endm .endm
.macro panse_27 se:req, param1:req, param2:req, param3:req, param4:req .macro panse_adjustall se:req, currentPan:req, targetPan:req, incrementPan:req, delay:req
.byte 0x27 .byte 0x27
.2byte \se .2byte \se
.byte \param1 .byte \currentPan
.byte \param2 .byte \targetPan
.byte \param3 .byte \incrementPan
.byte \param4 .byte \delay
.endm .endm
.macro monbgprio_28 battler:req .macro splitbgprio battler:req
.byte 0x28 .byte 0x28
.byte \battler .byte \battler
.endm .endm
.macro monbgprio_29 .macro splitbgprio_all
.byte 0x29 .byte 0x29
.endm .endm
.macro monbgprio_2A battler:req .macro splitbgprio_foes battler:req
.byte 0x2a .byte 0x2a
.byte \battler .byte \battler
.endm .endm
@@ -257,12 +257,12 @@
.byte \battler .byte \battler
.endm .endm
.macro doublebattle_2D battler:req .macro teamattack_moveback battler:req
.byte 0x2d .byte 0x2d
.byte \battler .byte \battler
.endm .endm
.macro doublebattle_2E battler:req .macro teamattack_movefwd battler:req
.byte 0x2e .byte 0x2e
.byte \battler .byte \battler
.endm .endm
asm/macros/battle_frontier/apprentice.inc
+15 -7
View File
@@ -53,7 +53,7 @@
special CallApprenticeFunction special CallApprenticeFunction
.endm .endm
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
.macro apprentice_shouldcheckgone .macro apprentice_shouldcheckgone
setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE setvar VAR_0x8004, APPRENTICE_FUNC_CHECK_GONE
special CallApprenticeFunction special CallApprenticeFunction
@@ -94,11 +94,19 @@
@ Buffer some APPRENTICE_BUFF_* string to the given stringvar (0 for STR_VAR_1, 1 for STR_VAR_2, 2 for STR_VAR_3) @ Buffer some APPRENTICE_BUFF_* string to the given stringvar (0 for STR_VAR_1, 1 for STR_VAR_2, 2 for STR_VAR_3)
.macro apprentice_buff stringvar:req, tobuff:req .macro apprentice_buff stringvar:req, tobuff:req
setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING setvar VAR_0x8004, APPRENTICE_FUNC_BUFFER_STRING
setvar VAR_0x8005, \stringvar .if \stringvar == STR_VAR_1
.if \tobuff >= VARS_START setvar VAR_0x8005, 0
copyvar VAR_0x8006, \tobuff .elseif \stringvar == STR_VAR_2
setvar VAR_0x8005, 1
.elseif \stringvar == STR_VAR_3
setvar VAR_0x8005, 2
.else .else
setvar VAR_0x8006, \tobuff setvar VAR_0x8005, \stringvar
.endif
.if \tobuff >= VARS_START
copyvar VAR_0x8006, \tobuff
.else
setvar VAR_0x8006, \tobuff
.endif .endif
special CallApprenticeFunction special CallApprenticeFunction
.endm .endm
@@ -109,7 +117,7 @@
special CallApprenticeFunction special CallApprenticeFunction
.endm .endm
@ Set which mon the Apprentice should lead with @ Set which mon the Apprentice should lead with
.macro apprentice_setleadmon monId:req .macro apprentice_setleadmon monId:req
copyvar VAR_0x8005, \monId copyvar VAR_0x8005, \monId
setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON setvar VAR_0x8004, APPRENTICE_FUNC_SET_LEAD_MON
@@ -141,7 +149,7 @@
special CallApprenticeFunction special CallApprenticeFunction
.endm .endm
@ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason @ Always returns TRUE. No side effect. May have been for debug or dummied for some other reason
.macro apprentice_shouldleave .macro apprentice_shouldleave
setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE setvar VAR_0x8004, APPRENTICE_FUNC_SHOULD_LEAVE
special CallApprenticeFunction special CallApprenticeFunction
asm/macros/battle_frontier/battle_factory.inc
+1 -1
View File
@@ -88,7 +88,7 @@
.endm .endm
@ Return the FACTORY_STYLE_* dependent on what types of moves the opponents team has, or FACTORY_NUM_STYLES if multiple styles tie for the same amount of moves @ Return the FACTORY_STYLE_* dependent on what types of moves the opponents team has, or FACTORY_NUM_STYLES if multiple styles tie for the same amount of moves
.macro factory_getopponentstyle .macro factory_getopponentstyle
setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE setvar VAR_0x8004, BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE
special CallBattleFactoryFunction special CallBattleFactoryFunction
.endm .endm
asm/macros/battle_frontier/battle_palace.inc
+1 -1
View File
@@ -31,7 +31,7 @@
special CallBattlePalaceFunction special CallBattlePalaceFunction
.endm .endm
@ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory @ Buffer the opponents intro speech to gStringVar4. Also used by Battle Arena and Factory
.macro palace_getopponentintro .macro palace_getopponentintro
setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO setvar VAR_0x8004, BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO
special CallBattlePalaceFunction special CallBattlePalaceFunction
asm/macros/battle_frontier/battle_pyramid.inc
+6 -6
View File
@@ -1,7 +1,7 @@
@ Initialize the Battle Pyramid challenge @ Initialize the Battle Pyramid challenge
.macro pyramid_init .macro pyramid_init
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ Get the value of some PYRAMID_DATA_*. See GetBattlePyramidData for the data types that can be retrieved @ Get the value of some PYRAMID_DATA_*. See GetBattlePyramidData for the data types that can be retrieved
@@ -59,7 +59,7 @@
@ Set the facility trainers to gBattleFrontierTrainers @ Set the facility trainers to gBattleFrontierTrainers
.macro pyramid_settrainers .macro pyramid_settrainers
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_TRAINERS setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_TRAINERS
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ Show the post-battle hint text @ Show the post-battle hint text
@@ -68,11 +68,11 @@
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise @ VAR_RESULT is 1 if player is on a Pyramid floor, 2 if on the Pyramid peak, 0 otherwise
.macro pyramid_inchallenge .macro pyramid_inchallenge
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ Update the light around the player. 2 different modes, for setting or incrementing light. See PYRAMID_LIGHT_* @ Update the light around the player. 2 different modes, for setting or incrementing light. See PYRAMID_LIGHT_*
.macro pyramid_updatelight radius:req, mode:req, sound=0xFFFF .macro pyramid_updatelight radius:req, mode:req, sound=0xFFFF
@@ -83,7 +83,7 @@
setvar VAR_0x8007, \sound setvar VAR_0x8007, \sound
.endif .endif
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
@ Reset the held items to what they were at the start of the challenge @ Reset the held items to what they were at the start of the challenge
.macro pyramid_clearhelditems .macro pyramid_clearhelditems
@@ -100,5 +100,5 @@
@ Reset sketched moves and update the party order in the saveblock @ Reset sketched moves and update the party order in the saveblock
.macro pyramid_resetparty .macro pyramid_resetparty
setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction special CallBattlePyramidFunction
.endm .endm
asm/macros/battle_frontier/frontier_util.inc
+7 -1
View File
@@ -136,7 +136,13 @@
@ Buffer the name of gTrainerBattleOpponent_A in STR_VAR_1 (0) or STR_VAR_2 (1) @ Buffer the name of gTrainerBattleOpponent_A in STR_VAR_1 (0) or STR_VAR_2 (1)
.macro frontier_gettrainername stringVar:req .macro frontier_gettrainername stringVar:req
setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME setvar VAR_0x8004, FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME
setvar VAR_0x8005, \stringVar .if \stringVar == STR_VAR_1
setvar VAR_0x8005, 0
.elseif \stringVar == STR_VAR_2
setvar VAR_0x8005, 1
.else
setvar VAR_0x8005, \stringVar
.endif
special CallFrontierUtilFunc special CallFrontierUtilFunc
.endm .endm
asm/macros/battle_script.inc
+404 -237
View File
File diff suppressed because it is too large. Load diff
asm/macros/battle_tent.inc
+9 -9
View File
@@ -26,7 +26,7 @@
special CallVerdanturfTentFunction special CallVerdanturfTentFunction
.endm .endm
@ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents. @ Buffers the opponents intro speech to STR_VAR_4. Despite being a Verdanturf Tent function, it serves the same purpose for all 3 tents.
.macro battletent_getopponentintro .macro battletent_getopponentintro
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO
special CallVerdanturfTentFunction special CallVerdanturfTentFunction
@@ -36,7 +36,7 @@
.macro verdanturftent_save challengeStatus:req .macro verdanturftent_save challengeStatus:req
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SAVE setvar VAR_0x8004, VERDANTURF_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus setvar VAR_0x8005, \challengeStatus
special CallVerdanturfTentFunction special CallVerdanturfTentFunction
.endm .endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item @ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
@@ -49,7 +49,7 @@
.macro verdanturftent_giveprize .macro verdanturftent_giveprize
setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GIVE_PRIZE setvar VAR_0x8004, VERDANTURF_TENT_FUNC_GIVE_PRIZE
special CallVerdanturfTentFunction special CallVerdanturfTentFunction
.endm .endm
@ Fallarbor Tent @ Fallarbor Tent
@@ -79,7 +79,7 @@
setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SAVE setvar VAR_0x8004, FALLARBOR_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus setvar VAR_0x8005, \challengeStatus
special CallFallarborTentFunction special CallFallarborTentFunction
.endm .endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item @ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
.macro fallarbortent_setrandomprize .macro fallarbortent_setrandomprize
@@ -97,7 +97,7 @@
.macro fallarbortent_getopponentname .macro fallarbortent_getopponentname
setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME setvar VAR_0x8004, FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME
special CallFallarborTentFunction special CallFallarborTentFunction
.endm .endm
@ Slateport Tent @ Slateport Tent
@@ -127,15 +127,15 @@
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SAVE setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SAVE
setvar VAR_0x8005, \challengeStatus setvar VAR_0x8005, \challengeStatus
special CallSlateportTentFunction special CallSlateportTentFunction
.endm .endm
@ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item @ Set the prize item as randomly selected from a list. Randomness unnecessary, as the list is only 1 item
.macro slateporttent_setrandomprize .macro slateporttent_setrandomprize
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE setvar VAR_0x8004, SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE
special CallSlateportTentFunction special CallSlateportTentFunction
.endm .endm
@ Give the current prize item. FALSE if no room for prize @ Give the current prize item. FALSE if no room for prize
.macro slateporttent_giveprize .macro slateporttent_giveprize
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GIVE_PRIZE setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GIVE_PRIZE
special CallSlateportTentFunction special CallSlateportTentFunction
@@ -157,7 +157,7 @@
.macro slateporttent_generateopponentmons .macro slateporttent_generateopponentmons
setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS setvar VAR_0x8004, SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS
special CallSlateportTentFunction special CallSlateportTentFunction
.endm .endm
@ Slateport Tent's version of factory_generaterentalmons @ Slateport Tent's version of factory_generaterentalmons
.macro slateporttent_generaterentalmons .macro slateporttent_generaterentalmons
asm/macros/event.inc
+602 -463
View File
File diff suppressed because it is too large. Load diff
asm/macros/movement.inc
+161 -126
View File
@@ -1,131 +1,166 @@
.macro create_movement_action name .macro create_movement_action name:req, value:req
enum _\name
.macro \name .macro \name
.byte _\name .byte \value
.endm .endm
.endm .endm
enum_start create_movement_action face_down, MOVEMENT_ACTION_FACE_DOWN
create_movement_action face_down create_movement_action face_up, MOVEMENT_ACTION_FACE_UP
create_movement_action face_up create_movement_action face_left, MOVEMENT_ACTION_FACE_LEFT
create_movement_action face_left create_movement_action face_right, MOVEMENT_ACTION_FACE_RIGHT
create_movement_action face_right create_movement_action walk_slow_down, MOVEMENT_ACTION_WALK_SLOW_DOWN
create_movement_action walk_slow_down create_movement_action walk_slow_up, MOVEMENT_ACTION_WALK_SLOW_UP
create_movement_action walk_slow_up create_movement_action walk_slow_left, MOVEMENT_ACTION_WALK_SLOW_LEFT
create_movement_action walk_slow_left create_movement_action walk_slow_right, MOVEMENT_ACTION_WALK_SLOW_RIGHT
create_movement_action walk_slow_right create_movement_action walk_down, MOVEMENT_ACTION_WALK_NORMAL_DOWN
create_movement_action walk_down create_movement_action walk_up, MOVEMENT_ACTION_WALK_NORMAL_UP
create_movement_action walk_up create_movement_action walk_left, MOVEMENT_ACTION_WALK_NORMAL_LEFT
create_movement_action walk_left create_movement_action walk_right, MOVEMENT_ACTION_WALK_NORMAL_RIGHT
create_movement_action walk_right create_movement_action jump_2_down, MOVEMENT_ACTION_JUMP_2_DOWN
create_movement_action jump_2_down create_movement_action jump_2_up, MOVEMENT_ACTION_JUMP_2_UP
create_movement_action jump_2_up create_movement_action jump_2_left, MOVEMENT_ACTION_JUMP_2_LEFT
create_movement_action jump_2_left create_movement_action jump_2_right, MOVEMENT_ACTION_JUMP_2_RIGHT
create_movement_action jump_2_right create_movement_action delay_1, MOVEMENT_ACTION_DELAY_1
create_movement_action delay_1 create_movement_action delay_2, MOVEMENT_ACTION_DELAY_2
create_movement_action delay_2 create_movement_action delay_4, MOVEMENT_ACTION_DELAY_4
create_movement_action delay_4 create_movement_action delay_8, MOVEMENT_ACTION_DELAY_8
create_movement_action delay_8 create_movement_action delay_16, MOVEMENT_ACTION_DELAY_16
create_movement_action delay_16 create_movement_action walk_fast_down, MOVEMENT_ACTION_WALK_FAST_DOWN
create_movement_action walk_fast_down create_movement_action walk_fast_up, MOVEMENT_ACTION_WALK_FAST_UP
create_movement_action walk_fast_up create_movement_action walk_fast_left, MOVEMENT_ACTION_WALK_FAST_LEFT
create_movement_action walk_fast_left create_movement_action walk_fast_right, MOVEMENT_ACTION_WALK_FAST_RIGHT
create_movement_action walk_fast_right create_movement_action walk_in_place_slow_down, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_DOWN
create_movement_action walk_in_place_slow_down create_movement_action walk_in_place_slow_up, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_UP
create_movement_action walk_in_place_slow_up create_movement_action walk_in_place_slow_left, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_LEFT
create_movement_action walk_in_place_slow_left create_movement_action walk_in_place_slow_right, MOVEMENT_ACTION_WALK_IN_PLACE_SLOW_RIGHT
create_movement_action walk_in_place_slow_right create_movement_action walk_in_place_down, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_DOWN
create_movement_action walk_in_place_down create_movement_action walk_in_place_up, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_UP
create_movement_action walk_in_place_up create_movement_action walk_in_place_left, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_LEFT
create_movement_action walk_in_place_left create_movement_action walk_in_place_right, MOVEMENT_ACTION_WALK_IN_PLACE_NORMAL_RIGHT
create_movement_action walk_in_place_right create_movement_action walk_in_place_fast_down, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_DOWN
create_movement_action walk_in_place_fast_down create_movement_action walk_in_place_fast_up, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_UP
create_movement_action walk_in_place_fast_up create_movement_action walk_in_place_fast_left, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_LEFT
create_movement_action walk_in_place_fast_left create_movement_action walk_in_place_fast_right, MOVEMENT_ACTION_WALK_IN_PLACE_FAST_RIGHT
create_movement_action walk_in_place_fast_right create_movement_action walk_in_place_faster_down, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_DOWN
create_movement_action walk_in_place_fastest_down create_movement_action walk_in_place_faster_up, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_UP
create_movement_action walk_in_place_fastest_up create_movement_action walk_in_place_faster_left, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_LEFT
create_movement_action walk_in_place_fastest_left create_movement_action walk_in_place_faster_right, MOVEMENT_ACTION_WALK_IN_PLACE_FASTER_RIGHT
create_movement_action walk_in_place_fastest_right create_movement_action ride_water_current_down, MOVEMENT_ACTION_RIDE_WATER_CURRENT_DOWN
create_movement_action ride_water_current_down create_movement_action ride_water_current_up, MOVEMENT_ACTION_RIDE_WATER_CURRENT_UP
create_movement_action ride_water_current_up create_movement_action ride_water_current_left, MOVEMENT_ACTION_RIDE_WATER_CURRENT_LEFT
create_movement_action ride_water_current_left create_movement_action ride_water_current_right, MOVEMENT_ACTION_RIDE_WATER_CURRENT_RIGHT
create_movement_action ride_water_current_right create_movement_action walk_faster_down, MOVEMENT_ACTION_WALK_FASTER_DOWN
create_movement_action walk_fastest_down create_movement_action walk_faster_up, MOVEMENT_ACTION_WALK_FASTER_UP
create_movement_action walk_fastest_up create_movement_action walk_faster_left, MOVEMENT_ACTION_WALK_FASTER_LEFT
create_movement_action walk_fastest_left create_movement_action walk_faster_right, MOVEMENT_ACTION_WALK_FASTER_RIGHT
create_movement_action walk_fastest_right create_movement_action slide_down, MOVEMENT_ACTION_SLIDE_DOWN
create_movement_action slide_down create_movement_action slide_up, MOVEMENT_ACTION_SLIDE_UP
create_movement_action slide_up create_movement_action slide_left, MOVEMENT_ACTION_SLIDE_LEFT
create_movement_action slide_left create_movement_action slide_right, MOVEMENT_ACTION_SLIDE_RIGHT
create_movement_action slide_right create_movement_action player_run_down, MOVEMENT_ACTION_PLAYER_RUN_DOWN
create_movement_action player_run_down create_movement_action player_run_up, MOVEMENT_ACTION_PLAYER_RUN_UP
create_movement_action player_run_up create_movement_action player_run_left, MOVEMENT_ACTION_PLAYER_RUN_LEFT
create_movement_action player_run_left create_movement_action player_run_right, MOVEMENT_ACTION_PLAYER_RUN_RIGHT
create_movement_action player_run_right create_movement_action start_anim_in_direction, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION
create_movement_action start_anim_in_direction create_movement_action jump_special_down, MOVEMENT_ACTION_JUMP_SPECIAL_DOWN
create_movement_action jump_special_down create_movement_action jump_special_up, MOVEMENT_ACTION_JUMP_SPECIAL_UP
create_movement_action jump_special_up create_movement_action jump_special_left, MOVEMENT_ACTION_JUMP_SPECIAL_LEFT
create_movement_action jump_special_left create_movement_action jump_special_right, MOVEMENT_ACTION_JUMP_SPECIAL_RIGHT
create_movement_action jump_special_right create_movement_action face_player, MOVEMENT_ACTION_FACE_PLAYER
create_movement_action face_player create_movement_action face_away_player, MOVEMENT_ACTION_FACE_AWAY_PLAYER
create_movement_action face_away_player create_movement_action lock_facing_direction, MOVEMENT_ACTION_LOCK_FACING_DIRECTION
create_movement_action lock_facing_direction create_movement_action unlock_facing_direction, MOVEMENT_ACTION_UNLOCK_FACING_DIRECTION
create_movement_action unlock_facing_direction create_movement_action jump_down, MOVEMENT_ACTION_JUMP_DOWN
create_movement_action jump_down create_movement_action jump_up, MOVEMENT_ACTION_JUMP_UP
create_movement_action jump_up create_movement_action jump_left, MOVEMENT_ACTION_JUMP_LEFT
create_movement_action jump_left create_movement_action jump_right, MOVEMENT_ACTION_JUMP_RIGHT
create_movement_action jump_right create_movement_action jump_in_place_down, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN
create_movement_action jump_in_place_down create_movement_action jump_in_place_up, MOVEMENT_ACTION_JUMP_IN_PLACE_UP
create_movement_action jump_in_place_up create_movement_action jump_in_place_left, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT
create_movement_action jump_in_place_left create_movement_action jump_in_place_right, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT
create_movement_action jump_in_place_right create_movement_action jump_in_place_down_up, MOVEMENT_ACTION_JUMP_IN_PLACE_DOWN_UP
create_movement_action jump_in_place_down_up create_movement_action jump_in_place_up_down, MOVEMENT_ACTION_JUMP_IN_PLACE_UP_DOWN
create_movement_action jump_in_place_up_down create_movement_action jump_in_place_left_right, MOVEMENT_ACTION_JUMP_IN_PLACE_LEFT_RIGHT
create_movement_action jump_in_place_left_right create_movement_action jump_in_place_right_left, MOVEMENT_ACTION_JUMP_IN_PLACE_RIGHT_LEFT
create_movement_action jump_in_place_right_left create_movement_action face_original_direction, MOVEMENT_ACTION_FACE_ORIGINAL_DIRECTION
create_movement_action face_original_direction create_movement_action nurse_joy_bow, MOVEMENT_ACTION_NURSE_JOY_BOW_DOWN
create_movement_action nurse_joy_bow create_movement_action enable_jump_landing_ground_effect, MOVEMENT_ACTION_ENABLE_JUMP_LANDING_GROUND_EFFECT
create_movement_action enable_jump_landing_ground_effect create_movement_action disable_jump_landing_ground_effect, MOVEMENT_ACTION_DISABLE_JUMP_LANDING_GROUND_EFFECT
create_movement_action disable_jump_landing_ground_effect create_movement_action disable_anim, MOVEMENT_ACTION_DISABLE_ANIMATION
create_movement_action disable_anim create_movement_action restore_anim, MOVEMENT_ACTION_RESTORE_ANIMATION
create_movement_action restore_anim create_movement_action set_invisible, MOVEMENT_ACTION_SET_INVISIBLE
create_movement_action set_invisible create_movement_action set_visible, MOVEMENT_ACTION_SET_VISIBLE
create_movement_action set_visible create_movement_action emote_exclamation_mark, MOVEMENT_ACTION_EMOTE_EXCLAMATION_MARK
create_movement_action emote_exclamation_mark create_movement_action emote_question_mark, MOVEMENT_ACTION_EMOTE_QUESTION_MARK
create_movement_action emote_question_mark create_movement_action emote_heart, MOVEMENT_ACTION_EMOTE_HEART
create_movement_action emote_heart create_movement_action reveal_trainer, MOVEMENT_ACTION_REVEAL_TRAINER
create_movement_action reveal_trainer create_movement_action rock_smash_break, MOVEMENT_ACTION_ROCK_SMASH_BREAK
create_movement_action rock_smash_break create_movement_action cut_tree, MOVEMENT_ACTION_CUT_TREE
create_movement_action cut_tree create_movement_action set_fixed_priority, MOVEMENT_ACTION_SET_FIXED_PRIORITY
create_movement_action set_fixed_priority create_movement_action clear_fixed_priority, MOVEMENT_ACTION_CLEAR_FIXED_PRIORITY
create_movement_action clear_fixed_priority create_movement_action init_affine_anim, MOVEMENT_ACTION_INIT_AFFINE_ANIM
create_movement_action init_affine_anim create_movement_action clear_affine_anim, MOVEMENT_ACTION_CLEAR_AFFINE_ANIM
create_movement_action clear_affine_anim create_movement_action hide_reflection, MOVEMENT_ACTION_HIDE_REFLECTION
create_movement_action hide_reflection create_movement_action show_reflection, MOVEMENT_ACTION_SHOW_REFLECTION
create_movement_action show_reflection create_movement_action walk_down_start_affine, MOVEMENT_ACTION_WALK_DOWN_START_AFFINE
create_movement_action walk_down_start_affine create_movement_action walk_down_affine, MOVEMENT_ACTION_WALK_DOWN_AFFINE
create_movement_action walk_down_affine create_movement_action acro_wheelie_face_down, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_DOWN
create_movement_action acro_wheelie_face_up, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_UP
create_movement_action acro_wheelie_face_left, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_LEFT
create_movement_action acro_wheelie_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_FACE_RIGHT
create_movement_action acro_pop_wheelie_down, MOVEMENT_ACTION_ACRO_POP_WHEELIE_DOWN
create_movement_action acro_pop_wheelie_up, MOVEMENT_ACTION_ACRO_POP_WHEELIE_UP
create_movement_action acro_pop_wheelie_left, MOVEMENT_ACTION_ACRO_POP_WHEELIE_LEFT
create_movement_action acro_pop_wheelie_right, MOVEMENT_ACTION_ACRO_POP_WHEELIE_RIGHT
create_movement_action acro_end_wheelie_face_down, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_DOWN
create_movement_action acro_end_wheelie_face_up, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_UP
create_movement_action acro_end_wheelie_face_left, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_LEFT
create_movement_action acro_end_wheelie_face_right, MOVEMENT_ACTION_ACRO_END_WHEELIE_FACE_RIGHT
create_movement_action acro_wheelie_hop_face_down, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_DOWN
create_movement_action acro_wheelie_hop_face_up, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_UP
create_movement_action acro_wheelie_hop_face_left, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_LEFT
create_movement_action acro_wheelie_hop_face_right, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_FACE_RIGHT
create_movement_action acro_wheelie_hop_down, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_DOWN
create_movement_action acro_wheelie_hop_up, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_UP
create_movement_action acro_wheelie_hop_left, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_LEFT
create_movement_action acro_wheelie_hop_right, MOVEMENT_ACTION_ACRO_WHEELIE_HOP_RIGHT
create_movement_action acro_wheelie_jump_down, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_DOWN
create_movement_action acro_wheelie_jump_up, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_UP
create_movement_action acro_wheelie_jump_left, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_LEFT
create_movement_action acro_wheelie_jump_right, MOVEMENT_ACTION_ACRO_WHEELIE_JUMP_RIGHT
create_movement_action acro_wheelie_in_place_down, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_DOWN
create_movement_action acro_wheelie_in_place_up, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_UP
create_movement_action acro_wheelie_in_place_left, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_LEFT
create_movement_action acro_wheelie_in_place_right, MOVEMENT_ACTION_ACRO_WHEELIE_IN_PLACE_RIGHT
create_movement_action acro_pop_wheelie_move_down, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_DOWN
create_movement_action acro_pop_wheelie_move_up, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_UP
create_movement_action acro_pop_wheelie_move_left, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_LEFT
create_movement_action acro_pop_wheelie_move_right, MOVEMENT_ACTION_ACRO_POP_WHEELIE_MOVE_RIGHT
create_movement_action acro_wheelie_move_down, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_DOWN
create_movement_action acro_wheelie_move_up, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_UP
create_movement_action acro_wheelie_move_left, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_LEFT
create_movement_action acro_wheelie_move_right, MOVEMENT_ACTION_ACRO_WHEELIE_MOVE_RIGHT
create_movement_action acro_end_wheelie_move_down, MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_DOWN
create_movement_action acro_end_wheelie_move_up, MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_UP
create_movement_action acro_end_wheelie_move_left, MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_LEFT
create_movement_action acro_end_wheelie_move_right, MOVEMENT_ACTION_ACRO_END_WHEELIE_MOVE_RIGHT
create_movement_action walk_diag_northwest, MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_LEFT
create_movement_action walk_diag_northeast, MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_UP_RIGHT
create_movement_action walk_diag_southwest, MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_LEFT
create_movement_action walk_diag_southeast, MOVEMENT_ACTION_WALK_NORMAL_DIAGONAL_DOWN_RIGHT
create_movement_action walk_slow_diag_northwest, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_UP_LEFT
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_southeast, MOVEMENT_ACTION_WALK_SLOW_DIAGONAL_DOWN_RIGHT
create_movement_action store_lock_anim, MOVEMENT_ACTION_STORE_AND_LOCK_ANIM
create_movement_action free_unlock_anim, MOVEMENT_ACTION_FREE_AND_UNLOCK_ANIM
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 levitate, MOVEMENT_ACTION_LEVITATE
create_movement_action stop_levitate, MOVEMENT_ACTION_STOP_LEVITATE
create_movement_action destroy_extra_task, MOVEMENT_ACTION_STOP_LEVITATE_AT_TOP
create_movement_action figure_8, MOVEMENT_ACTION_FIGURE_8
create_movement_action fly_up, MOVEMENT_ACTION_FLY_UP
create_movement_action fly_down, MOVEMENT_ACTION_FLY_DOWN
enum_start 0x8C create_movement_action step_end, MOVEMENT_ACTION_STEP_END
create_movement_action walk_diag_northwest
create_movement_action walk_diag_northeast
create_movement_action walk_diag_southwest
create_movement_action walk_diag_southeast
create_movement_action walk_slow_diag_northwest
create_movement_action walk_slow_diag_northeast
create_movement_action walk_slow_diag_southwest
create_movement_action walk_slow_diag_southeast
create_movement_action store_lock_anim
create_movement_action free_unlock_anim
create_movement_action walk_left_affine
create_movement_action walk_right_affine
create_movement_action levitate
create_movement_action stop_levitate
create_movement_action destroy_extra_task
create_movement_action figure_8
create_movement_action fly_up
create_movement_action fly_down
enum_start 0xfe
create_movement_action step_end
asm/macros/music_voice.inc
+2 -2
View File
@@ -145,7 +145,7 @@
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
.endm .endm
.macro cry2 sample:req .macro cry_reverse sample:req
.byte 0x30, 60, 0, 0 .byte 0x30, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
@@ -157,7 +157,7 @@
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
.endm .endm
.macro cry2_uncomp sample @ not compressed .macro cry_reverse_uncomp sample @ not compressed
.byte 0x10, 60, 0, 0 .byte 0x10, 60, 0, 0
.4byte \sample .4byte \sample
.byte 0xff, 0, 0xff, 0 .byte 0xff, 0, 0xff, 0
asm/rom_header.inc
-35
View File
@@ -1,35 +0,0 @@
.global RomHeaderNintendoLogo
RomHeaderNintendoLogo:
.space 156
RomHeaderGameTitle:
.space 12
.global RomHeaderGameCode
RomHeaderGameCode:
.space 4
RomHeaderMakerCode:
.space 2
RomHeaderMagic:
.byte 0
RomHeaderMainUnitCode:
.byte 0
RomHeaderDeviceType:
.byte 0
RomHeaderReserved1:
.space 7
.global RomHeaderSoftwareVersion
RomHeaderSoftwareVersion:
.byte 0
RomHeaderChecksum:
.byte 0
RomHeaderReserved2:
.space 2
berry_fix/payload/include/global.fieldmap.h
+8 -8
View File
@@ -219,14 +219,14 @@ struct EventObjectGraphicsInfo
/*0x20*/ const union AffineAnimCmd *const *affineAnims; /*0x20*/ const union AffineAnimCmd *const *affineAnims;
}; };
#define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0) #define PLAYER_AVATAR_FLAG_ON_FOOT (1 << 0)
#define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1) #define PLAYER_AVATAR_FLAG_MACH_BIKE (1 << 1)
#define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2) #define PLAYER_AVATAR_FLAG_ACRO_BIKE (1 << 2)
#define PLAYER_AVATAR_FLAG_SURFING (1 << 3) #define PLAYER_AVATAR_FLAG_SURFING (1 << 3)
#define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4) #define PLAYER_AVATAR_FLAG_UNDERWATER (1 << 4)
#define PLAYER_AVATAR_FLAG_5 (1 << 5) #define PLAYER_AVATAR_FLAG_CONTROLLABLE (1 << 5)
#define PLAYER_AVATAR_FLAG_6 (1 << 6) #define PLAYER_AVATAR_FLAG_FORCED_MOVE (1 << 6)
#define PLAYER_AVATAR_FLAG_DASH (1 << 7) #define PLAYER_AVATAR_FLAG_DASH (1 << 7)
enum enum
{ {
berry_fix/payload/include/global.h
+12 -11
View File
@@ -6,17 +6,18 @@
// global.h from pokemon ruby // global.h from pokemon ruby
// IDE support // IDE support
#if defined(__APPLE__) || defined(__CYGWIN__) #if defined(__APPLE__) || defined(__CYGWIN__) || defined(__INTELLISENSE__)
#define _(x) x // We define these when using certain IDEs to fool preproc
#define __(x) x #define _(x) (x)
#define INCBIN(x) {0} #define __(x) (x)
#define INCBIN_U8 INCBIN #define INCBIN(...) {0}
#define INCBIN_U16 INCBIN #define INCBIN_U8 INCBIN
#define INCBIN_U32 INCBIN #define INCBIN_U16 INCBIN
#define INCBIN_S8 INCBIN #define INCBIN_U32 INCBIN
#define INCBIN_S16 INCBIN #define INCBIN_S8 INCBIN
#define INCBIN_S32 INCBIN #define INCBIN_S16 INCBIN
#endif #define INCBIN_S32 INCBIN
#endif // IDE support
// Prevent cross-jump optimization. // Prevent cross-jump optimization.
#define BLOCK_CROSS_JUMP asm(""); #define BLOCK_CROSS_JUMP asm("");
charmap.txt
+9 -1
View File
@@ -423,7 +423,7 @@ HIGHLIGHT = FC 02 @ same as fc 01
SHADOW = FC 03 @ same as fc 01 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
SIZE = FC 06 @ note that anything other than "SMALL" is invalid FONT = FC 06 @ Given a font id, or use font constants below instead
RESET_SIZE = FC 07 RESET_SIZE = 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
@@ -443,6 +443,14 @@ ENG = FC 16
PAUSE_MUSIC = FC 17 PAUSE_MUSIC = FC 17
RESUME_MUSIC = FC 18 RESUME_MUSIC = FC 18
@ fonts
FONT_SMALL = FC 06 00
FONT_NORMAL = FC 06 01
FONT_SHORT = FC 06 02
FONT_NARROW = FC 06 07
FONT_SMALL_NARROW = FC 06 08
@ colors @ colors
TRANSPARENT = 00 TRANSPARENT = 00
common_syms/bg.txt
+1 -1
View File
@@ -1 +1 @@
gUnneededFireRedVariable gWindowTileAutoAllocEnabled
common_syms/ereader_screen.txt
+1 -1
View File
@@ -1 +1 @@
gUnknown_03006370 gEReaderData
common_syms/link_rfu_2.txt
+2 -2
View File
@@ -1,2 +1,2 @@
gf_rfu_REQ_api gRfuAPIBuffer
Rfu gRfu
common_syms/save.txt
+3 -3
View File
@@ -3,11 +3,11 @@ gLastSaveCounter
gLastKnownGoodSector gLastKnownGoodSector
gDamagedSaveSectors gDamagedSaveSectors
gSaveCounter gSaveCounter
gFastSaveSection gReadWriteSector
gUnknown_03006208 gIncrementalSectorId
gSaveUnusedVar gSaveUnusedVar
gSaveFileStatus gSaveFileStatus
gGameContinueCallback gGameContinueCallback
gRamSaveSectionLocations gRamSaveSectorLocations
gSaveUnusedVar2 gSaveUnusedVar2
gSaveAttemptStatus gSaveAttemptStatus
data/battle_anim_scripts.s
+648 -293
View File
File diff suppressed because it is too large. Load diff
data/battle_scripts_1.s
+1632 -297
View File
File diff suppressed because it is too large. Load diff
data/battle_scripts_2.s
-32
View File
@@ -12,37 +12,6 @@
.section script_data, "aw", %progbits .section script_data, "aw", %progbits
.align 2
gBattlescriptsForBallThrow::
.4byte BattleScript_BallThrow @ ITEM_NONE
.4byte BattleScript_BallThrow @ ITEM_MASTER_BALL
.4byte BattleScript_BallThrow @ ITEM_ULTRA_BALL
.4byte BattleScript_BallThrow @ ITEM_GREAT_BALL
.4byte BattleScript_BallThrow @ ITEM_POKE_BALL
.4byte BattleScript_SafariBallThrow @ ITEM_SAFARI_BALL
.4byte BattleScript_BallThrow @ ITEM_NET_BALL
.4byte BattleScript_BallThrow @ ITEM_DIVE_BALL
.4byte BattleScript_BallThrow @ ITEM_NEST_BALL
.4byte BattleScript_BallThrow @ ITEM_REPEAT_BALL
.4byte BattleScript_BallThrow @ ITEM_TIMER_BALL
.4byte BattleScript_BallThrow @ ITEM_LUXURY_BALL
.4byte BattleScript_BallThrow @ ITEM_DUSK_BALL
.4byte BattleScript_BallThrow @ ITEM_HEAL_BALL
.4byte BattleScript_BallThrow @ ITEM_QUICK_BALL
.4byte BattleScript_BallThrow @ ITEM_CHERISH_BALL
.4byte BattleScript_BallThrow @ ITEM_FAST_BALL
.4byte BattleScript_BallThrow @ ITEM_LEVEL_BALL
.4byte BattleScript_BallThrow @ ITEM_LURE_BALL
.4byte BattleScript_BallThrow @ ITEM_HEAVY_BALL
.4byte BattleScript_BallThrow @ ITEM_LOVE_BALL
.4byte BattleScript_BallThrow @ ITEM_FRIEND_BALL
.4byte BattleScript_BallThrow @ ITEM_MOON_BALL
.4byte BattleScript_BallThrow @ ITEM_SPORT_BALL
.4byte BattleScript_BallThrow @ ITEM_PARK_BALL
.4byte BattleScript_BallThrow @ ITEM_DREAM_BALL
.4byte BattleScript_BallThrow @ ITEM_BEAST_BALL
.4byte BattleScript_BallThrow @ ITEM_PREMIER_BALL
.align 2 .align 2
gBattlescriptsForUsingItem:: gBattlescriptsForUsingItem::
.4byte BattleScript_PlayerUsesItem .4byte BattleScript_PlayerUsesItem
@@ -79,7 +48,6 @@ BattleScript_SafariBallThrow::
BattleScript_SuccessBallThrow:: BattleScript_SuccessBallThrow::
setbyte sMON_CAUGHT, TRUE setbyte sMON_CAUGHT, TRUE
jumpifhalfword CMP_EQUAL, gLastUsedItem, ITEM_SAFARI_BALL, BattleScript_PrintCaughtMonInfo
incrementgamestat GAME_STAT_POKEMON_CAPTURES incrementgamestat GAME_STAT_POKEMON_CAPTURES
BattleScript_PrintCaughtMonInfo:: BattleScript_PrintCaughtMonInfo::
printstring STRINGID_GOTCHAPKMNCAUGHT printstring STRINGID_GOTCHAPKMNCAUGHT
data/contest_ai_scripts.s
+3 -3
View File
@@ -48,7 +48,7 @@ gContestAI_ScriptsTable::
.4byte AI_Nothing @ CONTEST_AI_DUMMY_25 .4byte AI_Nothing @ CONTEST_AI_DUMMY_25
@ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later @ Unused. Encourages improving condition on the 1st appeal, or startling mons if the users turn is later
AI_CheckTiming: AI_CheckTiming:
if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition if_appeal_num_not_eq 0, AI_CheckTiming_SkipCondition
if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition if_effect_not_eq CONTEST_EFFECT_IMPROVE_CONDITION_PREVENT_NERVOUSNESS, AI_CheckTiming_SkipCondition
@@ -388,7 +388,7 @@ AI_CGM_AppealAsGoodAsPrevOnes_Last:
score +20 score +20
end end
@ Encourages move more for each opponent who will have a turn before the user @ Encourages move more for each opponent who will have a turn before the user
AI_CGM_AppealAsGoodAsPrevOne: AI_CGM_AppealAsGoodAsPrevOne:
if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp if_user_order_eq MON_1, AI_CGM_AppealAsGoodAsPrevOne_1stUp
if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp if_user_order_eq MON_2, AI_CGM_AppealAsGoodAsPrevOne_2ndUp
@@ -456,7 +456,7 @@ AI_CGM_BetterWhenAudienceExcited_Not1stUp:
score +10 score +10
end end
@ Encourage move more for each condition star the prev mons have @ Encourage move more for each condition star the prev mons have
AI_CGM_WorsenConditionOfPrevMons: AI_CGM_WorsenConditionOfPrevMons:
if_user_order_eq MON_1, AI_CGM_End if_user_order_eq MON_1, AI_CGM_End
goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1 goto AI_CGM_WorsenConditionOfPrevMons_CheckMon1
data/unknown_serial_data.bin → data/ereader_link_data.bin
View File
File renamed without changes.
data/ereader_link_data.s
+6
View File
@@ -0,0 +1,6 @@
.section .rodata
.align 2
gEReaderLinkData_Start::
.incbin "data/ereader_link_data.bin"
gEReaderLinkData_End::
data/event_scripts.s
+13 -17
View File
@@ -45,6 +45,7 @@
#include "constants/script_menu.h" #include "constants/script_menu.h"
#include "constants/secret_bases.h" #include "constants/secret_bases.h"
#include "constants/songs.h" #include "constants/songs.h"
#include "constants/sound.h"
#include "constants/species.h" #include "constants/species.h"
#include "constants/trade.h" #include "constants/trade.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
@@ -99,7 +100,7 @@ gStdScripts::
.4byte Std_ObtainDecoration @ STD_OBTAIN_DECORATION .4byte Std_ObtainDecoration @ STD_OBTAIN_DECORATION
.4byte Std_RegisteredInMatchCall @ STD_REGISTER_MATCH_CALL .4byte Std_RegisteredInMatchCall @ STD_REGISTER_MATCH_CALL
.4byte Std_MsgboxGetPoints @ MSGBOX_GETPOINTS .4byte Std_MsgboxGetPoints @ MSGBOX_GETPOINTS
.4byte Std_10 .4byte Std_MsgboxPokenav @ MSGBOX_POKENAV
gStdScripts_End:: gStdScripts_End::
.include "data/maps/PetalburgCity/scripts.inc" .include "data/maps/PetalburgCity/scripts.inc"
@@ -583,12 +584,9 @@ EventScript_WhiteOut::
end end
EventScript_ResetMrBriney:: EventScript_ResetMrBriney::
compare VAR_BRINEY_LOCATION, 1 goto_if_eq VAR_BRINEY_LOCATION, 1, EventScript_MoveMrBrineyToHouse
goto_if_eq EventScript_MoveMrBrineyToHouse goto_if_eq VAR_BRINEY_LOCATION, 2, EventScript_MoveMrBrineyToDewford
compare VAR_BRINEY_LOCATION, 2 goto_if_eq VAR_BRINEY_LOCATION, 3, EventScript_MoveMrBrineyToRoute109
goto_if_eq EventScript_MoveMrBrineyToDewford
compare VAR_BRINEY_LOCATION, 3
goto_if_eq EventScript_MoveMrBrineyToRoute109
end end
EventScript_MoveMrBrineyToHouse:: EventScript_MoveMrBrineyToHouse::
@@ -787,7 +785,7 @@ RusturfTunnel_EventScript_SetRusturfTunnelOpen::
EventScript_UnusedBoardFerry:: EventScript_UnusedBoardFerry::
delay 30 delay 30
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
showobjectat OBJ_EVENT_ID_PLAYER, 0 showobjectat OBJ_EVENT_ID_PLAYER, 0
delay 30 delay 30
@@ -801,10 +799,8 @@ Movement_UnusedBoardFerry:
step_end step_end
Common_EventScript_FerryDepartIsland:: Common_EventScript_FerryDepartIsland::
compare VAR_FACING, DIR_SOUTH call_if_eq VAR_FACING, DIR_SOUTH, Ferry_EventScript_DepartIslandSouth
call_if_eq Ferry_EventScript_DepartIslandSouth call_if_eq VAR_FACING, DIR_WEST, Ferry_EventScript_DepartIslandWest
compare VAR_FACING, DIR_WEST
call_if_eq Ferry_EventScript_DepartIslandWest
delay 30 delay 30
hideobjectat OBJ_EVENT_ID_PLAYER, 0 hideobjectat OBJ_EVENT_ID_PLAYER, 0
call Common_EventScript_FerryDepart call Common_EventScript_FerryDepart
@@ -820,7 +816,7 @@ Common_EventScript_NameReceivedPartyMon::
return return
Common_EventScript_PlayerHandedOverTheItem:: Common_EventScript_PlayerHandedOverTheItem::
bufferitemname 0, VAR_0x8004 bufferitemname STR_VAR_1, VAR_0x8004
playfanfare MUS_OBTAIN_TMHM playfanfare MUS_OBTAIN_TMHM
message gText_PlayerHandedOverTheItem message gText_PlayerHandedOverTheItem
waitmessage waitmessage
@@ -957,7 +953,7 @@ gText_LegendaryFlewAway::
.string "The {STR_VAR_1} flew away!$" .string "The {STR_VAR_1} flew away!$"
.include "data/text/pc_transfer.inc" .include "data/text/pc_transfer.inc"
.include "data/text/mevent.inc" .include "data/text/questionnaire.inc"
.include "data/text/abnormal_weather.inc" .include "data/text/abnormal_weather.inc"
EventScript_SelectWithoutRegisteredItem:: EventScript_SelectWithoutRegisteredItem::
@@ -1001,13 +997,13 @@ Common_EventScript_LegendaryFlewAway::
fadescreenswapbuffers FADE_TO_BLACK fadescreenswapbuffers FADE_TO_BLACK
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
fadescreenswapbuffers FADE_FROM_BLACK fadescreenswapbuffers FADE_FROM_BLACK
bufferspeciesname 0, VAR_0x8004 bufferspeciesname STR_VAR_1, VAR_0x8004
msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT msgbox gText_LegendaryFlewAway, MSGBOX_DEFAULT
release release
end end
.include "data/scripts/pc_transfer.inc" .include "data/scripts/pc_transfer.inc"
.include "data/scripts/mevent.inc" .include "data/scripts/questionnaire.inc"
.include "data/scripts/abnormal_weather.inc" .include "data/scripts/abnormal_weather.inc"
.include "data/scripts/trainer_script.inc" .include "data/scripts/trainer_script.inc"
.include "data/scripts/berry_tree.inc" .include "data/scripts/berry_tree.inc"
@@ -1027,7 +1023,7 @@ Common_EventScript_LegendaryFlewAway::
.include "data/scripts/mauville_man.inc" .include "data/scripts/mauville_man.inc"
.include "data/scripts/field_move_scripts.inc" .include "data/scripts/field_move_scripts.inc"
.include "data/scripts/item_ball_scripts.inc" .include "data/scripts/item_ball_scripts.inc"
.include "data/scripts/mystery_event_club.inc" .include "data/scripts/profile_man.inc"
.include "data/scripts/day_care.inc" .include "data/scripts/day_care.inc"
.include "data/scripts/flash.inc" .include "data/scripts/flash.inc"
.include "data/scripts/players_house.inc" .include "data/scripts/players_house.inc"
data/field_effect_scripts.s
+3 -3
View File
@@ -50,7 +50,7 @@ gFieldEffectScriptPointers::
.4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER .4byte gFieldEffectScript_HotSpringsWater @ FLDEFF_HOT_SPRINGS_WATER
.4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL .4byte gFieldEffectScript_UseWaterfall @ FLDEFF_USE_WATERFALL
.4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE .4byte gFieldEffectScript_UseDive @ FLDEFF_USE_DIVE
.4byte gFieldEffectScript_Pokeball @ FLDEFF_POKEBALL .4byte gFieldEffectScript_PokeballTrail @ FLDEFF_POKEBALL_TRAIL
.4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON .4byte gFieldEffectScript_HeartIcon @ FLDEFF_HEART_ICON
.4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47 .4byte gFieldEffectScript_Nop47 @ FLDEFF_NOP_47
.4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48 .4byte gFieldEffectScript_Nop48 @ FLDEFF_NOP_48
@@ -254,9 +254,9 @@ gFieldEffectScript_UseDive::
field_eff_callnative FldEff_UseDive field_eff_callnative FldEff_UseDive
field_eff_end field_eff_end
gFieldEffectScript_Pokeball:: gFieldEffectScript_PokeballTrail::
field_eff_loadpal gSpritePalette_Pokeball field_eff_loadpal gSpritePalette_Pokeball
field_eff_callnative FldEff_Pokeball field_eff_callnative FldEff_PokeballTrail
field_eff_end field_eff_end
gFieldEffectScript_HeartIcon:: gFieldEffectScript_HeartIcon::
data/fonts.s
-76
View File
@@ -1,76 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gFont8LatinGlyphs::
.incbin "graphics/fonts/font8.latfont"
.align 2
gFont8LatinGlyphWidths::
.include "graphics/fonts/font8_latin_widths.inc"
.align 2
gFont0LatinGlyphs::
.incbin "graphics/fonts/font0.latfont"
.align 2
gFont0LatinGlyphWidths::
.include "graphics/fonts/font0_latin_widths.inc"
.align 2
gFont7LatinGlyphs::
.incbin "graphics/fonts/font7.latfont"
.align 2
gFont7LatinGlyphWidths::
.include "graphics/fonts/font7_latin_widths.inc"
.align 2
gFont2LatinGlyphs::
.incbin "graphics/fonts/font2.latfont"
.align 2
gFont2LatinGlyphWidths::
.include "graphics/fonts/font2_latin_widths.inc"
.align 2
gFont1LatinGlyphs::
.incbin "graphics/fonts/font1.latfont"
.align 2
gFont1LatinGlyphWidths::
.include "graphics/fonts/font1_latin_widths.inc"
.align 2
gFont0JapaneseGlyphs::
.incbin "graphics/fonts/font0.hwjpnfont"
.align 2
gFont1JapaneseGlyphs::
.incbin "graphics/fonts/font1.hwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs::
.incbin "graphics/fonts/unused_frlg_male.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths::
.include "graphics/fonts/unused_japanese_frlg_male_font_widths.inc"
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs::
.incbin "graphics/fonts/unused_frlg_female.fwjpnfont"
.align 2
gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths::
.include "graphics/fonts/unused_japanese_frlg_female_font_widths.inc"
.align 2
gFont2JapaneseGlyphs::
.incbin "graphics/fonts/font2.fwjpnfont"
.align 2
gFont2JapaneseGlyphWidths::
.include "graphics/fonts/font2_japanese_widths.inc"
data/maps/AbandonedShip_CaptainsOffice/scripts.inc
+2 -3
View File
@@ -5,9 +5,8 @@ AbandonedShip_CaptainsOffice_EventScript_CaptSternAide::
lock lock
faceplayer faceplayer
goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
checkitem ITEM_SCANNER, 1 checkitem ITEM_SCANNER
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
goto_if_eq AbandonedShip_CaptainsOffice_EventScript_CanYouDeliverScanner
goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER, AbandonedShip_CaptainsOffice_EventScript_ThisIsSSCactus
msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT msgbox AbandonedShip_CaptainsOffice_Text_NoSuccessFindingScanner, MSGBOX_DEFAULT
release release
data/maps/AbandonedShip_Corridors_B1F/scripts.inc
+5 -6
View File
@@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts::
.byte 0 .byte 0
AbandonedShip_Corridors_B1F_OnResume: AbandonedShip_Corridors_B1F_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
end end
AbandonedShip_Corridors_B1F_OnLoad: AbandonedShip_Corridors_B1F_OnLoad:
@@ -13,11 +13,11 @@ AbandonedShip_Corridors_B1F_OnLoad:
end end
AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom:: AbandonedShip_Corridors_B1F_EventScript_LockStorageRoom::
setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return return
AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom:: AbandonedShip_Corridors_B1F_EventScript_UnlockStorageRoom::
setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 setmetatile 11, 4, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return return
AbandonedShip_Corridors_B1F_EventScript_TuberM:: AbandonedShip_Corridors_B1F_EventScript_TuberM::
@@ -27,9 +27,8 @@ AbandonedShip_Corridors_B1F_EventScript_TuberM::
AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor:: AbandonedShip_Corridors_B1F_EventScript_StorageRoomDoor::
lockall lockall
goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_DoorIsUnlocked
checkitem ITEM_STORAGE_KEY, 1 checkitem ITEM_STORAGE_KEY
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
goto_if_eq AbandonedShip_Corridors_B1F_EventScript_DoorIsLocked
msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT msgbox AbandonedShip_Corridors_B1F_Text_InsertedStorageKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
removeitem ITEM_STORAGE_KEY removeitem ITEM_STORAGE_KEY
data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc
+21 -25
View File
@@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts::
.byte 0 .byte 0
AbandonedShip_HiddenFloorCorridors_OnResume: AbandonedShip_HiddenFloorCorridors_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 5, 4
end end
AbandonedShip_HiddenFloorCorridors_OnLoad: AbandonedShip_HiddenFloorCorridors_OnLoad:
@@ -19,46 +19,45 @@ AbandonedShip_HiddenFloorCorridors_OnLoad:
end end
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1:: AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1::
setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2:: AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2::
setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, 1 setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Unlocked, TRUE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4:: AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4::
setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Unlocked, FALSE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6:: AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6::
setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, 0 setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Unlocked, FALSE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1:: AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom1::
setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 setmetatile 3, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2:: AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom2::
setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, 1 setmetatile 6, 8, METATILE_InsideShip_IntactDoor_Bottom_Locked, TRUE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4:: AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom4::
setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, 0 setmetatile 3, 3, METATILE_InsideShip_DoorIndent_Locked, FALSE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6:: AbandonedShip_HiddenFloorCorridors_EventScript_LockRoom6::
setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, 0 setmetatile 9, 3, METATILE_InsideShip_DoorIndent_Locked, FALSE
return return
AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door:: AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door::
lockall lockall
goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_1_KEY, 1 checkitem ITEM_KEY_TO_ROOM_1
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm1IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
removeitem ITEM_ROOM_1_KEY removeitem ITEM_KEY_TO_ROOM_1
setflag FLAG_USED_ROOM_1_KEY setflag FLAG_USED_ROOM_1_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom1
special DrawWholeMapView special DrawWholeMapView
@@ -68,12 +67,11 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room1Door::
AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door:: AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door::
lockall lockall
goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_2_KEY, 1 checkitem ITEM_KEY_TO_ROOM_2
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm2IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
removeitem ITEM_ROOM_2_KEY removeitem ITEM_KEY_TO_ROOM_2
setflag FLAG_USED_ROOM_2_KEY setflag FLAG_USED_ROOM_2_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom2
special DrawWholeMapView special DrawWholeMapView
@@ -83,12 +81,11 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room2Door::
AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door:: AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door::
lockall lockall
goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_4_KEY, 1 checkitem ITEM_KEY_TO_ROOM_4
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm4IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
removeitem ITEM_ROOM_4_KEY removeitem ITEM_KEY_TO_ROOM_4
setflag FLAG_USED_ROOM_4_KEY setflag FLAG_USED_ROOM_4_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom4
special DrawWholeMapView special DrawWholeMapView
@@ -98,12 +95,11 @@ AbandonedShip_HiddenFloorCorridors_EventScript_Room4Door::
AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door:: AbandonedShip_HiddenFloorCorridors_EventScript_Room6Door::
lockall lockall
goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_TheDoorIsOpen
checkitem ITEM_ROOM_6_KEY, 1 checkitem ITEM_KEY_TO_ROOM_6
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_Rm6IsLocked
msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT msgbox AbandonedShip_HiddenFloorCorridors_Text_InsertedKey, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
removeitem ITEM_ROOM_6_KEY removeitem ITEM_KEY_TO_ROOM_6
setflag FLAG_USED_ROOM_6_KEY setflag FLAG_USED_ROOM_6_KEY
call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6 call AbandonedShip_HiddenFloorCorridors_EventScript_UnlockRoom6
special DrawWholeMapView special DrawWholeMapView
data/maps/AbandonedShip_HiddenFloorRooms/map.json
+4 -4
View File
@@ -139,7 +139,7 @@
"x": 42, "x": 42,
"y": 10, "y": 10,
"elevation": 3, "elevation": 3,
"item": "ITEM_ROOM_1_KEY", "item": "ITEM_KEY_TO_ROOM_1",
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY" "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY"
}, },
{ {
@@ -147,7 +147,7 @@
"x": 20, "x": 20,
"y": 5, "y": 5,
"elevation": 3, "elevation": 3,
"item": "ITEM_ROOM_2_KEY", "item": "ITEM_KEY_TO_ROOM_2",
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY" "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY"
}, },
{ {
@@ -155,7 +155,7 @@
"x": 1, "x": 1,
"y": 12, "y": 12,
"elevation": 3, "elevation": 3,
"item": "ITEM_ROOM_4_KEY", "item": "ITEM_KEY_TO_ROOM_4",
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY" "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY"
}, },
{ {
@@ -163,7 +163,7 @@
"x": 1, "x": 1,
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"item": "ITEM_ROOM_6_KEY", "item": "ITEM_KEY_TO_ROOM_6",
"flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY" "flag": "FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_6_KEY"
}, },
{ {
data/maps/AbandonedShip_HiddenFloorRooms/scripts.inc
+8 -16
View File
@@ -17,12 +17,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_DoHiddenItemSparkle::
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
getplayerxy VAR_TEMP_2, VAR_TEMP_3 getplayerxy VAR_TEMP_2, VAR_TEMP_3
setvar VAR_TEMP_4, 1 setvar VAR_TEMP_4, 1
compare VAR_TEMP_2, 21 call_if_eq VAR_TEMP_2, 21, AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InMiddleRoomColumn call_if_eq VAR_TEMP_2, 36, AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn
compare VAR_TEMP_2, 36 call_if_eq VAR_TEMP_3, 2, AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InRightRoomColumn
compare VAR_TEMP_3, 2
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_InUpperRoomRow
switch VAR_TEMP_4 switch VAR_TEMP_4
case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1 case 1, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1
case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2 case 2, AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2
@@ -48,8 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm1::
delay 20 delay 20
dofieldeffectsparkle 10, 10, 0 dofieldeffectsparkle 10, 10, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom4Key specialvar VAR_RESULT, FoundAbandonedShipRoom4Key
compare VAR_RESULT, FALSE call_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm4KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
@@ -59,11 +55,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm2::
AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3:: AbandonedShip_HiddenFloorRooms_EventScript_EnterRm3::
specialvar VAR_RESULT, FoundAbandonedShipRoom1Key specialvar VAR_RESULT, FoundAbandonedShipRoom1Key
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm3NoSparkle
delay 20 delay 20
compare VAR_RESULT, FALSE call_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm1KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
@@ -76,8 +70,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm4::
dofieldeffectsparkle 8, 5, 0 dofieldeffectsparkle 8, 5, 0
dofieldeffectsparkle 11, 3, 0 dofieldeffectsparkle 11, 3, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom6Key specialvar VAR_RESULT, FoundAbandonedShipRoom6Key
compare VAR_RESULT, FALSE call_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm6KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
@@ -88,8 +81,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_EnterRm5::
dofieldeffectsparkle 25, 2, 0 dofieldeffectsparkle 25, 2, 0
dofieldeffectsparkle 24, 6, 0 dofieldeffectsparkle 24, 6, 0
specialvar VAR_RESULT, FoundAbandonedShipRoom2Key specialvar VAR_RESULT, FoundAbandonedShipRoom2Key
compare VAR_RESULT, FALSE call_if_eq VAR_RESULT, FALSE, AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_Rm2KeySparkle
waitfieldeffect FLDEFF_SPARKLE waitfieldeffect FLDEFF_SPARKLE
delay 10 delay 10
end end
data/maps/AbandonedShip_Rooms2_1F/scripts.inc
+2 -4
View File
@@ -4,8 +4,7 @@ AbandonedShip_Rooms2_1F_MapScripts::
AbandonedShip_Rooms2_1F_EventScript_Dan:: AbandonedShip_Rooms2_1F_EventScript_Dan::
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_DanIntro, AbandonedShip_Rooms2_1F_Text_DanDefeat, AbandonedShip_Rooms2_1F_Text_DanNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterDan
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, AbandonedShip_Rooms2_1F_EventScript_DanRematch
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_DanRematch
msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_DanPostBattle, MSGBOX_DEFAULT
release release
end end
@@ -24,8 +23,7 @@ AbandonedShip_Rooms2_1F_EventScript_DanRematch::
AbandonedShip_Rooms2_1F_EventScript_Kira:: AbandonedShip_Rooms2_1F_EventScript_Kira::
trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira trainerbattle_double TRAINER_KIRA_AND_DAN_1, AbandonedShip_Rooms2_1F_Text_KiraIntro, AbandonedShip_Rooms2_1F_Text_KiraDefeat, AbandonedShip_Rooms2_1F_Text_KiraNotEnoughMons, AbandonedShip_Rooms2_1F_EventScript_RegisterKira
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, AbandonedShip_Rooms2_1F_EventScript_KiraRematch
goto_if_eq AbandonedShip_Rooms2_1F_EventScript_KiraRematch
msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms2_1F_Text_KiraPostBattle, MSGBOX_DEFAULT
release release
end end
data/maps/AbandonedShip_Rooms_1F/scripts.inc
+1 -2
View File
@@ -13,8 +13,7 @@ AbandonedShip_Rooms_1F_EventScript_Demetrius::
AbandonedShip_Rooms_1F_EventScript_Thalia:: AbandonedShip_Rooms_1F_EventScript_Thalia::
trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia trainerbattle_single TRAINER_THALIA_1, AbandonedShip_Rooms_1F_Text_ThaliaIntro, AbandonedShip_Rooms_1F_Text_ThaliaDefeat, AbandonedShip_Rooms_1F_EventScript_RegisterThalia
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, AbandonedShip_Rooms_1F_EventScript_ThaliaRematch
goto_if_eq AbandonedShip_Rooms_1F_EventScript_ThaliaRematch
msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT msgbox AbandonedShip_Rooms_1F_Text_ThaliaPostBattle, MSGBOX_DEFAULT
release release
end end
data/maps/AbandonedShip_Rooms_B1F/scripts.inc
+1 -1
View File
@@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts::
.byte 0 .byte 0
AbandonedShip_Rooms_B1F_OnResume: AbandonedShip_Rooms_B1F_OnResume:
setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 17, 4
end end
AbandonedShip_Rooms_B1F_EventScript_FatMan:: AbandonedShip_Rooms_B1F_EventScript_FatMan::
data/maps/AbandonedShip_Underwater1/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ AbandonedShip_Underwater1_MapScripts::
.byte 0 .byte 0
AbandonedShip_Underwater1_OnResume: AbandonedShip_Underwater1_OnResume:
setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 0, 10
end end
data/maps/AbandonedShip_Underwater2/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ AbandonedShip_Underwater2_MapScripts::
.byte 0 .byte 0
AbandonedShip_Underwater2_OnResume: AbandonedShip_Underwater2_OnResume:
setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 13, 7
end end
data/maps/AncientTomb/scripts.inc
+13 -21
View File
@@ -10,8 +10,7 @@ AncientTomb_OnResume:
AncientTomb_EventScript_TryRemoveRegisteel:: AncientTomb_EventScript_TryRemoveRegisteel::
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -29,20 +28,18 @@ AncientTomb_OnLoad:
end end
AncientTomb_EventScript_HideRegiEntrance:: AncientTomb_EventScript_HideRegiEntrance::
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1 setmetatile 7, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1 setmetatile 8, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1 setmetatile 9, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return return
AncientTomb_EventScript_CaveEntranceMiddle:: AncientTomb_EventScript_CaveEntranceMiddle::
lockall lockall
goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall goto_if_set FLAG_SYS_REGISTEEL_PUZZLE_COMPLETED, AncientTomb_EventScript_BigHoleInWall
braillemessage AncientTomb_Braille_ShineInTheMiddle braillemsgbox AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
closebraillemessage
releaseall releaseall
end end
@@ -53,9 +50,7 @@ AncientTomb_EventScript_BigHoleInWall::
AncientTomb_EventScript_CaveEntranceSide:: AncientTomb_EventScript_CaveEntranceSide::
lockall lockall
braillemessage AncientTomb_Braille_ShineInTheMiddle braillemsgbox AncientTomb_Braille_ShineInTheMiddle
waitbuttonpress
closebraillemessage
releaseall releaseall
end end
@@ -63,7 +58,7 @@ AncientTomb_EventScript_Registeel::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_REGISTEEL, 2 playmoncry SPECIES_REGISTEEL, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
@@ -72,12 +67,9 @@ AncientTomb_EventScript_Registeel::
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, AncientTomb_EventScript_DefeatedRegisteel
goto_if_eq AncientTomb_EventScript_DefeatedRegisteel goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AncientTomb_EventScript_RanFromRegisteel
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AncientTomb_EventScript_RanFromRegisteel
goto_if_eq AncientTomb_EventScript_RanFromRegisteel
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AncientTomb_EventScript_RanFromRegisteel
setflag FLAG_DEFEATED_REGISTEEL setflag FLAG_DEFEATED_REGISTEEL
release release
end end
data/maps/AquaHideout_B1F/scripts.inc
+9 -16
View File
@@ -9,8 +9,7 @@ AquaHideout_B1F_OnResume:
AquaHideout_B1F_EventScript_TryRemoveElectrode:: AquaHideout_B1F_EventScript_TryRemoveElectrode::
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -32,19 +31,16 @@ AquaHideout_B1F_EventScript_Electrode1::
faceplayer faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
waitse waitse
playmoncry SPECIES_ELECTRODE, 2 playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, AquaHideout_B1F_EventScript_DefeatedElectrode1
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1 goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AquaHideout_B1F_EventScript_DefeatedElectrode1
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AquaHideout_B1F_EventScript_DefeatedElectrode1
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode1
setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT
release release
end end
@@ -59,19 +55,16 @@ AquaHideout_B1F_EventScript_Electrode2::
faceplayer faceplayer
setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE setwildbattle SPECIES_ELECTRODE, 30, ITEM_NONE
waitse waitse
playmoncry SPECIES_ELECTRODE, 2 playmoncry SPECIES_ELECTRODE, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setflag FLAG_SYS_CTRL_OBJ_DELETE setflag FLAG_SYS_CTRL_OBJ_DELETE
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, AquaHideout_B1F_EventScript_DefeatedElectrode2
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2 goto_if_eq VAR_RESULT, B_OUTCOME_RAN, AquaHideout_B1F_EventScript_DefeatedElectrode2
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, AquaHideout_B1F_EventScript_DefeatedElectrode2
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq AquaHideout_B1F_EventScript_DefeatedElectrode2
setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT
release release
end end
data/maps/AquaHideout_B2F/scripts.inc
+2 -2
View File
@@ -34,14 +34,14 @@ AquaHideout_B2F_EventScript_Matt::
AquaHideout_B2F_EventScript_SubmarineEscape:: AquaHideout_B2F_EventScript_SubmarineEscape::
setvar VAR_0x8008, LOCALID_MATT setvar VAR_0x8008, LOCALID_MATT
setvar VAR_0x8009, LOCALID_SUBMARINE setvar VAR_0x8009, LOCALID_SUBMARINE
applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft applymovement VAR_0x8008, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement VAR_0x8008, Common_Movement_FacePlayer applymovement VAR_0x8008, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT msgbox AquaHideout_B2F_Text_OurBossGotThroughHisPreparations, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft applymovement VAR_0x8008, Common_Movement_WalkInPlaceFasterLeft
applymovement VAR_0x8009, AquaHideout_B2F_Movement_SumbarineDepartLeft applymovement VAR_0x8009, AquaHideout_B2F_Movement_SumbarineDepartLeft
waitmovement 0 waitmovement 0
removeobject VAR_0x8009 removeobject VAR_0x8009
data/maps/BattleFrontier_BattleArenaBattleRoom/scripts.inc
+29 -48
View File
@@ -28,10 +28,8 @@ BattleFrontier_BattleArenaBattleRoom_OnTransition:
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx:: BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfx::
checkplayergender checkplayergender
compare VAR_RESULT, MALE goto_if_eq VAR_RESULT, MALE, BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxFemale
return return
BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale:: BattleFrontier_BattleArenaBattleRoom_EventScript_SetPlayerGfxMale::
@@ -52,8 +50,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_EnterRoom::
applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AnnounceTrainers
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown applymovement LOCALID_ATTENDANT, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown
applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft applymovement LOCALID_PLAYER, BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
@@ -110,7 +107,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner::
msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_WinnerIsOpponent, MSGBOX_DEFAULT
BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost:: BattleFrontier_BattleArenaBattleRoom_EventScript_WarpToLobbyLost::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 7, 8
waitstate waitstate
BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent:: BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent::
@@ -137,24 +134,16 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedOpponent::
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent:: BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponent::
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 1, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent call_if_eq VAR_RESULT, 2, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 3, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor3rdOpponent call_if_eq VAR_RESULT, 4, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 3 call_if_eq VAR_RESULT, 5, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor4thOpponent call_if_eq VAR_RESULT, 6, BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent
compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 5
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge
@@ -210,7 +199,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_ContinueChallenge::
BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon:: BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon::
delay 60 delay 60
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 255, 7, 8 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY, 7, 8
waitstate waitstate
BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent:: BattleFrontier_BattleArenaBattleRoom_EventScript_ReadyFor2ndOpponent::
@@ -254,16 +243,14 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_PauseChallenge::
end end
BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext:: BattleFrontier_BattleArenaBattleRoom_EventScript_TycoonUpNext::
compare VAR_TEMP_2, 1 goto_if_eq VAR_TEMP_2, 1, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon
msgbox BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_NowFaceTycoon, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon:: BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoon::
message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon message BattleFrontier_BattleArenaBattleRoom_Text_PreparedForTycoon
waitmessage waitmessage
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_AskReadyForTycoonNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta case 0, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta
@@ -309,8 +296,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureChallenger, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
@@ -324,15 +310,13 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGreta::
BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver:: BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaSilver::
msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_IgniteMyPassionForBattle, MSGBOX_DEFAULT
call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver
goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver:: BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver::
call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaYoureToughAfterAll, MSGBOX_DEFAULT
@@ -346,8 +330,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaSilver::
BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold:: BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold
goto_if_ne BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaLookingForwardToSeeingAgain, MSGBOX_DEFAULT
closemessage closemessage
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
@@ -361,15 +344,13 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_IntroGretaGold::
BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold:: BattleFrontier_BattleArenaBattleRoom_EventScript_BattleGretaGold::
msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_LetsGetThisStarted, MSGBOX_DEFAULT
call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle call BattleFrontier_BattleArenaBattleRoom_EventScript_StartArenaBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold
goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner goto BattleFrontier_BattleArenaBattleRoom_EventScript_DeclareOpponentWinner
BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold:: BattleFrontier_BattleArenaBattleRoom_EventScript_DefeatedGretaGold::
call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner call BattleFrontier_BattleArenaBattleRoom_EventScript_DeclarePlayerWinner
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
goto_if_eq BattleFrontier_BattleArenaBattleRoom_EventScript_ReturnToLobbyWon
applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong applymovement LOCALID_OPPONENT, BattleFrontier_BattleArenaBattleRoom_Movement_OpponentStepForwardLong
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaBattleRoom_Text_GretaBlownAway, MSGBOX_DEFAULT
@@ -426,15 +407,15 @@ BattleFrontier_BattleArenaBattleRoom_Movement_PlayerStepForward:
BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine: BattleFrontier_BattleArenaBattleRoom_Movement_PlayerWalkBackToLine:
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft: BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceLeft:
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight: BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter: BattleFrontier_BattleArenaBattleRoom_Movement_OpponentEnter:
@@ -475,12 +456,12 @@ BattleFrontier_BattleArenaBattleRoom_Movement_JumpInPlaceUp:
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown: BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceDown:
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
@ Unused, redundant @ Unused, redundant
BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2: BattleFrontier_BattleArenaBattleRoom_Movement_WalkInPlaceRight2:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleArenaBattleRoom_OnWarp: BattleFrontier_BattleArenaBattleRoom_OnWarp:
@@ -497,19 +478,19 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_SetUpRoomObjects::
BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer: BattleFrontier_BattleArenaBattleRoom_Movement_GretaLookAroundPlayer:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter: BattleFrontier_BattleArenaBattleRoom_Movement_GretaWalkBackToCenter:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward: BattleFrontier_BattleArenaBattleRoom_Text_PlayerStepForward:
data/maps/BattleFrontier_BattleArenaCorridor/scripts.inc
+3 -3
View File
@@ -22,7 +22,7 @@ BattleFrontier_BattleArenaCorridor_EventScript_WalkToBattleRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleArenaCorridor_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 255, 7, 5 warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM, 7, 5
waitstate waitstate
end end
@@ -78,12 +78,12 @@ BattleFrontier_BattleArenaCorridor_Movement_AttendantWalkToDoor:
step_end step_end
BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer: BattleFrontier_BattleArenaCorridor_Movement_AttendantFacePlayer:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay: BattleFrontier_BattleArenaCorridor_Movement_AttendantMoveOutOfWay:
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn: BattleFrontier_BattleArenaCorridor_Text_PleaseStepIn:
data/maps/BattleFrontier_BattleArenaLobby/scripts.inc
+10 -17
View File
@@ -40,8 +40,7 @@ BattleFrontier_BattleArenaLobby_EventScript_QuitWithoutSaving::
BattleFrontier_BattleArenaLobby_EventScript_WonChallenge:: BattleFrontier_BattleArenaLobby_EventScript_WonChallenge::
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_DefeatedTycoon
msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_CongratsOnSevenWins, MSGBOX_DEFAULT
goto BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattleArenaLobby_EventScript_GiveBattlePoints
@@ -80,8 +79,7 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveAfterChallenge::
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch message BattleFrontier_BattleArenaLobby_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -131,8 +129,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleArenaLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -141,8 +138,7 @@ BattleFrontier_BattleArenaLobby_EventScript_TryEnterChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge
msgbox BattleFrontier_BattleArenaLobby_Text_OkayToSave, MSGBOX_YESNO msgbox BattleFrontier_BattleArenaLobby_Text_OkayToSave, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge case NO, BattleFrontier_BattleArenaLobby_EventScript_LoadPartyAndCancelChallenge
@@ -161,19 +157,16 @@ BattleFrontier_BattleArenaLobby_EventScript_SaveBeforeChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleArenaLobby_EventScript_CancelChallengeSaveFailed
BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge:: BattleFrontier_BattleArenaLobby_EventScript_EnterChallenge::
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
msgbox BattleFrontier_BattleArenaLobby_Text_GuideYouToArena, MSGBOX_DEFAULT msgbox BattleFrontier_BattleArenaLobby_Text_GuideYouToArena, MSGBOX_DEFAULT
closemessage closemessage
frontier_get FRONTIER_DATA_LVL_MODE frontier_get FRONTIER_DATA_LVL_MODE
compare VAR_RESULT, FRONTIER_LVL_50 call_if_eq VAR_RESULT, FRONTIER_LVL_50, BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50
call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLv50 call_if_eq VAR_RESULT, FRONTIER_LVL_OPEN, BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen
compare VAR_RESULT, FRONTIER_LVL_OPEN warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 9, 13
call_if_eq BattleFrontier_BattleArenaLobby_EventScript_WalkToDoorLvOpen
warp MAP_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
@@ -247,7 +240,7 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToLeftDoor:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor: BattleFrontier_BattleArenaLobby_Movement_PlayerEnterDoor:
@@ -289,7 +282,7 @@ BattleFrontier_BattleArenaLobby_Movement_PlayerWalkToRightDoor:
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattleArenaLobby_EventScript_ShowResults:: BattleFrontier_BattleArenaLobby_EventScript_ShowResults::
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+105 -137
View File
@@ -20,17 +20,14 @@ BattleFrontier_BattleDomeBattleRoom_OnTransition:
dome_setopponentgfx dome_setopponentgfx
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, DOME_ROUND1 call_if_eq VAR_RESULT, DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos
call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx call BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx
end end
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx:: BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfx::
checkplayergender checkplayergender
compare VAR_RESULT, MALE goto_if_eq VAR_RESULT, MALE, BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxFemale
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale:: BattleFrontier_BattleDomeBattleRoom_EventScript_SetPlayerGfxMale::
@@ -48,18 +45,15 @@ BattleFrontier_BattleDomeBattleRoom_OnFrame:
BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleDomeBattleRoom_EventScript_EnterRoom::
lockall lockall
call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum call BattleFrontier_BattleDomeBattleRoom_EventScript_GetRoundNum
compare VAR_RESULT, DOME_ROUND1 call_if_eq VAR_RESULT, DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat
applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
call BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer call BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer
msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerHasEnteredDome, MSGBOX_DEFAULT
closemessage closemessage
showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM
compare VAR_TEMP_F, DOME_FINAL goto_if_ne VAR_TEMP_F, DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter goto_if_ne VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker
compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnterForTucker
BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter:: BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerEnter::
applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter applymovement LOCALID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_PlayerEnter
goto BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer goto BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer
@@ -70,10 +64,8 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceReactToPlayer::
playse SE_M_ENCORE2 playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
waitmovement 0 waitmovement 0
compare VAR_TEMP_F, DOME_FINAL goto_if_ne VAR_TEMP_F, DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent goto_if_ne VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker
compare VAR_TEMP_E, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnounceTucker
BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent:: BattleFrontier_BattleDomeBattleRoom_EventScript_BattleOpponent::
dome_getopponentname dome_getopponentname
msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_PlayerVersusTrainer, MSGBOX_DEFAULT
@@ -105,8 +97,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_Draw::
delay 180 delay 180
applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit applymovement LOCALID_REFEREE, BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit
waitmovement 0 waitmovement 0
compare VAR_TEMP_2, DRAW_TUCKER @ Tucker always wins on a draw goto_if_eq VAR_TEMP_2, DRAW_TUCKER, BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent @ Tucker always wins on a draw
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent
dome_compareseeds dome_compareseeds
switch VAR_RESULT switch VAR_RESULT
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent
@@ -114,12 +105,9 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_LostToOpponent::
applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
dome_getopponentname dome_getopponentname
compare VAR_TEMP_2, NO_DRAW call_if_eq VAR_TEMP_2, NO_DRAW, BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon call_if_eq VAR_TEMP_2, DRAW_TRAINER, BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw
compare VAR_TEMP_2, DRAW_TRAINER call_if_eq VAR_TEMP_2, DRAW_TUCKER, BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw
compare VAR_TEMP_2, DRAW_TUCKER
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw
playse SE_M_ENCORE2 playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60 delay 60
@@ -130,13 +118,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobbyLost::
goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby goto BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby
BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon:: BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWon::
frontier_gettrainername 1 frontier_gettrainername STR_VAR_2
message BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner message BattleFrontier_BattleDomeBattleRoom_Text_TrainerIsWinner
waitmessage waitmessage
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw:: BattleFrontier_BattleDomeBattleRoom_EventScript_OpponentWonDraw::
frontier_gettrainername 0 frontier_gettrainername STR_VAR_1
message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer message BattleFrontier_BattleDomeBattleRoom_Text_RefereesDecidedWinnerTrainer
waitmessage waitmessage
return return
@@ -149,10 +137,8 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerWonDraw::
BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent:: BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent::
applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown applymovement LOCALID_ANNOUNCER, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
compare VAR_TEMP_2, NO_DRAW call_if_eq VAR_TEMP_2, NO_DRAW, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWon call_if_eq VAR_TEMP_2, DRAW_TRAINER, BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw
compare VAR_TEMP_2, DRAW_TRAINER
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw
playse SE_M_ENCORE2 playse SE_M_ENCORE2
call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround call BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround
delay 60 delay 60
@@ -164,7 +150,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_DefeatedOpponent::
switch VAR_RESULT switch VAR_RESULT
case DOME_ROUNDS_COUNT, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney case DOME_ROUNDS_COUNT, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 3 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 5, 3
waitstate waitstate
BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney:: BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney::
@@ -196,14 +182,11 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_PlayerWonDraw::
BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer:: BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayer::
dome_get DOME_DATA_ATTEMPTED_CHALLENGE dome_get DOME_DATA_ATTEMPTED_CHALLENGE
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerFirstAttempt
dome_get DOME_DATA_HAS_WON_CHALLENGE dome_get DOME_DATA_HAS_WON_CHALLENGE
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWon
dome_get DOME_DATA_WIN_STREAK_ACTIVE dome_get DOME_DATA_WIN_STREAK_ACTIVE
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerBrokenStreak
goto BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion goto BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion
return return
@@ -266,8 +249,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerNeverWonFinal::
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion:: BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampion::
compare VAR_TEMP_F, DOME_FINAL goto_if_ne VAR_TEMP_F, DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerChampionNoTucker
switch VAR_TEMP_E switch VAR_TEMP_E
case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver case FRONTIER_BRAIN_SILVER, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerSilver
case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold case FRONTIER_BRAIN_GOLD, BattleFrontier_BattleDomeBattleRoom_EventScript_AnnouncePlayerPreTuckerGold
@@ -387,8 +369,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerEnter::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver
msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerSilverIntro, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver:: BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver::
@@ -401,8 +382,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver::
msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT
dome_resolvewinners DOME_PLAYER_WON_MATCH dome_resolvewinners DOME_PLAYER_WON_MATCH
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
closemessage closemessage
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
waitmovement 0 waitmovement 0
@@ -417,8 +397,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerSilver::
BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro:: BattleFrontier_BattleDomeBattleRoom_EventScript_TuckerGoldIntro::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold
msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_TuckerGoldIntro, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold:: BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold::
@@ -431,8 +410,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_BattleTuckerGold::
msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_IncredibleVictorIsPlayer, MSGBOX_DEFAULT
dome_resolvewinners DOME_PLAYER_WON_MATCH dome_resolvewinners DOME_PLAYER_WON_MATCH
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_WonTourney
closemessage closemessage
applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer applymovement LOCALID_OPPONENT, BattleFrontier_BattleDomeBattleRoom_Movement_TuckerApproachPlayer
waitmovement 0 waitmovement 0
@@ -490,12 +468,10 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_SetUpObjects::
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, DOME_FINAL goto_if_ne VAR_RESULT, DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
goto_if_ne BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_E, VAR_RESULT copyvar VAR_TEMP_E, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects
call BattleFrontier_EventScript_SetBrainObjectGfx call BattleFrontier_EventScript_SetBrainObjectGfx
setobjectxyperm LOCALID_OPPONENT, 13, 9 setobjectxyperm LOCALID_OPPONENT, 13, 9
removeobject LOCALID_OPPONENT removeobject LOCALID_OPPONENT
@@ -505,8 +481,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_EndSetUpObjects::
end end
BattleFrontier_BattleDomeBattleRoom_OnResume: BattleFrontier_BattleDomeBattleRoom_OnResume:
compare VAR_TEMP_9, 1 call_if_eq VAR_TEMP_9, 1, BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience
end end
BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience:: BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience::
@@ -515,90 +490,86 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_CallAddAudience::
@ Add audience members to supplement the permanent object event audience @ Add audience members to supplement the permanent object event audience
BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience:: BattleFrontier_BattleDomeBattleRoom_EventScript_AddAudience::
compare VAR_TEMP_F, DOME_ROUND1 call_if_eq VAR_TEMP_F, DOME_ROUND1, BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience call_if_eq VAR_TEMP_F, DOME_ROUND2, BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience
compare VAR_TEMP_F, DOME_ROUND2 call_if_eq VAR_TEMP_F, DOME_SEMIFINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience call_if_eq VAR_TEMP_F, DOME_FINAL, BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience
compare VAR_TEMP_F, DOME_SEMIFINAL
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience
compare VAR_TEMP_F, DOME_FINAL
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience:: BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound1Audience::
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience:: BattleFrontier_BattleDomeBattleRoom_EventScript_AddRound2Audience::
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience:: BattleFrontier_BattleDomeBattleRoom_EventScript_AddSemifinalAudience::
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0
createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0
createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 0
createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1
createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1
createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1
createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2
createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1
createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2
createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience:: BattleFrontier_BattleDomeBattleRoom_EventScript_AddFinalAudience::
createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 0, 2, 0
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 1, 3, 0
createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 2, 15, 0
createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 3, 5, 0
createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 4, 6, 0
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 5, 7, 0
createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 6, 8, 0
createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 7, 9, 0
createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_3, 8, 10, 0
createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_GIRL, 9, 11, 0
createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LASS, 10, 12, 0
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 11, 13, 0
createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 12, 14, 0
createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_5, 13, 15, 2
createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HIKER, 14, 12, 2
createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 15, 2, 1
createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_NINJA_BOY, 16, 3, 1
createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_2, 17, 4, 1
createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_3, 18, 6, 1
createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_BEAUTY, 19, 7, 1
createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_EXPERT_F, 20, 9, 1
createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MAN_2, 21, 10, 1
createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 22, 11, 1
createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCIENTIST_1, 23, 13, 1
createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_GENTLEMAN, 24, 14, 1
createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_LITTLE_BOY, 25, 15, 1
createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_YOUNGSTER, 26, 2, 2
createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_FAT_MAN, 27, 3, 2
createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_HEX_MANIAC, 28, 5, 2
createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_SCHOOL_KID_M, 29, 5, 1
createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_MART_EMPLOYEE, 30, 6, 2
createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2, 3, DIR_SOUTH createvobject OBJ_EVENT_GFX_WOMAN_5, 31, 8, 2
return return
BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible: BattleFrontier_BattleDomeBattleRoom_Movement_SetInvisible:
@@ -758,7 +729,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance:
delay_16 delay_16
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
@@ -800,7 +771,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerMoveForTuckerEntrance:
delay_16 delay_16
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward: BattleFrontier_BattleDomeBattleRoom_Movement_TuckerStepForward:
@@ -883,14 +854,13 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_AudienceLookAround::
BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby:: BattleFrontier_BattleDomeBattleRoom_EventScript_WarpToLobby::
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, FRONTIER_MODE_DOUBLES goto_if_eq VAR_RESULT, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 5, 11
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 5, 11
waitstate waitstate
end end
BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles:: BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles::
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 255, 17, 11 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY, 17, 11
waitstate waitstate
end end
@@ -898,15 +868,13 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_WarpToLobbyDoubles::
BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos:: BattleFrontier_BattleDomeBattleRoom_EventScript_SetWalkingAudienceMemberPos::
random 2 random 2
copyvar VAR_TEMP_D, VAR_RESULT copyvar VAR_TEMP_D, VAR_RESULT
compare VAR_TEMP_D, 0 goto_if_eq VAR_TEMP_D, 0, Common_EventScript_NopReturn
goto_if_eq Common_EventScript_NopReturn
setobjectxyperm LOCALID_AUDIENCE_WALKING, 2, 0 setobjectxyperm LOCALID_AUDIENCE_WALKING, 2, 0
setobjectmovementtype LOCALID_AUDIENCE_WALKING, MOVEMENT_TYPE_FACE_RIGHT setobjectmovementtype LOCALID_AUDIENCE_WALKING, MOVEMENT_TYPE_FACE_RIGHT
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat:: BattleFrontier_BattleDomeBattleRoom_EventScript_TryDoAudienceMemberWalkToSeat::
compare VAR_TEMP_D, 0 goto_if_eq VAR_TEMP_D, 0, Common_EventScript_NopReturn
goto_if_eq Common_EventScript_NopReturn
applymovement LOCALID_AUDIENCE_WALKING, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat applymovement LOCALID_AUDIENCE_WALKING, BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat
return return
@@ -936,7 +904,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_AudienceMemberWalkToSeat:
walk_down walk_down
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter: BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter:
@@ -947,7 +915,7 @@ BattleFrontier_BattleDomeBattleRoom_Movement_RefereeEnter:
step_end step_end
BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft: BattleFrontier_BattleDomeBattleRoom_Movement_AnnouncerFaceLeft:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit: BattleFrontier_BattleDomeBattleRoom_Movement_RefereeExit:
data/maps/BattleFrontier_BattleDomeCorridor/scripts.inc
+4 -5
View File
@@ -12,8 +12,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_EnterCorridor::
delay 16 delay 16
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
frontier_get FRONTIER_DATA_LVL_MODE frontier_get FRONTIER_DATA_LVL_MODE
compare VAR_RESULT, FRONTIER_LVL_OPEN goto_if_eq VAR_RESULT, FRONTIER_LVL_OPEN, BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
goto_if_eq BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50 applymovement LOCALID_ATTENDANT, BattleFrontier_BattleDomeCorridor_Movement_AttendantWalkToDoorLv50
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50 applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50
waitmovement 0 waitmovement 0
@@ -40,7 +39,7 @@ BattleFrontier_BattleDomeCorridor_EventScript_WalkToBattleRoomLvOpen::
BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom:: BattleFrontier_BattleDomeCorridor_EventScript_WarpToPreBattleRoom::
waitmovement 0 waitmovement 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 255, 5, 7 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM, 5, 7
waitstate waitstate
end end
@@ -56,7 +55,7 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLv50:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50: BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLv50:
@@ -100,7 +99,7 @@ BattleFrontier_BattleDomeCorridor_Movement_PlayerWalkToDoorLvOpen:
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen: BattleFrontier_BattleDomeCorridor_Movement_PlayerEnterDoorLvOpen:
data/maps/BattleFrontier_BattleDomeLobby/scripts.inc
+24 -47
View File
@@ -48,8 +48,7 @@ BattleFrontier_BattleDomeLobby_EventScript_WonChallenge::
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_DefeatedAce
msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_CongratsForWinningTourney, MSGBOX_DEFAULT
goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattleDomeLobby_EventScript_GiveBattlePoints
@@ -88,8 +87,7 @@ BattleFrontier_BattleDomeLobby_EventScript_AskRecordBattle::
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_EndChallenge
message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch message BattleFrontier_BattleDomeLobby_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -137,15 +135,11 @@ BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendant::
BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome:: BattleFrontier_BattleDomeLobby_EventScript_AttendantWelcome::
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeSingles call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_WelcomeDoubles
BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge:: BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeSinglesChallenge call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_TakeDoublesChallenge
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT switch VAR_RESULT
@@ -162,8 +156,7 @@ BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleDomeLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleDomeLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -172,8 +165,7 @@ BattleFrontier_BattleDomeLobby_EventScript_TryEnterChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO msgbox BattleFrontier_BattleDomeLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge case NO, BattleFrontier_BattleDomeLobby_EventScript_LoadPartyCancelChallenge
@@ -191,8 +183,7 @@ BattleFrontier_BattleDomeLobby_EventScript_SaveBeforeChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleDomeLobby_EventScript_CancelChallengeSaveFailed
dome_inittrainers dome_inittrainers
BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge:: BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge::
special SavePlayerParty special SavePlayerParty
@@ -202,16 +193,14 @@ BattleFrontier_BattleDomeLobby_EventScript_EnterChallenge::
closemessage closemessage
call BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor call BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor
special HealPlayerParty special HealPlayerParty
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 255, 23, 6 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR, 23, 6
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge:: BattleFrontier_BattleDomeLobby_EventScript_ExplainChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainSinglesChallenge call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_ExplainDoublesChallenge
goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge goto BattleFrontier_BattleDomeLobby_EventScript_AskTakeChallenge
BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons:: BattleFrontier_BattleDomeLobby_EventScript_NotEnoughValidMons::
@@ -240,27 +229,19 @@ BattleFrontier_BattleDomeLobby_EventScript_EndCancelChallenge::
end end
BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor:: BattleFrontier_BattleDomeLobby_EventScript_WalkToDoor::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantWalkToDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenSinglesDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_OpenDoublesDoor
waitdooranim waitdooranim
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_SinglesAttendantEnterDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_DoublesAttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomeLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseSinglesDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_CloseDoublesDoor
waitdooranim waitdooranim
return return
@@ -357,14 +338,10 @@ BattleFrontier_BattleDomeLobby_EventScript_ShowDoublesResults::
BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree:: BattleFrontier_BattleDomeLobby_EventScript_ShowPrevTourneyTree::
dome_get DOME_DATA_PREV_TOURNEY_TYPE dome_get DOME_DATA_PREV_TOURNEY_TYPE
compare VAR_RESULT, 0 call_if_eq VAR_RESULT, 0, BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLv50 call_if_eq VAR_RESULT, 1, BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 2, BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLv50 call_if_eq VAR_RESULT, 3, BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen
compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsSinglesLvOpen
compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattleDomeLobby_EventScript_PrevTourneyResultsDoublesLvOpen
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
dome_showprevtourneytree dome_showprevtourneytree
waitstate waitstate
data/maps/BattleFrontier_BattleDomePreBattleRoom/scripts.inc
+4 -7
View File
@@ -19,8 +19,7 @@ BattleFrontier_BattleDomePreBattleRoom_OnFrame:
.2byte 0 .2byte 0
BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleDomePreBattleRoom_EventScript_EnterRoom::
compare VAR_0x8006, 1 goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_ReturnFromBattle
frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE frontier_set FRONTIER_DATA_RECORD_DISABLED, TRUE
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleDomePreBattleRoom_Movement_PlayerEnter
@@ -31,8 +30,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound::
waitmessage waitmessage
switch VAR_RESULT @ No case? switch VAR_RESULT @ No case?
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRoundNoRecord
multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, TRUE multichoice 16, 0, MULTI_TOURNEY_WITH_RECORD, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo case 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_ShowOpponentInfo
@@ -146,8 +144,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge::
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
frontier_resetsketch frontier_resetsketch
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
goto_if_eq BattleFrontier_BattleDomePreBattleRoom_EventScript_AskReadyForNextRound
dome_set DOME_DATA_SELECTED_MONS dome_set DOME_DATA_SELECTED_MONS
dome_reduceparty dome_reduceparty
dome_setopponent dome_setopponent
@@ -163,7 +160,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_ContinueChallenge::
waitmovement 0 waitmovement 0
closedoor 5, 1 closedoor 5, 1
waitdooranim waitdooranim
warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 255, 9, 5 warp MAP_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM, 9, 5
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+25 -41
View File
@@ -19,14 +19,11 @@ BattleFrontier_BattleFactoryBattleRoom_MapScripts::
BattleFrontier_BattleFactoryBattleRoom_OnTransition: BattleFrontier_BattleFactoryBattleRoom_OnTransition:
frontier_settrainers frontier_settrainers
checkplayergender checkplayergender
compare VAR_RESULT, MALE call_if_eq VAR_RESULT, MALE, BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxMale call_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale
compare VAR_RESULT, FEMALE
call_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_SetPlayerGfxFemale
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj:: BattleFrontier_BattleFactoryBattleRoom_EventScript_SetUpFactoryHeadObj::
@@ -41,8 +38,7 @@ BattleFrontier_BattleFactoryBattleRoom_OnWarp:
BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects:: BattleFrontier_BattleFactoryBattleRoom_EventScript_HideObjects::
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat OBJ_EVENT_ID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects
hideobjectat LOCALID_OPPONENT, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM hideobjectat LOCALID_OPPONENT, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM
BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects:: BattleFrontier_BattleFactoryBattleRoom_EventScript_EndHideObjects::
end end
@@ -71,8 +67,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle::
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom::
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoomFactoryHeadBattle
applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
@@ -84,8 +79,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_EnterRoom::
applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter applymovement LOCALID_OPPONENT, BattleFrontier_BattleFactoryBattleRoom_Movement_OpponentEnter
waitmovement 0 waitmovement 0
BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent:: BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleOpponent::
compare VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_TEMP_F, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland
palace_getopponentintro palace_getopponentintro
lockall lockall
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@@ -105,8 +99,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost::
BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent:: BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedOpponent::
factory_get FACTORY_DATA_WIN_STREAK_SWAPS factory_get FACTORY_DATA_WIN_STREAK_SWAPS
compare VAR_RESULT, MAX_STREAK goto_if_eq VAR_RESULT, MAX_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT setorcopyvar VAR_0x8006, VAR_RESULT
factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above
@@ -119,7 +112,7 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum::
switch VAR_RESULT switch VAR_RESULT
case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon case 7, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 8 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 8, 8
waitstate waitstate
BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon:: BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyWon::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
@@ -131,21 +124,18 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNoland::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandImFactoryHead, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver:: BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandSilver::
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_ShakeOutKnowledgeBringItOn, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver:: BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_NolandLetsSeeFrontierPass, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
@@ -160,21 +150,18 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandSilver::
BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold:: BattleFrontier_BattleFactoryBattleRoom_EventScript_IntroNolandGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
goto_if_ne BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_HarderLookThanLastTime, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold:: BattleFrontier_BattleFactoryBattleRoom_EventScript_BattleNolandGold::
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_AllRightBringItOn, MSGBOX_DEFAULT
call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle call BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold
goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost goto BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyLost
BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold:: BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNolandGold::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland
msgbox BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryBattleRoom_Text_OutOfMyLeagueLetsSeePass, MSGBOX_DEFAULT
waitmessage waitmessage
applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland applymovement LOCALID_PLAYER, BattleFrontier_BattleFactoryBattleRoom_Movement_PlayerApproachNoland
@@ -199,14 +186,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_DoNolandBattle::
BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland:: BattleFrontier_BattleFactoryBattleRoom_EventScript_DefeatedNoland::
factory_get FACTORY_DATA_WIN_STREAK_SWAPS factory_get FACTORY_DATA_WIN_STREAK_SWAPS
compare VAR_RESULT, MAX_STREAK goto_if_eq VAR_RESULT, MAX_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementWinStreak
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setorcopyvar VAR_0x8006, VAR_RESULT setorcopyvar VAR_0x8006, VAR_RESULT
factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above factory_set FACTORY_DATA_WIN_STREAK_SWAPS @ uses VAR_0x8006 above
factory_get FACTORY_DATA_WIN_STREAK factory_get FACTORY_DATA_WIN_STREAK
compare VAR_RESULT, MAX_STREAK goto_if_eq VAR_RESULT, MAX_STREAK, BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_IncrementBattleNum
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
factory_set FACTORY_DATA_WIN_STREAK, VAR_RESULT factory_set FACTORY_DATA_WIN_STREAK, VAR_RESULT
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
@@ -245,24 +230,23 @@ BattleFrontier_BattleFactoryBattleRoom_Movement_NolandMoveToBattle:
BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby:: BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobby::
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, FRONTIER_MODE_DOUBLES goto_if_eq VAR_RESULT, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles
goto_if_eq BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 4, 8
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 4, 8
waitstate waitstate
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles:: BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles::
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 255, 14, 8 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY, 14, 8
waitstate waitstate
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle:: BattleFrontier_BattleFactoryBattleRoom_EventScript_ScientistsFaceBattle::
applymovement LOCALID_SCIENTIST_1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_SCIENTIST_1, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_SCIENTIST_2, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_SCIENTIST_2, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_SCIENTIST_3, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_SCIENTIST_3, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_SCIENTIST_4, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_SCIENTIST_4, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SCIENTIST_5, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_SCIENTIST_5, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_SCIENTIST_6, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_SCIENTIST_6, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
data/maps/BattleFrontier_BattleFactoryLobby/scripts.inc
+12 -23
View File
@@ -43,8 +43,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_QuitWithoutSaving::
BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge:: BattleFrontier_BattleFactoryLobby_EventScript_WonChallenge::
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_DefeatedFactoryHead
msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryLobby_Text_CongratsSevenWins, MSGBOX_DEFAULT
waitmessage waitmessage
goto BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattleFactoryLobby_EventScript_GiveBattlePoints
@@ -79,8 +78,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_LostChallenge::
BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle:: BattleFrontier_BattleFactoryLobby_EventScript_AskRecordBattle::
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_EndRecordBattle
message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch message BattleFrontier_BattleFactoryLobby_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -126,15 +124,11 @@ BattleFrontier_BattleFactoryLobby_EventScript_DoublesAttendant::
BattleFrontier_BattleFactoryLobby_EventScript_Attendant:: BattleFrontier_BattleFactoryLobby_EventScript_Attendant::
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForSingleBattle call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_WelcomeForDoubleBattle
BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge:: BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeSinglesChallenge call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TakeDoublesChallenge
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT switch VAR_RESULT
@@ -167,21 +161,18 @@ BattleFrontier_BattleFactoryLobby_EventScript_SaveBeforeChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge:: BattleFrontier_BattleFactoryLobby_EventScript_EnterChallenge::
special SavePlayerParty special SavePlayerParty
msgbox BattleFrontier_BattleFactoryLobby_Text_StepThisWay, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryLobby_Text_StepThisWay, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToSinglesAttendant call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattleFactoryLobby_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 255, 8, 13 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM, 8, 13
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
@@ -195,10 +186,8 @@ BattleFrontier_BattleFactoryLobby_EventScript_TalkedToDoublesAttendant::
return return
BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge:: BattleFrontier_BattleFactoryLobby_EventScript_ExplainChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainSinglesChallenge call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattleFactoryLobby_EventScript_ExplainDoublesChallenge
goto BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge goto BattleFrontier_BattleFactoryLobby_EventScript_AskTakeChallenge
BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed:: BattleFrontier_BattleFactoryLobby_EventScript_CancelChallengeSaveFailed::
data/maps/BattleFrontier_BattleFactoryPreBattleRoom/scripts.inc
+44 -87
View File
@@ -11,8 +11,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_OnWarp:
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SetUpObjects::
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
compare VAR_0x8006, 1 goto_if_ne VAR_0x8006, 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth
goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth
setobjectxy LOCALID_ATTENDANT, 8, 7 setobjectxy LOCALID_ATTENDANT, 8, 7
turnobject LOCALID_ATTENDANT, DIR_SOUTH turnobject LOCALID_ATTENDANT, DIR_SOUTH
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_TurnPlayerNorth::
@@ -24,14 +23,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_OnFrame:
.2byte 0 .2byte 0
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterRoom::
compare VAR_0x8006, 1 goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom applymovement LOCALID_ATTENDANT, BattleFrontier_BattleFactoryPreBattleRoom_Movement_AttendantEnterRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleFactoryPreBattleRoom_Movement_PlayerEnterRoom
waitmovement 0 waitmovement 0
compare VAR_0x8006, 2 goto_if_eq VAR_0x8006, 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge
factory_generaterentalmons factory_generaterentalmons
factory_generateopponentmons factory_generateopponentmons
factory_getopponentmontype factory_getopponentmontype
@@ -49,12 +46,10 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom::
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_RightThisWay, MSGBOX_DEFAULT
closemessage closemessage
call BattleFrontier_EventScript_GetLvlMode call BattleFrontier_EventScript_GetLvlMode
compare VAR_RESULT, FRONTIER_LVL_50 call_if_eq VAR_RESULT, FRONTIER_LVL_50, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLv50 call_if_eq VAR_RESULT, FRONTIER_LVL_OPEN, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen
compare VAR_RESULT, FRONTIER_LVL_OPEN
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_WalkToBattleRoomLvOpen
waitmovement 0 waitmovement 0
warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 255, 6, 11 warp MAP_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM, 6, 11
waitstate waitstate
end end
@@ -66,8 +61,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle::
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent
playse SE_POKENAV_CALL playse SE_POKENAV_CALL
waitse waitse
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_WaitFewMoments, MSGBOX_DEFAULT
@@ -86,25 +80,17 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReturnToRoomFromBattle::
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponent::
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
goto_if_ne BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForRegularOpponent::
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 1, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor2ndOpponent call_if_eq VAR_RESULT, 2, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 3, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor3rdOpponent call_if_eq VAR_RESULT, 4, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 3 call_if_eq VAR_RESULT, 5, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor4thOpponent call_if_eq VAR_RESULT, 6, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent
compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 5
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapMon
@@ -168,8 +154,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_SwapMons::
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
factory_swapmons factory_swapmons
waitstate waitstate
compare VAR_RESULT, TRUE @ Did player keep current pokemon goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom @ Did player keep current pokemon
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
factory_setswapped factory_setswapped
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_YourSwapIsComplete, MSGBOX_DEFAULT
goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom goto BattleFrontier_BattleFactoryPreBattleRoom_EventScript_EnterBattleRoom
@@ -223,42 +208,24 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_ResumeChallenge::
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentType::
msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent, MSGBOX_DEFAULT msgbox BattleFrontier_BattleFactoryPreBattleRoom_Text_InvestigatedUpcomingOpponent, MSGBOX_DEFAULT
compare VAR_0x8005, TYPE_NORMAL call_if_eq VAR_0x8005, TYPE_NORMAL, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal call_if_eq VAR_0x8005, TYPE_FIGHTING, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting
compare VAR_0x8005, TYPE_FIGHTING call_if_eq VAR_0x8005, TYPE_FLYING, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFighting call_if_eq VAR_0x8005, TYPE_POISON, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison
compare VAR_0x8005, TYPE_FLYING call_if_eq VAR_0x8005, TYPE_GROUND, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFlying call_if_eq VAR_0x8005, TYPE_ROCK, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock
compare VAR_0x8005, TYPE_POISON call_if_eq VAR_0x8005, TYPE_BUG, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPoison call_if_eq VAR_0x8005, TYPE_GHOST, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost
compare VAR_0x8005, TYPE_GROUND call_if_eq VAR_0x8005, TYPE_STEEL, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGround call_if_eq VAR_0x8005, TYPE_FIRE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire
compare VAR_0x8005, TYPE_ROCK call_if_eq VAR_0x8005, TYPE_WATER, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesRock call_if_eq VAR_0x8005, TYPE_GRASS, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass
compare VAR_0x8005, TYPE_BUG call_if_eq VAR_0x8005, TYPE_ELECTRIC, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesBug call_if_eq VAR_0x8005, TYPE_PSYCHIC, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic
compare VAR_0x8005, TYPE_GHOST call_if_eq VAR_0x8005, TYPE_ICE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGhost call_if_eq VAR_0x8005, TYPE_DRAGON, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon
compare VAR_0x8005, TYPE_STEEL call_if_eq VAR_0x8005, TYPE_DARK, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesSteel call_if_eq VAR_0x8005, NUMBER_OF_MON_TYPES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType
compare VAR_0x8005, TYPE_FIRE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesFire
compare VAR_0x8005, TYPE_WATER
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesWater
compare VAR_0x8005, TYPE_GRASS
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesGrass
compare VAR_0x8005, TYPE_ELECTRIC
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesElectric
compare VAR_0x8005, TYPE_PSYCHIC
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesPsychic
compare VAR_0x8005, TYPE_ICE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesIce
compare VAR_0x8005, TYPE_DRAGON
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDragon
compare VAR_0x8005, TYPE_DARK
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesDark
compare VAR_0x8005, NUMBER_OF_MON_TYPES
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonType
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentUsesNormal::
@@ -334,24 +301,15 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_OpponentHasNoMostCommonTyp
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_CommentOnOpponentStyle::
compare VAR_0x8006, FACTORY_STYLE_NONE call_if_eq VAR_0x8006, FACTORY_STYLE_NONE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained call_if_eq VAR_0x8006, FACTORY_STYLE_PREPARATION, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation
compare VAR_0x8006, FACTORY_STYLE_PREPARATION call_if_eq VAR_0x8006, FACTORY_STYLE_SLOW_STEADY, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleTotalPreparation call_if_eq VAR_0x8006, FACTORY_STYLE_ENDURANCE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance
compare VAR_0x8006, FACTORY_STYLE_SLOW_STEADY call_if_eq VAR_0x8006, FACTORY_STYLE_HIGH_RISK, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleSlowAndSteady call_if_eq VAR_0x8006, FACTORY_STYLE_WEAKENING, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe
compare VAR_0x8006, FACTORY_STYLE_ENDURANCE call_if_eq VAR_0x8006, FACTORY_STYLE_UNPREDICTABLE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleEndurance call_if_eq VAR_0x8006, FACTORY_STYLE_WEATHER, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow
compare VAR_0x8006, FACTORY_STYLE_HIGH_RISK call_if_eq VAR_0x8006, FACTORY_NUM_STYLES, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleHighRisk
compare VAR_0x8006, FACTORY_STYLE_WEAKENING
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleWeakenFoe
compare VAR_0x8006, FACTORY_STYLE_UNPREDICTABLE
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleImpossibleToPredict
compare VAR_0x8006, FACTORY_STYLE_WEATHER
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleDependsOnFlow
compare VAR_0x8006, FACTORY_NUM_STYLES
call_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleFlexible
return return
BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained:: BattleFrontier_BattleFactoryPreBattleRoom_EventScript_StyleUnrestrained::
@@ -394,8 +352,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHead::
message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead message BattleFrontier_BattleFactoryPreBattleRoom_Text_PreparedToFaceHead
waitmessage waitmessage
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
goto_if_eq BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskReadyForHeadNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead case 0, BattleFrontier_BattleFactoryPreBattleRoom_EventScript_AskSwapBeforeHead
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+28 -48
View File
@@ -21,10 +21,8 @@ BattleFrontier_BattlePalaceBattleRoom_OnTransition:
BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx:: BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfx::
checkplayergender checkplayergender
compare VAR_RESULT, MALE goto_if_eq VAR_RESULT, MALE, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxMale goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale
compare VAR_RESULT, FEMALE
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_SetPlayerGfxFemale
return return
@ The opponent's gfx are set to the players by default @ The opponent's gfx are set to the players by default
@@ -45,8 +43,7 @@ BattleFrontier_BattlePalaceBattleRoom_OnFrame:
BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom:: BattleFrontier_BattlePalaceBattleRoom_EventScript_EnterRoom::
showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM showobjectat LOCALID_PLAYER, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_BeginChallenge
applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_PlayerReturnToChallenge
waitmovement 0 waitmovement 0
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
@@ -95,24 +92,16 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedOpponent::
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent:: BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponent::
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor2ndOpponent call_if_eq VAR_RESULT, 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 3, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor3rdOpponent call_if_eq VAR_RESULT, 4, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 3 call_if_eq VAR_RESULT, 5, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor4thOpponent call_if_eq VAR_RESULT, 6, BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent
compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor5thOpponent
compare VAR_RESULT, 5
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor6thOpponent
compare VAR_RESULT, 6
call_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_ReadyFor7thOpponent
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_ContinueChallenge
@@ -179,16 +168,14 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_PauseChallenge::
end end
BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext:: BattleFrontier_BattlePalaceBattleRoom_EventScript_MavenUpNext::
compare VAR_TEMP_2, 1 goto_if_eq VAR_TEMP_2, 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ChallengingPalaceMaven, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven:: BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMaven::
message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven message BattleFrontier_BattlePalaceBattleRoom_Text_ReadyForPalaceMaven
waitmessage waitmessage
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_AskReadyForMavenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser case 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser
@@ -225,22 +212,19 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenser::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserFirstIntro, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver:: BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserSilver::
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_ProveYourBondWithMons, MSGBOX_DEFAULT
call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver:: BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver::
palace_incrementstreak palace_incrementstreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserPostSilverBattle, MSGBOX_DEFAULT
applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
@@ -252,30 +236,27 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserSilver::
frontier_givesymbol frontier_givesymbol
applymovement LOCALID_OPPONENT, Common_Movement_WalkInPlaceLeft applymovement LOCALID_OPPONENT, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserAwaitNextTime, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold:: BattleFrontier_BattlePalaceBattleRoom_EventScript_IntroSpenserGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
goto_if_ne BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserThisTimeWontHoldBack, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold:: BattleFrontier_BattlePalaceBattleRoom_EventScript_BattleSpenserGold::
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_Kaaah, MSGBOX_DEFAULT
call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle call BattleFrontier_BattlePalaceBattleRoom_EventScript_DoPalaceBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyLost
BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold:: BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold::
palace_incrementstreak palace_incrementstreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserYourTeamIsAdmirable, MSGBOX_DEFAULT
applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp applymovement LOCALID_PLAYER, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceUp
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceBattleRoom_Movement_FaceDown
@@ -287,8 +268,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_DefeatedSpenserGold::
frontier_givesymbol frontier_givesymbol
applymovement LOCALID_OPPONENT, Common_Movement_WalkInPlaceLeft applymovement LOCALID_OPPONENT, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_SpenserComeSeeMeAgain, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon goto BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyWon
@@ -417,14 +398,13 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_UnusedOpponentEnter3:
BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby:: BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobby::
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, FRONTIER_MODE_DOUBLES goto_if_eq VAR_RESULT, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles
goto_if_eq BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 5, 7
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 5, 7
waitstate waitstate
end end
BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles:: BattleFrontier_BattlePalaceBattleRoom_EventScript_WarpToLobbyDoubles::
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 255, 19, 7 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY, 19, 7
waitstate waitstate
end end
@@ -435,7 +415,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_DusclopsEnter:
walk_down walk_down
walk_right walk_right
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter: BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter:
@@ -447,7 +427,7 @@ BattleFrontier_BattlePalaceBattleRoom_Movement_AzurillEnter:
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
step_end step_end
data/maps/BattleFrontier_BattlePalaceCorridor/scripts.inc
+7 -13
View File
@@ -15,20 +15,14 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkThroughCorridor::
waitmovement 0 waitmovement 0
lockall lockall
palace_getcomment palace_getcomment
compare VAR_RESULT, 0 call_if_eq VAR_RESULT, 0, BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment1 call_if_eq VAR_RESULT, 1, BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 2, BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment2 call_if_eq VAR_RESULT, 3, BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 4, BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_RandomComment3
compare VAR_RESULT, 3
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_StreakComment
compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_LongStreakComment
closemessage closemessage
frontier_get FRONTIER_DATA_LVL_MODE frontier_get FRONTIER_DATA_LVL_MODE
compare VAR_RESULT, FRONTIER_LVL_OPEN goto_if_eq VAR_RESULT, FRONTIER_LVL_OPEN, BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom
goto_if_eq BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePalaceCorridor_Movement_AttendantWalkTo50BattleRoom
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceCorridor_Movement_PlayerWalkTo50BattleRoom
waitmovement 0 waitmovement 0
@@ -53,7 +47,7 @@ BattleFrontier_BattlePalaceCorridor_EventScript_WalkToOpenBattleRoom::
closedoor 10, 3 closedoor 10, 3
waitdooranim waitdooranim
BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom:: BattleFrontier_BattlePalaceCorridor_EventScript_WarpToBattleRoom::
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 255, 7, 4 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM, 7, 4
waitstate waitstate
end end
data/maps/BattleFrontier_BattlePalaceLobby/scripts.inc
+18 -35
View File
@@ -41,8 +41,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_QuitWithoutSaving::
BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge:: BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge::
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_DefeatedMaven
msgbox BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_FirmTrueBondsFor7WinStreak, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattlePalaceLobby_EventScript_GiveBattlePoints
@@ -81,8 +80,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveAfterChallenge::
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_EndSaveAfterChallenge
message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch message BattleFrontier_BattlePalaceLobby_Text_LikeToRecordMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -126,18 +124,13 @@ BattleFrontier_BattlePalaceLobby_EventScript_DoublesAttendant::
BattleFrontier_BattlePalaceLobby_EventScript_Attendant:: BattleFrontier_BattlePalaceLobby_EventScript_Attendant::
palace_get PALACE_DATA_PRIZE palace_get PALACE_DATA_PRIZE
compare VAR_RESULT, ITEM_NONE goto_if_ne VAR_RESULT, ITEM_NONE, BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
goto_if_ne BattleFrontier_BattlePalaceLobby_EventScript_WonChallenge
special SavePlayerParty special SavePlayerParty
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForSingleBattle call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_WelcomeForDoubleBattle
BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge:: BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeSingleBattleChallenge call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge
waitmessage waitmessage
multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE multichoice 17, 6, MULTI_CHALLENGEINFO, FALSE
switch VAR_RESULT switch VAR_RESULT
@@ -154,8 +147,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_NowSelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -164,8 +156,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_TryEnterChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
msgbox BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2, MSGBOX_YESNO msgbox BattleFrontier_BattlePalaceLobby_Text_MustSaveBeforeChallenge2, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge case NO, BattleFrontier_BattlePalaceLobby_EventScript_LoadPartyAndCancelChallenge
@@ -184,22 +175,20 @@ BattleFrontier_BattlePalaceLobby_EventScript_SaveBeforeChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CancelChallengeSaveFailed
BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge:: BattleFrontier_BattlePalaceLobby_EventScript_EnterChallenge::
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_FollowMe, MSGBOX_DEFAULT
closemessage closemessage
call BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor call BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor
warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 255, 8, 13 warp MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR, 8, 13
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge:: BattleFrontier_BattlePalaceLobby_EventScript_ExplainChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge
goto_if_eq BattleFrontier_BattlePalaceLobby_EventScript_ExplainDoublesChallenge
msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceLobby_Text_ExplainSingleBattleChallenge, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge goto BattleFrontier_BattlePalaceLobby_EventScript_AskTakeChallenge
@@ -249,25 +238,19 @@ BattleFrontier_BattlePalaceLobby_EventScript_AskTakeDoubleBattleChallenge::
return return
BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor:: BattleFrontier_BattlePalaceLobby_EventScript_WalkToDoor::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToSinglesAttendant call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_TalkedToDoublesAttendant
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_WalkToDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenSinglesHallDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_OpenDoublesHallDoor
waitdooranim waitdooranim
applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor applymovement VAR_LAST_TALKED, BattleFrontier_BattlePalaceLobby_Movement_AttendantEnterDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattlePalaceLobby_Movement_PlayerEnterDoor
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseSinglesHallDoor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES
call_if_eq BattleFrontier_BattlePalaceLobby_EventScript_CloseDoublesHallDoor
waitdooranim waitdooranim
return return
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+1 -1
View File
@@ -25,7 +25,7 @@ BattleFrontier_BattlePikeCorridor_EventScript_EnterCorridor::
waitmovement 0 waitmovement 0
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 99
call BattleFrontier_BattlePike_EventScript_CloseCurtain call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 255, 6, 10 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM, 6, 10
waitstate waitstate
end end
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+5 -9
View File
@@ -41,8 +41,7 @@ BattleFrontier_BattlePikeLobby_EventScript_QuitWithoutSaving::
BattleFrontier_BattlePikeLobby_EventScript_WonChallenge:: BattleFrontier_BattlePikeLobby_EventScript_WonChallenge::
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_DefeatedQueen
msgbox BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeLobby_Text_PossessLuckInAbundance, MSGBOX_DEFAULT
waitmessage waitmessage
goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattlePikeLobby_EventScript_GiveBattlePoints
@@ -116,8 +115,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattlePikeLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeLobby_Text_PleaseChooseThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -126,8 +124,7 @@ BattleFrontier_BattlePikeLobby_EventScript_TryEnterChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
msgbox BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO msgbox BattleFrontier_BattlePikeLobby_Text_SaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge case NO, BattleFrontier_BattlePikeLobby_EventScript_LoadPartyAndCancelChallenge
@@ -149,8 +146,7 @@ BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge::
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
pike_savehelditems pike_savehelditems
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_CancelChallengeSaveFailed
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
msgbox BattleFrontier_BattlePikeLobby_Text_StepThisWay, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeLobby_Text_StepThisWay, MSGBOX_DEFAULT
@@ -159,7 +155,7 @@ BattleFrontier_BattlePikeLobby_EventScript_SaveBeforeChallenge::
call BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor call BattleFrontier_BattlePikeLobby_EventScript_WalkToCorridor
special HealPlayerParty special HealPlayerParty
call BattleFrontier_BattlePike_EventScript_CloseCurtain call BattleFrontier_BattlePike_EventScript_CloseCurtain
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 255, 6, 7 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR, 6, 7
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
data/maps/BattleFrontier_BattlePikeRoomFinal/scripts.inc
+1 -1
View File
@@ -18,7 +18,7 @@ BattleFrontier_BattlePikeRoomFinal_EventScript_EnterRoom::
msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomFinal_Text_CongratsThisWayPlease, MSGBOX_DEFAULT
closemessage closemessage
releaseall releaseall
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
waitstate waitstate
end end
data/maps/BattleFrontier_BattlePikeRoomNormal/scripts.inc
+51 -67
View File
@@ -44,7 +44,7 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterSingleBattleRoom::
case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle case 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WonSingleBattle
BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost:: BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
waitstate waitstate
end end
@@ -137,21 +137,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_LucyEnter::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_ImThePikeQueen, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver:: BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucySilver::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_HopeYouDidntUseUpLuck, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver
goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver:: BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyShowMeFrontierPass, MSGBOX_DEFAULT
waitmessage waitmessage
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
@@ -165,21 +162,18 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucySilver::
BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold:: BattleFrontier_BattlePikeRoomNormal_EventScript_IntroLucyGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
goto_if_ne BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyYouAgain, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold:: BattleFrontier_BattlePikeRoomNormal_EventScript_BattleLucyGold::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_NowComeOn, MSGBOX_DEFAULT
call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle call BattleFrontier_BattlePikeRoomNormal_EventScript_DoPikeQueenBattle
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold
goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePikeRoomNormal_EventScript_WarpToLobbyLost
BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold:: BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucyGold::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
goto_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DefeatedLucy
msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_LucyFrontierPass, MSGBOX_DEFAULT
waitmessage waitmessage
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
@@ -290,10 +284,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_EnterStatusRoom::
waitmovement 0 waitmovement 0
pike_getstatusmon pike_getstatusmon
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, PIKE_STATUSMON_KIRLIA call_if_eq VAR_0x8004, PIKE_STATUSMON_KIRLIA, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack call_if_eq VAR_0x8004, PIKE_STATUSMON_DUSCLOPS, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack
compare VAR_0x8004, PIKE_STATUSMON_DUSCLOPS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack
msgbox BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_AttacksWhenStartled, MSGBOX_DEFAULT
closemessage closemessage
releaseall releaseall
@@ -303,17 +295,13 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_KirliaStop, MSGBOX_DEFAULT
closemessage closemessage
waitse waitse
playmoncry SPECIES_KIRLIA, 0 playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
waitmoncry waitmoncry
pike_getstatus pike_getstatus
compare VAR_RESULT, PIKE_STATUS_TOXIC call_if_eq VAR_RESULT, PIKE_STATUS_TOXIC, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedToxic call_if_eq VAR_RESULT, PIKE_STATUS_BURN, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp
compare VAR_RESULT, PIKE_STATUS_BURN call_if_eq VAR_RESULT, PIKE_STATUS_PARALYSIS, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedWillOWisp call_if_eq VAR_RESULT, PIKE_STATUS_SLEEP, BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis
compare VAR_RESULT, PIKE_STATUS_PARALYSIS
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedThunderWave
compare VAR_RESULT, PIKE_STATUS_SLEEP
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaUsedHypnosis
pike_flashscreen pike_flashscreen
waitstate waitstate
applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
@@ -321,11 +309,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_KirliaAttack::
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_KIRLIA, 0 playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
waitmoncry waitmoncry
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
waitse waitse
playmoncry SPECIES_KIRLIA, 0 playmoncry SPECIES_KIRLIA, CRY_MODE_NORMAL
waitmoncry waitmoncry
closemessage closemessage
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
@@ -338,13 +326,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_DusclopsStop, MSGBOX_DEFAULT
closemessage closemessage
waitse waitse
playmoncry SPECIES_DUSCLOPS, 0 playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
waitmoncry waitmoncry
pike_getstatus pike_getstatus
compare VAR_RESULT, PIKE_STATUS_FREEZE call_if_eq VAR_RESULT, PIKE_STATUS_FREEZE, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedIceBeam call_if_eq VAR_RESULT, PIKE_STATUS_BURN, BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp
compare VAR_RESULT, PIKE_STATUS_BURN
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsUsedWillOWisp
pike_flashscreen pike_flashscreen
waitstate waitstate
applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon applymovement LOCALID_OBJ_0, BattleFrontier_BattlePikeRoomNormal_Movement_NPCApproachMon
@@ -352,11 +338,11 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_DusclopsAttack::
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonFaceNPC
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_DUSCLOPS, 0 playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
waitmoncry waitmoncry
msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_ThatsEnough, MSGBOX_DEFAULT
waitse waitse
playmoncry SPECIES_DUSCLOPS, 0 playmoncry SPECIES_DUSCLOPS, CRY_MODE_NORMAL
waitmoncry waitmoncry
closemessage closemessage
applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside applymovement LOCALID_OBJ_1, BattleFrontier_BattlePikeRoomNormal_Movement_MonMoveAside
@@ -569,10 +555,8 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusNPC::
BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC:: BattleFrontier_BattlePikeRoomNormal_EventScript_HealNPC::
pike_healonetwomons pike_healonetwomons
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 2, BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreTwoMons call_if_eq VAR_RESULT, 1, BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRoomNormal_EventScript_WillRestoreOneMon
playfanfare MUS_HEAL playfanfare MUS_HEAL
waitfanfare waitfanfare
msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeRoomNormal_Text_BestOfLuckFarewell, MSGBOX_DEFAULT
@@ -608,46 +592,46 @@ BattleFrontier_BattlePikeRoomNormal_EventScript_StatusMon::
end end
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed:: BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesMostlyClosed::
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, 1 setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage1_Tile0, TRUE
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, 1 setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage1_Tile1, TRUE
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, 1 setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage1_Tile2, TRUE
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, 1 setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage1_Tile3, TRUE
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, 1 setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage1_Tile4, TRUE
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, 0 setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage1_Tile5, FALSE
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, 1 setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage1_Tile6, TRUE
special DrawWholeMapView special DrawWholeMapView
return return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed:: BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesLittleClosed::
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, 1 setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage2_Tile0, TRUE
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, 1 setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage2_Tile1, TRUE
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, 1 setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage2_Tile2, TRUE
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, 1 setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage2_Tile3, TRUE
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, 1 setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage2_Tile4, TRUE
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, 0 setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage2_Tile5, FALSE
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, 1 setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage2_Tile6, TRUE
special DrawWholeMapView special DrawWholeMapView
return return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen:: BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesOpen::
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, 1 setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage3_Tile0, TRUE
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, 1 setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage3_Tile1, TRUE
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, 1 setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage3_Tile2, TRUE
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, 1 setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage3_Tile3, TRUE
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, 1 setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage3_Tile4, TRUE
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, 0 setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage3_Tile5, FALSE
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, 1 setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage3_Tile6, TRUE
special DrawWholeMapView special DrawWholeMapView
return return
BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed:: BattleFrontier_BattlePikeRoomNormal_EventScript_SetCurtainTilesClosed::
setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, 1 setmetatile 4, 1, METATILE_BattlePike_Curtain_Stage0_Tile0, TRUE
setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, 1 setmetatile 3, 2, METATILE_BattlePike_Curtain_Stage0_Tile1, TRUE
setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, 1 setmetatile 4, 2, METATILE_BattlePike_Curtain_Stage0_Tile2, TRUE
setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, 1 setmetatile 5, 2, METATILE_BattlePike_Curtain_Stage0_Tile3, TRUE
setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, 1 setmetatile 3, 3, METATILE_BattlePike_Curtain_Stage0_Tile4, TRUE
setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, 0 setmetatile 4, 3, METATILE_BattlePike_Curtain_Stage0_Tile5, FALSE
setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, 1 setmetatile 5, 3, METATILE_BattlePike_Curtain_Stage0_Tile6, TRUE
special DrawWholeMapView special DrawWholeMapView
return return
data/maps/BattleFrontier_BattlePikeRoomWildMons/scripts.inc
+3 -5
View File
@@ -16,7 +16,7 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_SetInWildMonRoom::
BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost:: BattleFrontier_BattlePikeRoomWildMons_EventScript_WarpToLobbyLost::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_LOST
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
waitstate waitstate
end end
@@ -32,10 +32,8 @@ BattleFrontier_BattlePikeRoomWildMons_EventScript_TurnPlayerNorth::
BattleFrontier_BattlePikeRoomWildMons_OnResume: BattleFrontier_BattlePikeRoomWildMons_OnResume:
call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves call BattleFrontier_BattlePikeRoom_EventScript_ResetSketchedMoves
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq VAR_RESULT, B_OUTCOME_LOST, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost goto_if_eq VAR_RESULT, B_OUTCOME_DREW, BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
compare VAR_RESULT, B_OUTCOME_DREW
goto_if_eq BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost
end end
BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost:: BattleFrontier_BattlePikeRoomWildMons_EventScript_SetLost::
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+3 -5
View File
@@ -28,7 +28,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GetChallengeStatus::
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby:: BattleFrontier_BattlePikeThreePathRoom_EventScript_WarpToLobby::
warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 255, 5, 6 warp MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY, 5, 6
waitstate waitstate
end end
@@ -151,8 +151,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_AskRetireChallenge::
BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom:: BattleFrontier_BattlePikeThreePathRoom_EventScript_SetHintRoom::
pike_sethintroom pike_sethintroom
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_SetPikeQueenHint
setvar VAR_TEMP_5, 255 setvar VAR_TEMP_5, 255
end end
@@ -173,8 +172,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_GivePikeQueenHint::
BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver:: BattleFrontier_BattlePikeThreePathRoom_EventScript_HintGiver::
pike_gethint pike_gethint
compare VAR_RESULT, PIKE_HINT_BRAIN goto_if_eq VAR_RESULT, PIKE_HINT_BRAIN, BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_GiveBrainHint
lock lock
faceplayer faceplayer
msgbox BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose, MSGBOX_YESNO msgbox BattleFrontier_BattlePikeThreePathRoom_Text_FindingItDifficultToChoose, MSGBOX_YESNO
data/maps/BattleFrontier_BattlePyramidFloor/scripts.inc
+12 -21
View File
@@ -21,8 +21,7 @@ BattleFrontier_BattlePyramidFloor_EventScript_UpdateLight::
BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop:: BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop::
special CallBattlePyramidFunction special CallBattlePyramidFunction
delay 2 delay 2
compare VAR_RESULT, 2 goto_if_ne VAR_RESULT, 2, BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop
goto_if_ne BattleFrontier_BattlePyramidFloor_EventScript_UpdateLightLoop
setvar VAR_TEMP_D, 0 setvar VAR_TEMP_D, 0
releaseall releaseall
end end
@@ -45,18 +44,12 @@ BattleFrontier_BattlePyramidFloor_OnResume:
case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidFloor_EventScript_ReadyChallenge
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_RAN, BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePyramidFloor_EventScript_ResetParty
goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty goto_if_eq VAR_RESULT, B_OUTCOME_LOST, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, B_OUTCOME_DREW, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
goto_if_eq BattleFrontier_BattlePyramidFloor_EventScript_ResetParty goto_if_eq VAR_RESULT, B_OUTCOME_FORFEITED, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, B_OUTCOME_LOST
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, B_OUTCOME_DREW
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, B_OUTCOME_FORFEITED
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here frontier_isbattletype BATTLE_TYPE_TRAINER @ VAR_RESULT seems to be ignored here
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidFloor_EventScript_ResetParty:: BattleFrontier_BattlePyramidFloor_EventScript_ResetParty::
@@ -70,7 +63,7 @@ BattleFrontier_BattlePyramid_EventScript_WarpToLobby::
pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS pyramid_updatelight 0, PYRAMID_LIGHT_SET_RADIUS
pyramid_clearhelditems pyramid_clearhelditems
special HealPlayerParty special HealPlayerParty
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 7, 13
waitstate waitstate
end end
@@ -97,17 +90,16 @@ BattlePyramid_WarpToNextFloor::
frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number frontier_get FRONTIER_DATA_BATTLE_NUM @ Floor number
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT frontier_set FRONTIER_DATA_BATTLE_NUM, VAR_RESULT
compare VAR_RESULT, 7 goto_if_eq VAR_RESULT, 7, BattlePyramid_WarpToTop
goto_if_eq BattlePyramid_WarpToTop
pyramid_seedfloor pyramid_seedfloor
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 1, 1
waitstate waitstate
end end
BattlePyramid_WarpToTop:: BattlePyramid_WarpToTop::
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 255, 17, 17 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP, 17, 17
waitstate waitstate
end end
@@ -124,8 +116,7 @@ BattlePyramid_TrainerBattle::
BattlePyramid_FindItemBall:: BattlePyramid_FindItemBall::
pyramid_setitem pyramid_setitem
callstd STD_FIND_ITEM callstd STD_FIND_ITEM
compare VAR_0x8007, 0 goto_if_eq VAR_0x8007, 0, BattlePyramid_FindItemBallEnd
goto_if_eq BattlePyramid_FindItemBallEnd
pyramid_hideitem pyramid_hideitem
BattlePyramid_FindItemBallEnd:: BattlePyramid_FindItemBallEnd::
end end
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+11 -21
View File
@@ -45,8 +45,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_QuitWithoutSaving::
BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge:: BattleFrontier_BattlePyramidLobby_EventScript_WonChallenge::
lockall lockall
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing
msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_YouveConqueredPyramid, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints goto BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints
@@ -54,8 +53,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_DefeatedKing::
msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_YouveDefeatedPyramidKing, MSGBOX_DEFAULT
BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints:: BattleFrontier_BattlePyramidLobby_EventScript_GiveBattlePoints::
special DoBattlePyramidMonsHaveHeldItem special DoBattlePyramidMonsHaveHeldItem
compare VAR_RESULT, TRUE call_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag
call_if_eq BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag
clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG clearflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
frontier_checkairshow frontier_checkairshow
special LoadPlayerParty special LoadPlayerParty
@@ -130,8 +128,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -140,8 +137,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_TryEnterChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
msgbox BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO msgbox BattleFrontier_BattlePyramidLobby_Text_OkayToSaveBeforeChallenge, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge case NO, BattleFrontier_BattlePyramidLobby_EventScript_LoadPartyAndCancelChallenge
@@ -162,8 +158,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_SaveBeforeChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_CancelChallengeSaveFailed
BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge:: BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge::
special SavePlayerParty special SavePlayerParty
frontier_setpartyorder FRONTIER_PARTY_SIZE frontier_setpartyorder FRONTIER_PARTY_SIZE
@@ -173,7 +168,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_EnterChallenge::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0 frontier_set FRONTIER_DATA_CHALLENGE_STATUS, 0
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
special HealPlayerParty special HealPlayerParty
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 255, 1, 1 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR, 1, 1
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
@@ -233,8 +228,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_NoHint::
BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50:: BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLv50::
msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50 pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_50
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
return return
@@ -247,8 +241,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLv50Streak::
BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen:: BattleFrontier_BattlePyramidLobby_EventScript_GiveHintLvOpen::
msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_Aah, MSGBOX_DEFAULT
pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN pyramid_get PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak
goto_if_ne BattleFrontier_BattlePyramidLobby_EventScript_GiveHintGetLvOpenStreak
setvar VAR_RESULT, 0 setvar VAR_RESULT, 0
goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment goto BattleFrontier_BattlePyramidLobby_EventScript_DoHintComment
return return
@@ -378,8 +371,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_WalkToPanelAndReceiveBag::
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_WeWillHoldBagForSafekeeping, MSGBOX_DEFAULT
pyramid_get PYRAMID_DATA_WIN_STREAK pyramid_get PYRAMID_DATA_WIN_STREAK
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_ReceiveNewBattleBag
msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_PleaseTakePreviousBattleBag, MSGBOX_DEFAULT
goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag goto BattleFrontier_BattlePyramidLobby_EventScript_ReceiveBattleBag
@@ -433,8 +425,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_StoreHeldItemsInPyramidBag::
msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_MonHoldingItemCannotTake, MSGBOX_DEFAULT
setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG setflag FLAG_STORING_ITEMS_IN_PYRAMID_BAG
special TryStoreHeldItemsInPyramidBag special TryStoreHeldItemsInPyramidBag
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_HeldItemsStoredInPyramidBag
message BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep message BattleFrontier_BattlePyramidLobby_Text_BagCannotHoldPickItemsToKeep
waitmessage waitmessage
goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep goto BattleFrontier_BattlePyramidLobby_EventScript_PickItemsToKeep
@@ -472,8 +463,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_PickItemsFromParty::
BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems:: BattleFrontier_BattlePyramidLobby_EventScript_ExitPickItems::
special DoBattlePyramidMonsHaveHeldItem special DoBattlePyramidMonsHaveHeldItem
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems
goto_if_eq BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems
return return
BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems:: BattleFrontier_BattlePyramidLobby_EventScript_PartyStillHasHeldItems::
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+17 -30
View File
@@ -20,16 +20,14 @@ BattleFrontier_BattlePyramidTop_OnWarp:
BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects:: BattleFrontier_BattlePyramidTop_EventScript_SetUpObjects::
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
compare VAR_TEMP_C, 0 goto_if_ne VAR_TEMP_C, 0, BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects
setobjectxyperm LOCALID_BRANDON, 0, 0 setobjectxyperm LOCALID_BRANDON, 0, 0
BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects:: BattleFrontier_BattlePyramidTop_EventScript_EndSetUpObjects::
end end
BattleFrontier_BattlePyramidTop_OnResume: BattleFrontier_BattlePyramidTop_OnResume:
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_eq VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus
call BattleFrontier_EventScript_SetBrainObjectGfx call BattleFrontier_EventScript_SetBrainObjectGfx
BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus:: BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus::
copyvar VAR_TEMP_C, VAR_RESULT copyvar VAR_TEMP_C, VAR_RESULT
@@ -39,12 +37,9 @@ BattleFrontier_BattlePyramidTop_EventScript_CheckChallengeStatus::
case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby case CHALLENGE_STATUS_SAVING, BattleFrontier_BattlePyramid_EventScript_WarpToLobby
case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge case CHALLENGE_STATUS_PAUSED, BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge
frontier_get FRONTIER_DATA_BATTLE_OUTCOME frontier_get FRONTIER_DATA_BATTLE_OUTCOME
compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq VAR_RESULT, B_OUTCOME_LOST, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost goto_if_eq VAR_RESULT, B_OUTCOME_DREW, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, B_OUTCOME_DREW goto_if_eq VAR_RESULT, B_OUTCOME_FORFEITED, BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
compare VAR_RESULT, B_OUTCOME_FORFEITED
goto_if_eq BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
end end
BattleFrontier_BattlePyramidTop_OnFrame: BattleFrontier_BattlePyramidTop_OnFrame:
@@ -74,10 +69,8 @@ BattleFrontier_BattlePyramidTop_EventScript_ReadyChallenge::
BattleFrontier_BattlePyramidTop_EventScript_Attendant:: BattleFrontier_BattlePyramidTop_EventScript_Attendant::
lock lock
faceplayer faceplayer
compare VAR_TEMP_D, 0 goto_if_ne VAR_TEMP_D, 0, BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_StepForwardWhenReady goto_if_ne VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside
compare VAR_TEMP_C, FRONTIER_BRAIN_NOT_READY
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHereMoveAside
msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_ReachedSummitUpYouGo, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside applymovement LOCALID_ATTENDANT, BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside
@@ -93,7 +86,7 @@ BattleFrontier_BattlePyramidTop_EventScript_Attendant::
closemessage closemessage
BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon:: BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon::
frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON frontier_set FRONTIER_DATA_CHALLENGE_STATUS, CHALLENGE_STATUS_WON
warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 warp MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 7, 13
waitstate waitstate
end end
@@ -116,8 +109,7 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandon::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech case FRONTIER_BRAIN_STREAK, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardSilverSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
@@ -137,14 +129,12 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonSilver::
msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BringCourageToOurBattle, MSGBOX_DEFAULT
call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
playbgm MUS_B_PYRAMID_TOP, FALSE playbgm MUS_B_PYRAMID_TOP, FALSE
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver
goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver:: BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonFrontierPassPlease, MSGBOX_DEFAULT
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol message BattleFrontier_BattlePyramidTop_Text_ReceivedBraveSymbol
@@ -156,8 +146,7 @@ BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonSilver::
BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold:: BattleFrontier_BattlePyramidTop_EventScript_BrandonIntroGold::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
goto_if_ne BattleFrontier_BattlePyramidTop_EventScript_BrandonHeardGoldSpeech
special SpawnCameraObject special SpawnCameraObject
applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp applymovement OBJ_EVENT_ID_CAMERA, BattleFrontier_BattlePyramidTop_Movement_CameraPanUp
waitmovement 0 waitmovement 0
@@ -177,14 +166,12 @@ BattleFrontier_BattlePyramidTop_EventScript_BattleBrandonGold::
msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_EverythingYouHave, MSGBOX_DEFAULT
call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle call BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle
playbgm MUS_B_PYRAMID_TOP, FALSE playbgm MUS_B_PYRAMID_TOP, FALSE
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold
goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost goto BattleFrontier_BattlePyramid_EventScript_WarpToLobbyLost
BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold:: BattleFrontier_BattlePyramidTop_EventScript_DefeatedBrandonGold::
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidTop_Text_BrandonRemarkableHaveThis, MSGBOX_DEFAULT
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine message BattleFrontier_BattlePyramidTop_Text_BraveSymbolTookGoldenShine
@@ -204,12 +191,12 @@ BattleFrontier_BattlePyramidTop_EventScript_DoBrandonBattle::
BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside: BattleFrontier_BattlePyramidTop_Movement_AttendantMoveAside:
walk_right walk_right
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath: BattleFrontier_BattlePyramidTop_Movement_AttendantBlockPath:
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop: BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop:
@@ -218,7 +205,7 @@ BattleFrontier_BattlePyramidTop_Movement_PlayerClimbToTop:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer: BattleFrontier_BattlePyramidTop_Movement_BrandonApproachPlayer:
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+20 -36
View File
@@ -25,8 +25,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_EnterRoom::
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerEnter
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_OpponentEnter
applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
@@ -62,8 +61,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent::
waitmovement 0 waitmovement 0
removeobject LOCALID_OPPONENT removeobject LOCALID_OPPONENT
frontier_getbrainstatus frontier_getbrainstatus
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY call_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
call_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter
applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerBattleRoom_Movement_PlayerFaceAttendant
@@ -75,13 +73,11 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedOpponent::
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent:: BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponent::
frontier_getbrainstatus frontier_getbrainstatus
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
compare VAR_RESULT, FRONTIER_BRAIN_NOT_READY goto_if_ne VAR_RESULT, FRONTIER_BRAIN_NOT_READY, BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
call BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent call BattleFrontier_BattleTowerBattleRoom_EventScript_ReadyForOpponent
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForOpponentNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_ContinueChallenge
@@ -214,16 +210,14 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_SecondAttendantEnter::
return return
BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext:: BattleFrontier_BattleTowerBattleRoom_EventScript_MaidenUpNext::
compare VAR_TEMP_2, 1 goto_if_eq VAR_TEMP_2, 1, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden
msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_SalonMaidenOnHerWay, MSGBOX_DEFAULT
setvar VAR_TEMP_2, 1 setvar VAR_TEMP_2, 1
BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden:: BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaiden::
message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden message BattleFrontier_BattleTowerBattleRoom_Text_ReadyForSalonMaiden
waitmessage waitmessage
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_AskReadyForMaidenNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel case 0, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel
@@ -255,22 +249,19 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabel::
case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver case FRONTIER_BRAIN_STREAK, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold case FRONTIER_BRAIN_STREAK_LONG, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver
msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_GreetingsImAnabel, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver:: BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelSilver::
msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetMeSeeYourTalent, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver
goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver:: BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver::
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelTalentShallBeRecognized, MSGBOX_DEFAULT
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol message BattleFrontier_BattleTowerBattleRoom_Text_ReceivedAbilitySymbol
@@ -282,22 +273,19 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelSilver::
BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro:: BattleFrontier_BattleTowerBattleRoom_EventScript_AnabelGoldIntro::
frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_get FRONTIER_DATA_HEARD_BRAIN_SPEECH
compare VAR_RESULT, FALSE goto_if_ne VAR_RESULT, FALSE, BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
goto_if_ne BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold
msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelYouCameBack, MSGBOX_DEFAULT
frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH frontier_set FRONTIER_DATA_HEARD_BRAIN_SPEECH
BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold:: BattleFrontier_BattleTowerBattleRoom_EventScript_BattleAnabelGold::
msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_LetsBeginShallWe, MSGBOX_DEFAULT
call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle call BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold
goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost goto BattleFrontier_BattleTower_EventScript_WarpToLobbyLost
BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold:: BattleFrontier_BattleTowerBattleRoom_EventScript_DefeatedAnabelGold::
call BattleFrontier_EventScript_IncrementWinStreak call BattleFrontier_EventScript_IncrementWinStreak
frontier_getsymbols frontier_getsymbols
compare VAR_RESULT, 2 goto_if_eq VAR_RESULT, 2, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyWon
msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_AnabelCongratsYourPassPlease, MSGBOX_DEFAULT
playfanfare MUS_OBTAIN_SYMBOL playfanfare MUS_OBTAIN_SYMBOL
message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine message BattleFrontier_BattleTowerBattleRoom_Text_AbilitySymbolTookGoldenShine
@@ -317,8 +305,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_DoTowerBattle::
special DoSpecialTrainerBattle special DoSpecialTrainerBattle
waitstate waitstate
copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE copyvar VAR_0x8004, VAR_FRONTIER_BATTLE_MODE
compare VAR_0x8004, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_0x8004, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_EndTowerBattle
frontier_restorehelditems frontier_restorehelditems
special HealPlayerParty special HealPlayerParty
frontier_resetsketch frontier_resetsketch
@@ -422,29 +409,26 @@ BattleFrontier_BattleTowerBattleRoom_Movement_AnabelEnter:
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby:: BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobby::
copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE copyvar VAR_RESULT, VAR_FRONTIER_BATTLE_MODE
compare VAR_RESULT, FRONTIER_MODE_DOUBLES goto_if_eq VAR_RESULT, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles goto_if_eq VAR_RESULT, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis
compare VAR_RESULT, FRONTIER_MODE_MULTIS goto_if_eq VAR_RESULT, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 6, 6
compare VAR_RESULT, FRONTIER_MODE_LINK_MULTIS
goto_if_eq BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 6, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles:: BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyDoubles::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 10, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 10, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 14, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 14, 6
waitstate waitstate
end end
BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis::
tower_closelink tower_closelink
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 18, 6
waitstate waitstate
end end
data/maps/BattleFrontier_BattleTowerCorridor/scripts.inc
+7 -9
View File
@@ -6,15 +6,14 @@ BattleFrontier_BattleTowerCorridor_MapScripts::
.byte 0 .byte 0
BattleFrontier_BattleTowerCorridor_OnLoad: BattleFrontier_BattleTowerCorridor_OnLoad:
compare VAR_0x8006, 1 goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, FALSE
setmetatile 12, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, FALSE
setmetatile 12, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0
end end
BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor:: BattleFrontier_BattleTowerCorridor_EventScript_OpenFarDoor::
setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, 0 setmetatile 15, 0, METATILE_BattleFrontier_CorridorOpenDoor_Top, FALSE
setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, 0 setmetatile 15, 1, METATILE_BattleFrontier_CorridorOpenDoor_Bottom, FALSE
end end
BattleFrontier_BattleTowerCorridor_OnFrame: BattleFrontier_BattleTowerCorridor_OnFrame:
@@ -23,8 +22,7 @@ BattleFrontier_BattleTowerCorridor_OnFrame:
BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor:: BattleFrontier_BattleTowerCorridor_EventScript_EnterCorridor::
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
compare VAR_0x8006, 1 goto_if_eq VAR_0x8006, 1, BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
goto_if_eq BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerCorridor_Movement_AttendantWalkToDoor
applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor applymovement OBJ_EVENT_ID_PLAYER, BattleFrontier_BattleTowerCorridor_Movement_PlayerWalkToDoor
waitmovement 0 waitmovement 0
@@ -37,7 +35,7 @@ BattleFrontier_BattleTowerCorridor_EventScript_WalkToFarDoor::
BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom:: BattleFrontier_BattleTowerCorridor_EventScript_WarpToBattleRoom::
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 4, 8
waitstate waitstate
end end
data/maps/BattleFrontier_BattleTowerElevator/scripts.inc
+8 -12
View File
@@ -26,34 +26,30 @@ BattleFrontier_BattleTowerElevator_EventScript_EnterElevator::
end end
BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom:: BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoom::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti
return return
BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor:: BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridor::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 255, 8, 1 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR, 8, 1
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti:: BattleFrontier_BattleTowerElevator_EventScript_WarpToNextRoomMulti::
goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 7, 2
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti:: BattleFrontier_BattleTowerElevator_EventScript_WarpToCorridorMulti::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 255, 7, 2 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_CORRIDOR, 7, 2
waitstate waitstate
return return
BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom:: BattleFrontier_BattleTowerElevator_EventScript_WarpToPartnerRoom::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 1 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 1
waitstate waitstate
return return
data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
+66 -127
View File
@@ -19,8 +19,7 @@ BattleFrontier_BattleTowerLobby_OnResume:
BattleFrontier_BattleTowerLobby_OnTransition: BattleFrontier_BattleTowerLobby_OnTransition:
call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter call BattleFrontier_BattleTowerLobby_EventScript_ShowOrHideReporter
apprentice_shouldcheckgone apprentice_shouldcheckgone
compare VAR_0x8004, FALSE @ Always TRUE here goto_if_eq VAR_0x8004, FALSE, BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice @ VAR_0x8004 always TRUE here
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice
goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_HideApprentice
BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice:: BattleFrontier_BattleTowerLobby_EventScript_ShowApprentice::
clearflag FLAG_HIDE_APPRENTICE clearflag FLAG_HIDE_APPRENTICE
@@ -69,8 +68,7 @@ BattleFrontier_BattleTowerLobby_EventScript_WonChallenge::
lock lock
faceplayer faceplayer
frontier_isbrain frontier_isbrain
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden
message BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven message BattleFrontier_BattleTowerLobby_Text_CongratsBeatenSeven
waitmessage waitmessage
goto BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons goto BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons
@@ -79,8 +77,7 @@ BattleFrontier_BattleTowerLobby_EventScript_DefeatedMaiden::
msgbox BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_CongratsDefeatedMaiden, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons:: BattleFrontier_BattleTowerLobby_EventScript_GiveRibbons::
tower_giveribbons tower_giveribbons
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints
message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons message BattleFrontier_BattleTowerLobby_Text_HereAreSomeRibbons
waitmessage waitmessage
playfanfare MUS_OBTAIN_ITEM playfanfare MUS_OBTAIN_ITEM
@@ -92,8 +89,7 @@ BattleFrontier_BattleTowerLobby_EventScript_GiveBattlePoints::
msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS msgbox BattleFrontier_Text_ObtainedXBattlePoints, MSGBOX_GETPOINTS
call BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle call BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 49 goto_if_ne VAR_RESULT, 49, BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge
msgbox BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_AboutToFace50thTrainer, MSGBOX_DEFAULT
BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge:: BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge::
msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_LookForwardToAnotherChallenge, MSGBOX_DEFAULT
@@ -103,12 +99,10 @@ BattleFrontier_BattleTowerLobby_EventScript_LookForwardToChallenge::
end end
BattleFrontier_BattleTowerLobby_EventScript_LostChallenge:: BattleFrontier_BattleTowerLobby_EventScript_LostChallenge::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS goto_if_ne VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak
goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 0 goto_if_ne VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying
BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak:: BattleFrontier_BattleTowerLobby_EventScript_CancelWinStreak::
tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE tower_set TOWER_DATA_WIN_STREAK_ACTIVE, FALSE
BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying:: BattleFrontier_BattleTowerLobby_EventScript_LostThanksForPlaying::
@@ -133,8 +127,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle::
playse SE_SAVE playse SE_SAVE
waitse waitse
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
message BattleFrontier_BattleTowerLobby_Text_RecordLastMatch message BattleFrontier_BattleTowerLobby_Text_RecordLastMatch
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
@@ -145,8 +138,7 @@ BattleFrontier_BattleTowerLobby_EventScript_AskSaveBattle::
BattleFrontier_EventScript_SaveBattle:: BattleFrontier_EventScript_SaveBattle::
frontier_savebattle frontier_savebattle
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_EventScript_BattleSaveFailed
goto_if_eq BattleFrontier_EventScript_BattleSaveFailed
playse SE_SAVE playse SE_SAVE
msgbox BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_BattleRecordedOnPass, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle goto BattleFrontier_BattleTowerLobby_EventScript_EndSaveBattle
@@ -163,8 +155,7 @@ BattleFrontier_EventScript_GetCantRecordBattle::
BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge:: BattleFrontier_BattleTowerLobby_EventScript_ResumeChallenge::
lock lock
faceplayer faceplayer
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_SetBravoTrainerOn
message BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou message BattleFrontier_BattleTowerLobby_Text_WeveBeenWaitingForYou
waitmessage waitmessage
message BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved message BattleFrontier_BattleTowerLobby_Text_ProgressWillBeSaved
@@ -205,8 +196,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_SelectThreeMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_SelectThreeMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -215,8 +205,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterSinglesChallenge::
setvar VAR_0x8005, FRONTIER_PARTY_SIZE setvar VAR_0x8005, FRONTIER_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
@@ -234,8 +223,7 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeSinglesChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, TRUE setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, TRUE
goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
@@ -271,8 +259,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectFourMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -281,8 +268,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterDoublesChallenge::
setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE setvar VAR_0x8005, FRONTIER_DOUBLES_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
@@ -300,8 +286,7 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeDoublesChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE
goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
@@ -338,8 +323,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -348,8 +332,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterMultisChallenge::
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
@@ -367,8 +350,7 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeMultisChallenge::
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, FALSE
goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator goto BattleFrontier_BattleTowerLobby_EventScript_EnterElevator
@@ -404,8 +386,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge::
case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case FRONTIER_LVL_TENT, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge case MULTI_B_PRESSED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
frontier_checkineligible frontier_checkineligible
compare VAR_0x8004, TRUE goto_if_eq VAR_0x8004, TRUE, BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_NotEnoughValidMons
frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT frontier_set FRONTIER_DATA_LVL_MODE, VAR_RESULT
msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_PleaseSelectTwoMons2, MSGBOX_DEFAULT
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -414,8 +395,7 @@ BattleFrontier_BattleTowerLobby_EventScript_TryEnterLinkMultisChallenge::
setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE setvar VAR_0x8005, FRONTIER_MULTI_PARTY_SIZE
special ChoosePartyForBattleFrontier special ChoosePartyForBattleFrontier
waitstate waitstate
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO msgbox BattleFrontier_BattleTowerLobby_Text_OkayToSaveBeforeEntering, MSGBOX_YESNO
switch VAR_RESULT switch VAR_RESULT
case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge case NO, BattleFrontier_BattleTowerLobby_EventScript_LoadPartyCancelChallenge
@@ -434,12 +414,10 @@ BattleFrontier_BattleTowerLobby_EventScript_SaveBeforeLinkMultisChallenge::
tower_save 0 tower_save 0
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallengeSaveFailed
incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER
specialvar VAR_RESULT, IsWirelessAdapterConnected specialvar VAR_RESULT, IsWirelessAdapterConnected
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryWirelessLink
goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink goto BattleFrontier_BattleTowerLobby_EventScript_TryCableLink
end end
@@ -491,10 +469,8 @@ BattleFrontier_BattleTowerLobby_EventScript_FeelingsWontTell::
end end
BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings:: BattleFrontier_BattleTowerLobby_EventScript_CheckFeelings::
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat goto_if_eq VAR_RESULT, 1, BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings
compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_SubmittedFeelings
end end
BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat:: BattleFrontier_BattleTowerLobby_EventScript_CanceledEasyChat::
@@ -611,19 +587,17 @@ BattleFrontier_BattleTowerLobby_EventScript_EnterElevator::
BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad:: BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad::
tower_loadlinkopponents tower_loadlinkopponents
delay 1 delay 1
compare VAR_RESULT, 6 goto_if_ne VAR_RESULT, 6, BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad
goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_WaitForLinkOpponentLoad
call BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom call BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom
clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 1, 6
setvar VAR_TEMP_0, 0 setvar VAR_TEMP_0, 0
waitstate waitstate
end end
BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom:: BattleFrontier_BattleTowerLobby_EventScript_ShowYouToBattleRoom::
call BattleFrontier_BattleTowerLobby_EventScript_BufferModeText call BattleFrontier_BattleTowerLobby_EventScript_BufferModeText
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ShowYouToLinkMultiBattleRoom
msgbox BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_ShowYouToBattleRoom, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator goto BattleFrontier_BattleTowerLobby_EventScript_WalkToElevator
@@ -675,41 +649,33 @@ BattleFrontier_BattleTowerLobby_Movement_UnusedEnterElevator:
step_end step_end
BattleFrontier_BattleTowerLobby_EventScript_BufferModeText:: BattleFrontier_BattleTowerLobby_EventScript_BufferModeText::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti
return return
BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle:: BattleFrontier_BattleTowerLobby_EventScript_BufferTextSingle::
bufferstdstring 0, STDSTRING_SINGLE bufferstdstring STR_VAR_1, STDSTRING_SINGLE
return return
BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble:: BattleFrontier_BattleTowerLobby_EventScript_BufferTextDouble::
bufferstdstring 0, STDSTRING_DOUBLE bufferstdstring STR_VAR_1, STDSTRING_DOUBLE
return return
BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti:: BattleFrontier_BattleTowerLobby_EventScript_BufferTextMulti::
bufferstdstring 0, STDSTRING_MULTI bufferstdstring STR_VAR_1, STDSTRING_MULTI
return return
BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti:: BattleFrontier_BattleTowerLobby_EventScript_BufferTextLinkMulti::
bufferstdstring 0, STDSTRING_MULTI_LINK bufferstdstring STR_VAR_1, STDSTRING_MULTI_LINK
return return
BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo:: BattleFrontier_BattleTowerLobby_EventScript_SetAttendantTalkedTo::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToDoublesAttendant call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToMultisAttendant
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant
return return
BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant:: BattleFrontier_BattleTowerLobby_EventScript_TalkedToSinglesAttendant::
@@ -729,14 +695,10 @@ BattleFrontier_BattleTowerLobby_EventScript_TalkedToLinkMultisAttendant::
return return
BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord:: BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoord::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordDoubles call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordMultis
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis
return return
BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles:: BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordSingles::
@@ -756,14 +718,10 @@ BattleFrontier_BattleTowerLobby_EventScript_GetDoorXCoordLinkMultis::
return return
BattleFrontier_BattleTowerLobby_EventScript_GetPartySize:: BattleFrontier_BattleTowerLobby_EventScript_GetPartySize::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetDoublesPartySize call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetMultisPartySize
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_GetLinkMultisPartySize
return return
BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize:: BattleFrontier_BattleTowerLobby_EventScript_GetSinglesPartySize::
@@ -793,26 +751,18 @@ BattleFrontier_BattleTowerLobby_EventScript_TryCableLink::
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special TryBattleLinkup special TryBattleLinkup
waitstate waitstate
compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CableLinkSuccessful goto_if_eq VAR_RESULT, LINKUP_SOMEONE_NOT_READY, CableClub_EventScript_AbortLinkSomeoneNotReady
compare VAR_RESULT, LINKUP_SOMEONE_NOT_READY goto_if_eq VAR_RESULT, LINKUP_DIFF_SELECTIONS, BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections
goto_if_eq CableClub_EventScript_AbortLinkSomeoneNotReady goto_if_eq VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS, BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers
compare VAR_RESULT, LINKUP_DIFF_SELECTIONS goto_if_eq VAR_RESULT, LINKUP_FAILED, BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections goto_if_eq VAR_RESULT, LINKUP_CONNECTION_ERROR, CableClub_EventScript_AbortLinkConnectionError
compare VAR_RESULT, LINKUP_WRONG_NUM_PLAYERS goto_if_eq VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER, BattleFrontier_BattleTowerLobby_EventScript_AbortLink
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers
compare VAR_RESULT, LINKUP_FAILED
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_CancelChallenge
compare VAR_RESULT, LINKUP_CONNECTION_ERROR
goto_if_eq CableClub_EventScript_AbortLinkConnectionError
compare VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink
end end
BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections:: BattleFrontier_BattleTowerLobby_EventScript_AbortLinkDifferentSelections::
special CloseLink special CloseLink
compare VAR_0x8005, 3 goto_if_eq VAR_0x8005, 3, BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendDifferentSelection
msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT msgbox Text_PlayersMadeDifferentSelections, MSGBOX_DEFAULT
release release
end end
@@ -832,12 +782,9 @@ BattleFrontier_BattleTowerLobby_EventScript_AbortLinkIncorrectNumberOfPlayers::
BattleFrontier_BattleTowerLobby_EventScript_AbortLink:: BattleFrontier_BattleTowerLobby_EventScript_AbortLink::
special CloseLink special CloseLink
compare VAR_0x8005, 0 call_if_eq VAR_0x8005, 0, BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendChoseDifferentLvlMode call_if_eq VAR_0x8005, 1, BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon
compare VAR_0x8005, 1 call_if_eq VAR_0x8005, 2, BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMon
compare VAR_0x8005, 2
call_if_eq BattleFrontier_BattleTowerLobby_EventScript_FriendAlsoSelectedMons
msgbox BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerLobby_Text_ChooseDifferentMonsMatchLvlMode, MSGBOX_DEFAULT
release release
end end
@@ -891,27 +838,19 @@ BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader::
BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader:: BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader::
call CableClub_EventScript_TryBecomeLinkLeader call CableClub_EventScript_TryBecomeLinkLeader
compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful goto_if_eq VAR_RESULT, LINKUP_FAILED, BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader
compare VAR_RESULT, LINKUP_FAILED goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader goto_if_eq VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER, BattleFrontier_BattleTowerLobby_EventScript_AbortLink
compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryBecomeLeader
compare VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink
release release
return return
BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup:: BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup::
call CableClub_EventScript_TryJoinLinkGroup call CableClub_EventScript_TryJoinLinkGroup
compare VAR_RESULT, LINKUP_SUCCESS goto_if_eq VAR_RESULT, LINKUP_SUCCESS, BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_WirelessLinkSuccessful goto_if_eq VAR_RESULT, LINKUP_FAILED, BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader
compare VAR_RESULT, LINKUP_FAILED goto_if_eq VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN, BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_ChooseLeader goto_if_eq VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER, BattleFrontier_BattleTowerLobby_EventScript_AbortLink
compare VAR_RESULT, LINKUP_RETRY_ROLE_ASSIGN
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_TryJoinGroup
compare VAR_RESULT, LINKUP_FAILED_BATTLE_TOWER
goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_AbortLink
release release
return return
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+14 -26
View File
@@ -16,17 +16,14 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts::
@ The multi partner is represented by LOCALID_PARTNER, which has the gfx id VAR_OBJ_GFX_ID_E @ The multi partner is represented by LOCALID_PARTNER, which has the gfx id VAR_OBJ_GFX_ID_E
BattleFrontier_BattleTowerMultiBattleRoom_OnTransition: BattleFrontier_BattleTowerMultiBattleRoom_OnTransition:
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetLinkPlayerGfx
end end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx:: BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetObjGfx::
tower_setpartnergfx tower_setpartnergfx
checkplayergender checkplayergender
compare VAR_RESULT, FEMALE goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return return
@@ -56,8 +53,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_EnterRoom::
applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_PartnerEnterRoom
waitmovement 0 waitmovement 0
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter
applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer
applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer applymovement LOCALID_ATTENDANT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer
waitmovement 0 waitmovement 0
@@ -74,8 +70,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_OpponentsEnter::
applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter
applymovement LOCALID_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter applymovement LOCALID_OPPONENT_2, BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent2Enter
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DoOpponentIntrosLink
tower_getopponentintro 0 tower_getopponentintro 0
delay 15 delay 15
applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft applymovement LOCALID_OPPONENT_1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft
@@ -130,8 +125,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_DefeatedOpponents::
applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant applymovement LOCALID_PLAYER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant
applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant applymovement LOCALID_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant
waitmovement 0 waitmovement 0
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink
msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerBattleRoom_Text_RestoreMonsToFullHealth, MSGBOX_DEFAULT
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty
@@ -142,19 +136,16 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetorePartyMsgLink::
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty:: BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RestoreParty::
special LoadPlayerParty special LoadPlayerParty
frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE frontier_setpartyorder FRONTIER_MULTI_PARTY_SIZE
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReconnectLink
playfanfare MUS_HEAL playfanfare MUS_HEAL
waitfanfare waitfanfare
special HealPlayerParty special HealPlayerParty
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents:: BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents::
frontier_get FRONTIER_DATA_BATTLE_NUM frontier_get FRONTIER_DATA_BATTLE_NUM
call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet call BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
call BattleFrontier_EventScript_GetCantRecordBattle call BattleFrontier_EventScript_GetCantRecordBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponentsNoRecord
multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE multichoice 19, 4, MULTI_GO_ON_RECORD_REST_RETIRE, TRUE
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge case 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallenge
@@ -230,8 +221,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_PauseChallenge::
end end
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet:: BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSet::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS goto_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyForNextOpponentSetLink
copyvar VAR_TEMP_F, VAR_RESULT copyvar VAR_TEMP_F, VAR_RESULT
switch VAR_TEMP_F switch VAR_TEMP_F
case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet case 1, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ReadyFor2ndOpponentSet
@@ -347,8 +337,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_ContinueChallengeLink::
waitmessage waitmessage
special LinkRetireStatusWithBattleTowerPartner special LinkRetireStatusWithBattleTowerPartner
waitstate waitstate
compare VAR_RESULT, BATTLE_TOWER_LINKSTAT_CONTINUE goto_if_ne VAR_RESULT, BATTLE_TOWER_LINKSTAT_CONTINUE, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
goto_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_WarpToLobbyLost
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_LinkDelayForMsg
end end
@@ -368,8 +357,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskRetireChallengeLink::
message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge message BattleFrontier_BattleTowerBattleRoom_Text_CancelYourChallenge
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink
goto_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_RetireChallengeLink
goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents goto BattleFrontier_BattleTowerMultiBattleRoom_EventScript_AskReadyForOpponents
end end
@@ -408,7 +396,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceAttendant:
step_end step_end
BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle: BattleFrontier_BattleTowerMultiBattleRoom_Movement_FaceBattle:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter: BattleFrontier_BattleTowerMultiBattleRoom_Movement_Opponent1Enter:
@@ -449,7 +437,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantApproachPlayer:
BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos: BattleFrontier_BattleTowerMultiBattleRoom_Movement_AttendantReturnToPos:
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft: BattleFrontier_BattleTowerMultiBattleRoom_Movement_WalkInPlaceLeft:
data/maps/BattleFrontier_BattleTowerMultiCorridor/scripts.inc
+14 -21
View File
@@ -14,17 +14,14 @@ BattleFrontier_BattleTowerMultiCorridor_MapScripts::
@ The multi partner is represented by LOCALID_PARTNER, and has the gfx id VAR_OBJ_GFX_ID_E @ The multi partner is represented by LOCALID_PARTNER, and has the gfx id VAR_OBJ_GFX_ID_E
BattleFrontier_BattleTowerMultiCorridor_OnTransition: BattleFrontier_BattleTowerMultiCorridor_OnTransition:
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetLinkPlayerGfx
end end
BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx:: BattleFrontier_BattleTowerMultiCorridor_EventScript_SetObjGfx::
tower_setpartnergfx tower_setpartnergfx
checkplayergender checkplayergender
compare VAR_RESULT, FEMALE goto_if_eq VAR_RESULT, FEMALE, BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
goto_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_SetPlayerGfxFemale
setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL setvar VAR_OBJ_GFX_ID_F, OBJ_EVENT_GFX_BRENDAN_NORMAL
return return
@@ -76,8 +73,8 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor applymovement LOCALID_ATTENDANT_1, BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor
waitmovement 0 waitmovement 0
delay 40 delay 40
applymovement LOCALID_ATTENDANT_2, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_ATTENDANT_2, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_ATTENDANT_1, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_ATTENDANT_1, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
opendoor 7, 1 opendoor 7, 1
waitdooranim waitdooranim
@@ -95,29 +92,25 @@ BattleFrontier_BattleTowerMultiCorridor_EventScript_EnterCorridor::
end end
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom:: BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToBattleRoom::
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_DOUBLES call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom call_if_eq VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS, BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom
compare VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_LINK_MULTIS
call_if_eq BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom
return return
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom:: BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToNormalBattleRoom::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM, 4, 8
waitstate waitstate
return return
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom:: BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToMultiBattleRoom::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 4, 5
waitstate waitstate
return return
@ Unnecessary duplicate of the above @ Unnecessary duplicate of the above
BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom:: BattleFrontier_BattleTowerMultiCorridor_EventScript_WarpToLinkMultiBattleRoom::
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 4, 5 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 4, 5
waitstate waitstate
return return
@@ -149,7 +142,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PlayerAttendantWalkToDoor:
walk_right walk_right
walk_right walk_right
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor: BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor:
@@ -160,7 +153,7 @@ BattleFrontier_BattleTowerMultiCorridor_Movement_PartnerAttendantWalkToDoor:
walk_left walk_left
walk_left walk_left
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor: BattleFrontier_BattleTowerMultiCorridor_Movement_TrainerEnterDoor:
data/maps/BattleFrontier_BattleTowerMultiPartnerRoom/scripts.inc
+8 -11
View File
@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterRoom::
applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit applymovement LOCALID_ATTENDANT, BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit
waitmovement 0 waitmovement 0
copyobjectxytoperm LOCALID_ATTENDANT copyobjectxytoperm LOCALID_ATTENDANT
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner, MSGBOX_DEFAULT
special HealPlayerParty special HealPlayerParty
@@ -78,7 +78,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_Movement_PlayerEnterRoom:
BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit: BattleFrontier_BattleTowerMultiPartnerRoom_Movement_AttendantBlockExit:
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant:: BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant::
@@ -87,8 +87,7 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_Attendant::
message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner message BattleFrontier_BattleTowerMultiPartnerRoom_Text_QuitLookingForPartner
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE multichoicedefault 20, 8, MULTI_YESNO, 1, FALSE
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
goto_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_PleaseFindPartner2, MSGBOX_DEFAULT
release release
end end
@@ -101,14 +100,14 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_QuitChallenge::
BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator:: BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_EnterElevator::
msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiPartnerRoom_Text_ThankYouForChoosingPartner, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
opendoor 10, 1 opendoor 10, 1
waitdooranim waitdooranim
call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator call BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_MoveToElevator
closedoor 10, 1 closedoor 10, 1
waitdooranim waitdooranim
warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 1, 6
waitstate waitstate
releaseall releaseall
end end
@@ -183,13 +182,11 @@ BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_TalkToPotentialPartner::
waitmessage waitmessage
waitbuttonpress waitbuttonpress
closemessage closemessage
compare VAR_FACING, DIR_SOUTH call_if_ne VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit
call_if_ne BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExit call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_BattleTowerMultiPartnerRoom_EventScript_PartnerExitSouth
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 255, 10, 3 warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_PARTNER_ROOM, 10, 3
waitstate waitstate
release release
end end
data/maps/BattleFrontier_ExchangeServiceCorner/scripts.inc
+41 -81
View File
@@ -14,38 +14,30 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ClerkGoodbye::
BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize:: BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize::
specialvar VAR_TEMP_1, GetFrontierBattlePoints specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 goto_if_ge VAR_TEMP_1, VAR_0x8008, BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
goto_if_ge BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize
msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints, MSGBOX_DEFAULT msgbox BattleFrontier_ExchangeServiceCorner_Text_DontHaveEnoughPoints, MSGBOX_DEFAULT
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1 goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
end end
BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize:: BattleFrontier_ExchangeServiceCorner_EventScript_TryGivePrize::
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR2_CLERK
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem goto BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem
end end
BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor:: BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveDecor::
checkdecorspace VAR_0x8009 checkdecorspace VAR_0x8009
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special TakeFrontierBattlePoints special TakeFrontierBattlePoints
adddecoration VAR_0x8009 adddecoration VAR_0x8009
special UpdateBattlePointsWindow special UpdateBattlePointsWindow
playse SE_SHOP playse SE_SHOP
msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT msgbox BattleFrontier_ExchangeServiceCorner_Text_WellSendItToPC, MSGBOX_DEFAULT
compare VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_DECOR1_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2 goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
end end
@@ -56,17 +48,15 @@ BattleFrontier_ExchangeServiceCorner_EventScript_NoRoomForDecor::
end end
BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem:: BattleFrontier_ExchangeServiceCorner_EventScript_TryGiveItem::
checkitemspace VAR_0x8009, 1 checkitemspace VAR_0x8009
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_BagFull
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special TakeFrontierBattlePoints special TakeFrontierBattlePoints
additem VAR_0x8009 additem VAR_0x8009
special UpdateBattlePointsWindow special UpdateBattlePointsWindow
playse SE_SHOP playse SE_SHOP
msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT msgbox BattleFrontier_ExchangeServiceCorner_Text_HereIsYourPrize, MSGBOX_DEFAULT
compare VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK goto_if_eq VAR_TEMP_2, EXCHANGE_CORNER_VITAMIN_CLERK, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem goto BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
end end
@@ -107,8 +97,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1::
BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster:: BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissPoster, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 16 setvar VAR_0x8008, 16
setvar VAR_0x8009, DECOR_KISS_POSTER setvar VAR_0x8009, DECOR_KISS_POSTER
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -116,8 +105,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissPoster::
BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion:: BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKissCushion, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 32 setvar VAR_0x8008, 32
setvar VAR_0x8009, DECOR_KISS_CUSHION setvar VAR_0x8009, DECOR_KISS_CUSHION
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -125,8 +113,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KissCushion::
BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSmoochumDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 32 setvar VAR_0x8008, 32
setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL setvar VAR_0x8009, DECOR_SMOOCHUM_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -134,8 +121,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SmoochumDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTogepiDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, DECOR_TOGEPI_DOLL setvar VAR_0x8009, DECOR_TOGEPI_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -143,8 +129,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_TogepiDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMeowthDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, DECOR_MEOWTH_DOLL setvar VAR_0x8009, DECOR_MEOWTH_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -152,8 +137,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MeowthDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmClefairyDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL setvar VAR_0x8009, DECOR_CLEFAIRY_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -161,8 +145,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ClefairyDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmDittoDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, DECOR_DITTO_DOLL setvar VAR_0x8009, DECOR_DITTO_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -170,8 +153,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_DittoDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCyndaquilDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 80 setvar VAR_0x8008, 80
setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL setvar VAR_0x8009, DECOR_CYNDAQUIL_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -179,8 +161,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CyndaquilDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChikoritaDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 80 setvar VAR_0x8008, 80
setvar VAR_0x8009, DECOR_CHIKORITA_DOLL setvar VAR_0x8009, DECOR_CHIKORITA_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -188,8 +169,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChikoritaDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_TotodileDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmTotodileDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor1
setvar VAR_0x8008, 80 setvar VAR_0x8008, 80
setvar VAR_0x8009, DECOR_TOTODILE_DOLL setvar VAR_0x8009, DECOR_TOTODILE_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -221,8 +201,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2::
BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLaprasDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
setvar VAR_0x8008, 128 setvar VAR_0x8008, 128
setvar VAR_0x8009, DECOR_LAPRAS_DOLL setvar VAR_0x8009, DECOR_LAPRAS_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -230,8 +209,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_LaprasDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmSnorlaxDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
setvar VAR_0x8008, 128 setvar VAR_0x8008, 128
setvar VAR_0x8009, DECOR_SNORLAX_DOLL setvar VAR_0x8009, DECOR_SNORLAX_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -239,8 +217,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_SnorlaxDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmVenusaurDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
setvar VAR_0x8008, 256 setvar VAR_0x8008, 256
setvar VAR_0x8009, DECOR_VENUSAUR_DOLL setvar VAR_0x8009, DECOR_VENUSAUR_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -248,8 +225,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_VenusaurDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCharizardDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
setvar VAR_0x8008, 256 setvar VAR_0x8008, 256
setvar VAR_0x8009, DECOR_CHARIZARD_DOLL setvar VAR_0x8009, DECOR_CHARIZARD_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -257,8 +233,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_CharizardDoll::
BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll:: BattleFrontier_ExchangeServiceCorner_EventScript_BlastoiseDoll::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBlastoiseDoll, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseDecor2
setvar VAR_0x8008, 256 setvar VAR_0x8008, 256
setvar VAR_0x8009, DECOR_BLASTOISE_DOLL setvar VAR_0x8009, DECOR_BLASTOISE_DOLL
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -291,8 +266,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin::
BattleFrontier_ExchangeServiceCorner_EventScript_Protein:: BattleFrontier_ExchangeServiceCorner_EventScript_Protein::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmProtein, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_PROTEIN setvar VAR_0x8009, ITEM_PROTEIN
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -300,8 +274,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Protein::
BattleFrontier_ExchangeServiceCorner_EventScript_Calcium:: BattleFrontier_ExchangeServiceCorner_EventScript_Calcium::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCalcium, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_CALCIUM setvar VAR_0x8009, ITEM_CALCIUM
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -309,8 +282,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Calcium::
BattleFrontier_ExchangeServiceCorner_EventScript_Iron:: BattleFrontier_ExchangeServiceCorner_EventScript_Iron::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmIron, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_IRON setvar VAR_0x8009, ITEM_IRON
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -318,8 +290,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Iron::
BattleFrontier_ExchangeServiceCorner_EventScript_Zinc:: BattleFrontier_ExchangeServiceCorner_EventScript_Zinc::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmZinc, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_ZINC setvar VAR_0x8009, ITEM_ZINC
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -327,8 +298,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Zinc::
BattleFrontier_ExchangeServiceCorner_EventScript_Carbos:: BattleFrontier_ExchangeServiceCorner_EventScript_Carbos::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmCarbos, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_CARBOS setvar VAR_0x8009, ITEM_CARBOS
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -336,8 +306,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Carbos::
BattleFrontier_ExchangeServiceCorner_EventScript_HPUp:: BattleFrontier_ExchangeServiceCorner_EventScript_HPUp::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmHPUp, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseVitamin
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, ITEM_HP_UP setvar VAR_0x8009, ITEM_HP_UP
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -373,8 +342,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem::
BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers:: BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmLeftovers, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, ITEM_LEFTOVERS setvar VAR_0x8009, ITEM_LEFTOVERS
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -382,8 +350,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Leftovers::
BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb:: BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmWhiteHerb, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, ITEM_WHITE_HERB setvar VAR_0x8009, ITEM_WHITE_HERB
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -391,8 +358,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_WhiteHerb::
BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw:: BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmQuickClaw, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, ITEM_QUICK_CLAW setvar VAR_0x8009, ITEM_QUICK_CLAW
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -400,8 +366,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_QuickClaw::
BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb:: BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmMentalHerb, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 48 setvar VAR_0x8008, 48
setvar VAR_0x8009, ITEM_MENTAL_HERB setvar VAR_0x8009, ITEM_MENTAL_HERB
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -409,8 +374,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_MentalHerb::
BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder:: BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmBrightpowder, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 64 setvar VAR_0x8008, 64
setvar VAR_0x8009, ITEM_BRIGHT_POWDER setvar VAR_0x8009, ITEM_BRIGHT_POWDER
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -418,8 +382,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_Brightpowder::
BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand:: BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmChoiceBand, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 64 setvar VAR_0x8008, 64
setvar VAR_0x8009, ITEM_CHOICE_BAND setvar VAR_0x8009, ITEM_CHOICE_BAND
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -427,8 +390,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_ChoiceBand::
BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock:: BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmKingsRock, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 64 setvar VAR_0x8008, 64
setvar VAR_0x8009, ITEM_KINGS_ROCK setvar VAR_0x8009, ITEM_KINGS_ROCK
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -436,8 +398,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_KingsRock::
BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand:: BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmFocusBand, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 64 setvar VAR_0x8008, 64
setvar VAR_0x8009, ITEM_FOCUS_BAND setvar VAR_0x8009, ITEM_FOCUS_BAND
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
@@ -445,8 +406,7 @@ BattleFrontier_ExchangeServiceCorner_EventScript_FocusBand::
BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens:: BattleFrontier_ExchangeServiceCorner_EventScript_ScopeLens::
msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO msgbox BattleFrontier_ExchangeServiceCorner_Text_ConfirmScopeLens, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
goto_if_eq BattleFrontier_ExchangeServiceCorner_EventScript_ChooseHoldItem
setvar VAR_0x8008, 64 setvar VAR_0x8008, 64
setvar VAR_0x8009, ITEM_SCOPE_LENS setvar VAR_0x8009, ITEM_SCOPE_LENS
goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize goto BattleFrontier_ExchangeServiceCorner_EventScript_TryPurchasePrize
data/maps/BattleFrontier_Lounge1/scripts.inc
+17 -34
View File
@@ -14,10 +14,8 @@ BattleFrontier_Lounge1_EventScript_Breeder::
BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder:: BattleFrontier_Lounge1_EventScript_ChooseMonToShowBreeder::
special ChoosePartyMon special ChoosePartyMon
waitstate waitstate
compare VAR_0x8004, 255 goto_if_ne VAR_0x8004, PARTY_NOTHING_CHOSEN, BattleFrontier_Lounge1_EventScript_ShowMonToBreeder
goto_if_ne BattleFrontier_Lounge1_EventScript_ShowMonToBreeder goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, BattleFrontier_Lounge1_EventScript_CancelMonSelect
compare VAR_0x8004, 255
goto_if_eq BattleFrontier_Lounge1_EventScript_CancelMonSelect
end end
BattleFrontier_Lounge1_EventScript_BreederIntro:: BattleFrontier_Lounge1_EventScript_BreederIntro::
@@ -34,17 +32,12 @@ BattleFrontier_Lounge1_EventScript_AlreadyMetBreeder::
@ VAR_0x8007: IV of the highest IV stat @ VAR_0x8007: IV of the highest IV stat
BattleFrontier_Lounge1_EventScript_ShowMonToBreeder:: BattleFrontier_Lounge1_EventScript_ShowMonToBreeder::
specialvar VAR_RESULT, ScriptGetPartyMonSpecies specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG goto_if_eq VAR_RESULT, SPECIES_EGG, BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
goto_if_eq BattleFrontier_Lounge1_EventScript_ShowEggToBreeder
special BufferVarsForIVRater special BufferVarsForIVRater
compare VAR_0x8005, 90 @ Average of 15 goto_if_le VAR_0x8005, 90, BattleFrontier_Lounge1_EventScript_AverageTotalIVs @ Average of 15
goto_if_le BattleFrontier_Lounge1_EventScript_AverageTotalIVs goto_if_le VAR_0x8005, 120, BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs @ Average of 20
compare VAR_0x8005, 120 @ Average of 20 goto_if_le VAR_0x8005, 150, BattleFrontier_Lounge1_EventScript_HighTotalIVs @ Average of 25
goto_if_le BattleFrontier_Lounge1_EventScript_AboveAverageTotalIVs goto_if_ge VAR_0x8005, 151, BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs @ Average of > 25
compare VAR_0x8005, 150 @ Average of 25
goto_if_le BattleFrontier_Lounge1_EventScript_HighTotalIVs
compare VAR_0x8005, 151 @ Average of > 25
goto_if_ge BattleFrontier_Lounge1_EventScript_VeryHighTotalIVs
end end
BattleFrontier_Lounge1_EventScript_ShowEggToBreeder:: BattleFrontier_Lounge1_EventScript_ShowEggToBreeder::
@@ -54,30 +47,20 @@ BattleFrontier_Lounge1_EventScript_ShowEggToBreeder::
@ Comment on the highest IV stat @ Comment on the highest IV stat
BattleFrontier_Lounge1_EventScript_HighestIVStat:: BattleFrontier_Lounge1_EventScript_HighestIVStat::
compare VAR_0x8006, STAT_HP goto_if_eq VAR_0x8006, STAT_HP, BattleFrontier_Lounge1_EventScript_HighestIVHP
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVHP goto_if_eq VAR_0x8006, STAT_ATK, BattleFrontier_Lounge1_EventScript_HighestIVAtk
compare VAR_0x8006, STAT_ATK goto_if_eq VAR_0x8006, STAT_DEF, BattleFrontier_Lounge1_EventScript_HighestIVDef
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVAtk goto_if_eq VAR_0x8006, STAT_SPEED, BattleFrontier_Lounge1_EventScript_HighestIVSpeed
compare VAR_0x8006, STAT_DEF goto_if_eq VAR_0x8006, STAT_SPATK, BattleFrontier_Lounge1_EventScript_HighestIVSpAtk
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVDef goto_if_eq VAR_0x8006, STAT_SPDEF, BattleFrontier_Lounge1_EventScript_HighestIVSpDef
compare VAR_0x8006, STAT_SPEED
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpeed
compare VAR_0x8006, STAT_SPATK
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpAtk
compare VAR_0x8006, STAT_SPDEF
goto_if_eq BattleFrontier_Lounge1_EventScript_HighestIVSpDef
end end
@ Comment on the highest IV value @ Comment on the highest IV value
BattleFrontier_Lounge1_EventScript_HighestIVValue:: BattleFrontier_Lounge1_EventScript_HighestIVValue::
compare VAR_0x8007, 15 goto_if_le VAR_0x8007, 15, BattleFrontier_Lounge1_EventScript_HighestIVLow
goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVLow goto_if_le VAR_0x8007, 25, BattleFrontier_Lounge1_EventScript_HighestIVMid
compare VAR_0x8007, 25 goto_if_le VAR_0x8007, 30, BattleFrontier_Lounge1_EventScript_HighestIVHigh
goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVMid goto_if_ge VAR_0x8007, 31, BattleFrontier_Lounge1_EventScript_HighestIVMax
compare VAR_0x8007, 30
goto_if_le BattleFrontier_Lounge1_EventScript_HighestIVHigh
compare VAR_0x8007, 31
goto_if_ge BattleFrontier_Lounge1_EventScript_HighestIVMax
end end
BattleFrontier_Lounge1_EventScript_EndBreederComments:: BattleFrontier_Lounge1_EventScript_EndBreederComments::
data/maps/BattleFrontier_Lounge2/scripts.inc
+23 -35
View File
@@ -2,7 +2,7 @@ BattleFrontier_Lounge2_MapScripts::
.byte 0 .byte 0
@ This NPC gives hints about a random facility or battle mode. @ This NPC gives hints about a random facility or battle mode.
@ For battle modes he gives generic advice @ For battle modes he gives generic advice
@ For facilities, depending on how far the player has progressed he will say either @ For facilities, depending on how far the player has progressed he will say either
@ The name of the Frontier Brain there @ The name of the Frontier Brain there
@ The type and description of the 3 pokemon they use in their silver battle @ The type and description of the 3 pokemon they use in their silver battle
@@ -22,30 +22,18 @@ BattleFrontier_Lounge2_EventScript_AlreadyMetManiac::
end end
BattleFrontier_Lounge2_EventScript_GiveAdvice:: BattleFrontier_Lounge2_EventScript_GiveAdvice::
compare VAR_FRONTIER_MANIAC_FACILITY, 0 call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 0, BattleFrontier_Lounge2_EventScript_BufferSingle
call_if_eq BattleFrontier_Lounge2_EventScript_BufferSingle call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 1, BattleFrontier_Lounge2_EventScript_BufferDouble
compare VAR_FRONTIER_MANIAC_FACILITY, 1 call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 2, BattleFrontier_Lounge2_EventScript_BufferMulti
call_if_eq BattleFrontier_Lounge2_EventScript_BufferDouble call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BufferMultiLink
compare VAR_FRONTIER_MANIAC_FACILITY, 2 call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_BufferBattleDome
call_if_eq BattleFrontier_Lounge2_EventScript_BufferMulti call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 5, BattleFrontier_Lounge2_EventScript_BufferBattleFactory
compare VAR_FRONTIER_MANIAC_FACILITY, 3 call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 6, BattleFrontier_Lounge2_EventScript_BufferBattlePalace
call_if_eq BattleFrontier_Lounge2_EventScript_BufferMultiLink call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 7, BattleFrontier_Lounge2_EventScript_BufferBattleArena
compare VAR_FRONTIER_MANIAC_FACILITY, 4 call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 8, BattleFrontier_Lounge2_EventScript_BufferBattlePike
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleDome call_if_eq VAR_FRONTIER_MANIAC_FACILITY, 9, BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
compare VAR_FRONTIER_MANIAC_FACILITY, 5 call_if_le VAR_FRONTIER_MANIAC_FACILITY, 3, BattleFrontier_Lounge2_EventScript_BattleTowerNews
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleFactory call_if_ge VAR_FRONTIER_MANIAC_FACILITY, 4, BattleFrontier_Lounge2_EventScript_FacilityNews
compare VAR_FRONTIER_MANIAC_FACILITY, 6
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePalace
compare VAR_FRONTIER_MANIAC_FACILITY, 7
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattleArena
compare VAR_FRONTIER_MANIAC_FACILITY, 8
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePike
compare VAR_FRONTIER_MANIAC_FACILITY, 9
call_if_eq BattleFrontier_Lounge2_EventScript_BufferBattlePyramid
compare VAR_FRONTIER_MANIAC_FACILITY, 3
call_if_le BattleFrontier_Lounge2_EventScript_BattleTowerNews
compare VAR_FRONTIER_MANIAC_FACILITY, 4
call_if_ge BattleFrontier_Lounge2_EventScript_FacilityNews
special ShowFrontierManiacMessage special ShowFrontierManiacMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
@@ -61,43 +49,43 @@ BattleFrontier_Lounge2_EventScript_FacilityNews::
return return
BattleFrontier_Lounge2_EventScript_BufferSingle:: BattleFrontier_Lounge2_EventScript_BufferSingle::
bufferstdstring 0, STDSTRING_SINGLE bufferstdstring STR_VAR_1, STDSTRING_SINGLE
return return
BattleFrontier_Lounge2_EventScript_BufferDouble:: BattleFrontier_Lounge2_EventScript_BufferDouble::
bufferstdstring 0, STDSTRING_DOUBLE bufferstdstring STR_VAR_1, STDSTRING_DOUBLE
return return
BattleFrontier_Lounge2_EventScript_BufferMulti:: BattleFrontier_Lounge2_EventScript_BufferMulti::
bufferstdstring 0, STDSTRING_MULTI bufferstdstring STR_VAR_1, STDSTRING_MULTI
return return
BattleFrontier_Lounge2_EventScript_BufferMultiLink:: BattleFrontier_Lounge2_EventScript_BufferMultiLink::
bufferstdstring 0, STDSTRING_MULTI_LINK bufferstdstring STR_VAR_1, STDSTRING_MULTI_LINK
return return
BattleFrontier_Lounge2_EventScript_BufferBattleDome:: BattleFrontier_Lounge2_EventScript_BufferBattleDome::
bufferstdstring 0, STDSTRING_BATTLE_DOME bufferstdstring STR_VAR_1, STDSTRING_BATTLE_DOME
return return
BattleFrontier_Lounge2_EventScript_BufferBattleFactory:: BattleFrontier_Lounge2_EventScript_BufferBattleFactory::
bufferstdstring 0, STDSTRING_BATTLE_FACTORY bufferstdstring STR_VAR_1, STDSTRING_BATTLE_FACTORY
return return
BattleFrontier_Lounge2_EventScript_BufferBattlePalace:: BattleFrontier_Lounge2_EventScript_BufferBattlePalace::
bufferstdstring 0, STDSTRING_BATTLE_PALACE bufferstdstring STR_VAR_1, STDSTRING_BATTLE_PALACE
return return
BattleFrontier_Lounge2_EventScript_BufferBattleArena:: BattleFrontier_Lounge2_EventScript_BufferBattleArena::
bufferstdstring 0, STDSTRING_BATTLE_ARENA bufferstdstring STR_VAR_1, STDSTRING_BATTLE_ARENA
return return
BattleFrontier_Lounge2_EventScript_BufferBattlePike:: BattleFrontier_Lounge2_EventScript_BufferBattlePike::
bufferstdstring 0, STDSTRING_BATTLE_PIKE bufferstdstring STR_VAR_1, STDSTRING_BATTLE_PIKE
return return
BattleFrontier_Lounge2_EventScript_BufferBattlePyramid:: BattleFrontier_Lounge2_EventScript_BufferBattlePyramid::
bufferstdstring 0, STDSTRING_BATTLE_PYRAMID bufferstdstring STR_VAR_1, STDSTRING_BATTLE_PYRAMID
return return
BattleFrontier_Lounge2_EventScript_Maniac1:: BattleFrontier_Lounge2_EventScript_Maniac1::
data/maps/BattleFrontier_Lounge3/scripts.inc
+13 -23
View File
@@ -10,8 +10,7 @@ BattleFrontier_Lounge3_EventScript_Gambler::
faceplayer faceplayer
goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler goto_if_set FLAG_MET_BATTLE_FRONTIER_GAMBLER, BattleFrontier_Lounge3_EventScript_AlreadyMetGambler
call BattleFrontier_Lounge3_EventScript_CountSilverSymbols call BattleFrontier_Lounge3_EventScript_CountSilverSymbols
compare VAR_0x8004, 2 goto_if_le VAR_0x8004, 2, BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols
goto_if_le BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols
setflag FLAG_MET_BATTLE_FRONTIER_GAMBLER setflag FLAG_MET_BATTLE_FRONTIER_GAMBLER
msgbox BattleFrontier_Lounge3_Text_YouLookToughExplainGambling, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_YouLookToughExplainGambling, MSGBOX_DEFAULT
goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
@@ -22,11 +21,9 @@ BattleFrontier_Lounge3_EventScript_AskToEnterChallenge::
waitmessage waitmessage
waitbuttonpress waitbuttonpress
msgbox BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe, MSGBOX_YESNO msgbox BattleFrontier_Lounge3_Text_HowAboutEnteringEventForMe, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge3_EventScript_DeclineChallenge
goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
msgbox BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints, MSGBOX_YESNO msgbox BattleFrontier_Lounge3_Text_SpotMeSomeBattlePoints, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge3_EventScript_DeclineChallenge
goto_if_eq BattleFrontier_Lounge3_EventScript_DeclineChallenge
message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
waitmessage waitmessage
special ShowBattlePointsWindow special ShowBattlePointsWindow
@@ -61,8 +58,7 @@ BattleFrontier_Lounge3_EventScript_Bet15::
BattleFrontier_Lounge3_EventScript_TryPlaceBet:: BattleFrontier_Lounge3_EventScript_TryPlaceBet::
specialvar VAR_TEMP_1, GetFrontierBattlePoints specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 goto_if_ge VAR_TEMP_1, VAR_0x8008, BattleFrontier_Lounge3_EventScript_PlaceBet
goto_if_ge BattleFrontier_Lounge3_EventScript_PlaceBet
msgbox BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_YouDontHaveEnoughPoints, MSGBOX_DEFAULT
message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot message BattleFrontier_Lounge3_Text_HowMuchCanYouSpot
waitmessage waitmessage
@@ -109,27 +105,21 @@ BattleFrontier_Lounge3_EventScript_NotEnoughSilverSymbols::
BattleFrontier_Lounge3_EventScript_AlreadyMetGambler:: BattleFrontier_Lounge3_EventScript_AlreadyMetGambler::
msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_Oh, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET goto_if_ge VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET, BattleFrontier_Lounge3_EventScript_CheckBetResults
goto_if_ge BattleFrontier_Lounge3_EventScript_CheckBetResults
goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge goto BattleFrontier_Lounge3_EventScript_AskToEnterChallenge
end end
BattleFrontier_Lounge3_EventScript_CheckBetResults:: BattleFrontier_Lounge3_EventScript_CheckBetResults::
compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET goto_if_eq VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_PLACED_BET, BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted
goto_if_eq BattleFrontier_Lounge3_EventScript_ChallengeNotAttempted goto_if_eq VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON, BattleFrontier_Lounge3_EventScript_WonChallenge
compare VAR_FRONTIER_GAMBLER_STATE, FRONTIER_GAMBLER_WON
goto_if_eq BattleFrontier_Lounge3_EventScript_WonChallenge
goto BattleFrontier_Lounge3_EventScript_LostChallenge goto BattleFrontier_Lounge3_EventScript_LostChallenge
end end
BattleFrontier_Lounge3_EventScript_WonChallenge:: BattleFrontier_Lounge3_EventScript_WonChallenge::
msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_HelloChampHeresYourPoints, MSGBOX_DEFAULT
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5 call_if_eq VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_5, BattleFrontier_Lounge3_EventScript_RewardBet5
call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet5 call_if_eq VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10, BattleFrontier_Lounge3_EventScript_RewardBet10
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_10 call_if_eq VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15, BattleFrontier_Lounge3_EventScript_RewardBet15
call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet10
compare VAR_FRONTIER_GAMBLER_AMOUNT_BET, FRONTIER_GAMBLER_BET_15
call_if_eq BattleFrontier_Lounge3_EventScript_RewardBet15
msgbox BattleFrontier_Lounge3_Text_ObtainedBattlePoints, MSGBOX_GETPOINTS msgbox BattleFrontier_Lounge3_Text_ObtainedBattlePoints, MSGBOX_GETPOINTS
special GiveFrontierBattlePoints special GiveFrontierBattlePoints
msgbox BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge3_Text_ThinkOfMeForAnotherChallenge, MSGBOX_DEFAULT
@@ -144,17 +134,17 @@ BattleFrontier_Lounge3_EventScript_LostChallenge::
end end
BattleFrontier_Lounge3_EventScript_RewardBet5:: BattleFrontier_Lounge3_EventScript_RewardBet5::
buffernumberstring 0, (BET_AMOUNT_5 * 2) buffernumberstring STR_VAR_1, (BET_AMOUNT_5 * 2)
setvar VAR_0x8004, (BET_AMOUNT_5 * 2) setvar VAR_0x8004, (BET_AMOUNT_5 * 2)
return return
BattleFrontier_Lounge3_EventScript_RewardBet10:: BattleFrontier_Lounge3_EventScript_RewardBet10::
buffernumberstring 0, (BET_AMOUNT_10 * 2) buffernumberstring STR_VAR_1, (BET_AMOUNT_10 * 2)
setvar VAR_0x8004, (BET_AMOUNT_10 * 2) setvar VAR_0x8004, (BET_AMOUNT_10 * 2)
return return
BattleFrontier_Lounge3_EventScript_RewardBet15:: BattleFrontier_Lounge3_EventScript_RewardBet15::
buffernumberstring 0, (BET_AMOUNT_15 * 2) buffernumberstring STR_VAR_1, (BET_AMOUNT_15 * 2)
setvar VAR_0x8004, (BET_AMOUNT_15 * 2) setvar VAR_0x8004, (BET_AMOUNT_15 * 2)
return return
data/maps/BattleFrontier_Lounge5/scripts.inc
+3 -6
View File
@@ -5,17 +5,14 @@ BattleFrontier_Lounge5_EventScript_NatureGirl::
lock lock
faceplayer faceplayer
msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO msgbox BattleFrontier_Lounge5_Text_NatureGirlGreeting, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
special ChoosePartyMon special ChoosePartyMon
waitstate waitstate
lock lock
faceplayer faceplayer
compare VAR_0x8004, 255 goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlNoneShown
specialvar VAR_RESULT, ScriptGetPartyMonSpecies specialvar VAR_RESULT, ScriptGetPartyMonSpecies
compare VAR_RESULT, SPECIES_EGG goto_if_eq VAR_RESULT, SPECIES_EGG, BattleFrontier_Lounge5_EventScript_NatureGirlEgg
goto_if_eq BattleFrontier_Lounge5_EventScript_NatureGirlEgg
special ShowNatureGirlMessage special ShowNatureGirlMessage
waitmessage waitmessage
waitbuttonpress waitbuttonpress
data/maps/BattleFrontier_Lounge6/scripts.inc
+4 -7
View File
@@ -10,18 +10,15 @@ BattleFrontier_Lounge6_EventScript_Trader::
specialvar VAR_RESULT, GetInGameTradeSpeciesInfo specialvar VAR_RESULT, GetInGameTradeSpeciesInfo
copyvar VAR_0x8009, VAR_RESULT copyvar VAR_0x8009, VAR_RESULT
msgbox BattleFrontier_Lounge6_Text_WouldYouLikeToTrade, MSGBOX_YESNO msgbox BattleFrontier_Lounge6_Text_WouldYouLikeToTrade, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge6_EventScript_DeclineTrade
goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
special ChoosePartyMon special ChoosePartyMon
waitstate waitstate
copyvar VAR_0x800A, VAR_0x8004 copyvar VAR_0x800A, VAR_0x8004
compare VAR_0x8004, 255 goto_if_eq VAR_0x8004, PARTY_NOTHING_CHOSEN, BattleFrontier_Lounge6_EventScript_DeclineTrade
goto_if_eq BattleFrontier_Lounge6_EventScript_DeclineTrade
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
specialvar VAR_RESULT, GetTradeSpecies specialvar VAR_RESULT, GetTradeSpecies
copyvar VAR_0x800B, VAR_RESULT copyvar VAR_0x800B, VAR_RESULT
compare VAR_RESULT, VAR_0x8009 goto_if_ne VAR_RESULT, VAR_0x8009, BattleFrontier_Lounge6_EventScript_NotRequestedMon
goto_if_ne BattleFrontier_Lounge6_EventScript_NotRequestedMon
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
copyvar VAR_0x8005, VAR_0x800A copyvar VAR_0x8005, VAR_0x800A
special CreateInGameTradePokemon special CreateInGameTradePokemon
@@ -38,7 +35,7 @@ BattleFrontier_Lounge6_EventScript_DeclineTrade::
end end
BattleFrontier_Lounge6_EventScript_NotRequestedMon:: BattleFrontier_Lounge6_EventScript_NotRequestedMon::
bufferspeciesname 0, VAR_0x8009 bufferspeciesname STR_VAR_1, VAR_0x8009
msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge6_Text_DontTradeForAnythingButMon, MSGBOX_DEFAULT
release release
end end
data/maps/BattleFrontier_Lounge7/scripts.inc
+5 -9
View File
@@ -249,14 +249,12 @@ BattleFrontier_Lounge7_EventScript_ConfirmMoveSelection::
copyvar VAR_0x8004, VAR_TEMP_D copyvar VAR_0x8004, VAR_TEMP_D
copyvar VAR_0x8005, VAR_TEMP_E copyvar VAR_0x8005, VAR_TEMP_E
special BufferBattleFrontierTutorMoveName special BufferBattleFrontierTutorMoveName
buffernumberstring 1, VAR_0x8008 buffernumberstring STR_VAR_2, VAR_0x8008
copyvar VAR_0x8004, VAR_TEMP_C copyvar VAR_0x8004, VAR_TEMP_C
msgbox BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints, MSGBOX_YESNO msgbox BattleFrontier_Lounge7_Text_MoveWillBeXBattlePoints, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_Lounge7_EventScript_ChooseNewMove
goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewMove
specialvar VAR_TEMP_1, GetFrontierBattlePoints specialvar VAR_TEMP_1, GetFrontierBattlePoints
compare VAR_TEMP_1, VAR_0x8008 goto_if_ge VAR_TEMP_1, VAR_0x8008, BattleFrontier_Lounge7_EventScript_TeachTutorMove
goto_if_ge BattleFrontier_Lounge7_EventScript_TeachTutorMove
msgbox BattleFrontier_Lounge7_Text_HaventGotEnoughPoints, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_HaventGotEnoughPoints, MSGBOX_DEFAULT
goto BattleFrontier_Lounge7_EventScript_ChooseNewMove goto BattleFrontier_Lounge7_EventScript_ChooseNewMove
end end
@@ -269,8 +267,7 @@ BattleFrontier_Lounge7_EventScript_TeachTutorMove::
special CloseBattleFrontierTutorWindow special CloseBattleFrontierTutorWindow
special ChooseMonForMoveTutor special ChooseMonForMoveTutor
waitstate waitstate
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_Lounge7_EventScript_CancelChooseMon
goto_if_eq BattleFrontier_Lounge7_EventScript_CancelChooseMon
msgbox BattleFrontier_Lounge7_Text_IllTakeBattlePoints, MSGBOX_DEFAULT msgbox BattleFrontier_Lounge7_Text_IllTakeBattlePoints, MSGBOX_DEFAULT
copyvar VAR_0x8004, VAR_0x8008 copyvar VAR_0x8004, VAR_0x8008
special TakeFrontierBattlePoints special TakeFrontierBattlePoints
@@ -278,8 +275,7 @@ BattleFrontier_Lounge7_EventScript_TeachTutorMove::
end end
BattleFrontier_Lounge7_EventScript_ChooseNewMove:: BattleFrontier_Lounge7_EventScript_ChooseNewMove::
compare VAR_TEMP_E, 0 goto_if_eq VAR_TEMP_E, 0, BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
goto_if_eq BattleFrontier_Lounge7_EventScript_ChooseNewLeftTutorMove
goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove goto BattleFrontier_Lounge7_EventScript_ChooseNewRightTutorMove
end end
data/maps/BattleFrontier_OutsideEast/scripts.inc
+6 -10
View File
@@ -11,8 +11,7 @@ BattleFrontier_OutsideEast_OnResume:
BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo:: BattleFrontier_OutsideEast_EventScript_TryRemoveSudowoodo::
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -72,7 +71,7 @@ BattleFrontier_OutsideEast_EventScript_Zigzagoon::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_ZIGZAGOON, 0 playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
msgbox BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideEast_Text_ZigzagoonLooksVacant, MSGBOX_DEFAULT
waitmoncry waitmoncry
release release
@@ -126,7 +125,7 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo::
msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT msgbox gText_Sudowoodo_Attacked, MSGBOX_DEFAULT
closemessage closemessage
waitse waitse
playmoncry SPECIES_SUDOWOODO, 2 playmoncry SPECIES_SUDOWOODO, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setvar VAR_LAST_TALKED, LOCALID_SUDOWOODO setvar VAR_LAST_TALKED, LOCALID_SUDOWOODO
@@ -135,12 +134,9 @@ BattleFrontier_OutsideEast_EventScript_WaterSudowoodo::
dowildbattle dowildbattle
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo goto_if_eq VAR_RESULT, B_OUTCOME_RAN, BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq BattleFrontier_OutsideEast_EventScript_DefeatedSudowoodo
setflag FLAG_DEFEATED_SUDOWOODO setflag FLAG_DEFEATED_SUDOWOODO
release release
end end
data/maps/BattleFrontier_OutsideWest/scripts.inc
+29 -41
View File
@@ -20,9 +20,8 @@ BattleFrontier_OutsideWest_EventScript_FerryAttendant::
lock lock
faceplayer faceplayer
msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_MayISeeYourTicket, MSGBOX_DEFAULT
checkitem ITEM_SS_TICKET, 1 checkitem ITEM_SS_TICKET
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_OutsideWest_EventScript_NoSSTicket
goto_if_eq BattleFrontier_OutsideWest_EventScript_NoSSTicket
message BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo message BattleFrontier_OutsideWest_Text_WhereWouldYouLikeToGo
waitmessage waitmessage
goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination goto BattleFrontier_OutsideWest_EventScript_ChooseFerryDestination
@@ -44,22 +43,20 @@ BattleFrontier_OutsideWest_EventScript_NoSSTicket::
BattleFrontier_OutsideWest_EventScript_FerryToSlateport:: BattleFrontier_OutsideWest_EventScript_FerryToSlateport::
msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO msgbox BattleFrontier_OutsideWest_Text_SlateportItIs, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
call BattleFrontier_OutsideWest_EventScript_BoardFerry call BattleFrontier_OutsideWest_EventScript_BoardFerry
warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 warp MAP_SLATEPORT_CITY_HARBOR, 8, 11
waitstate waitstate
release release
end end
BattleFrontier_OutsideWest_EventScript_FerryToLilycove:: BattleFrontier_OutsideWest_EventScript_FerryToLilycove::
msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO msgbox BattleFrontier_OutsideWest_Text_LilycoveItIs, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
goto_if_eq BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination
msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_PleaseBoardFerry, MSGBOX_DEFAULT
call BattleFrontier_OutsideWest_EventScript_BoardFerry call BattleFrontier_OutsideWest_EventScript_BoardFerry
warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
waitstate waitstate
release release
end end
@@ -72,7 +69,7 @@ BattleFrontier_OutsideWest_EventScript_ChooseNewFerryDestination::
BattleFrontier_OutsideWest_EventScript_BoardFerry:: BattleFrontier_OutsideWest_EventScript_BoardFerry::
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat LOCALID_FERRY_ATTENDANT, MAP_BATTLE_FRONTIER_OUTSIDE_WEST hideobjectat LOCALID_FERRY_ATTENDANT, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -137,16 +134,16 @@ BattleFrontier_OutsideWest_EventScript_Maniac2::
end end
BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk:: BattleFrontier_OutsideWest_EventScript_FactoryChallengersTalk::
applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_SureWeCanChallengeWithNoMons, MSGBOX_DEFAULT
applymovement LOCALID_MANIAC_2, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MANIAC_2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_BigGuySaidIllLendYouMons, MSGBOX_DEFAULT
closemessage closemessage
delay 25 delay 25
applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MANIAC_1, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_MANIAC_2, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MANIAC_2, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
release release
end end
@@ -155,20 +152,16 @@ BattleFrontier_OutsideWest_EventScript_Camper::
lock lock
faceplayer faceplayer
delay 20 delay 20
compare VAR_FACING, DIR_NORTH call_if_eq VAR_FACING, DIR_NORTH, BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory
compare VAR_FACING, DIR_SOUTH call_if_eq VAR_FACING, DIR_WEST, BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
call_if_eq BattleFrontier_OutsideWest_EventScript_CamperAlreadyFacingFactory call_if_eq VAR_FACING, DIR_EAST, BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_OutsideWest_EventScript_CamperFaceFactory
msgbox BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_WhosRaisingThoseRentalMons, MSGBOX_DEFAULT
release release
end end
BattleFrontier_OutsideWest_EventScript_CamperFaceFactory:: BattleFrontier_OutsideWest_EventScript_CamperFaceFactory::
applymovement LOCALID_CAMPER, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_CAMPER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
@@ -180,14 +173,10 @@ BattleFrontier_OutsideWest_EventScript_Girl::
faceplayer faceplayer
message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper message BattleFrontier_OutsideWest_Text_ScaredOfPikeBecauseSeviper
waitmessage waitmessage
compare VAR_FACING, DIR_NORTH call_if_eq VAR_FACING, DIR_NORTH, BattleFrontier_OutsideWest_EventScript_GirlShudderNorth
call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderNorth call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_OutsideWest_EventScript_GirlShudderSouth
compare VAR_FACING, DIR_SOUTH call_if_eq VAR_FACING, DIR_WEST, BattleFrontier_OutsideWest_EventScript_GirlShudderWest
call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderSouth call_if_eq VAR_FACING, DIR_EAST, BattleFrontier_OutsideWest_EventScript_GirlShudderEast
compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderWest
compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_OutsideWest_EventScript_GirlShudderEast
waitbuttonpress waitbuttonpress
release release
end end
@@ -213,23 +202,23 @@ BattleFrontier_OutsideWest_EventScript_GirlShudderEast::
return return
BattleFrontier_OutsideWest_Movement_GirlShudderNorth: BattleFrontier_OutsideWest_Movement_GirlShudderNorth:
walk_in_place_fastest_down walk_in_place_faster_down
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
BattleFrontier_OutsideWest_Movement_GirlShudderSouth: BattleFrontier_OutsideWest_Movement_GirlShudderSouth:
walk_in_place_fastest_up walk_in_place_faster_up
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
BattleFrontier_OutsideWest_Movement_GirlShudderWest: BattleFrontier_OutsideWest_Movement_GirlShudderWest:
walk_in_place_fastest_right walk_in_place_faster_right
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_OutsideWest_Movement_GirlShudderEast: BattleFrontier_OutsideWest_Movement_GirlShudderEast:
walk_in_place_fastest_left walk_in_place_faster_left
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_OutsideWest_EventScript_Woman2:: BattleFrontier_OutsideWest_EventScript_Woman2::
@@ -237,8 +226,7 @@ BattleFrontier_OutsideWest_EventScript_Woman2::
faceplayer faceplayer
msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_LetsPlayRockPaperScissors, MSGBOX_DEFAULT
random 2 random 2
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors
goto_if_eq BattleFrontier_OutsideWest_EventScript_WomanWonRockPaperScissors
goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors goto BattleFrontier_OutsideWest_EventScript_WomanLostRockPaperScissors
end end
data/maps/BattleFrontier_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -33,7 +33,7 @@ BattleFrontier_PokemonCenter_1F_EventScript_Skitty::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_SKITTY, 0 playmoncry SPECIES_SKITTY, CRY_MODE_NORMAL
msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT msgbox BattleFrontier_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
waitmoncry waitmoncry
release release
data/maps/BattleFrontier_RankingHall/scripts.inc
+11 -12
View File
@@ -3,61 +3,61 @@ BattleFrontier_RankingHall_MapScripts::
BattleFrontier_RankingHall_EventScript_TowerSinglesRecords:: BattleFrontier_RankingHall_EventScript_TowerSinglesRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_SINGLES setvar VAR_0x8005, RANKING_HALL_TOWER_SINGLES
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_TowerDoublesRecords:: BattleFrontier_RankingHall_EventScript_TowerDoublesRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_DOUBLES setvar VAR_0x8005, RANKING_HALL_TOWER_DOUBLES
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_TowerMultisRecords:: BattleFrontier_RankingHall_EventScript_TowerMultisRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_MULTIS setvar VAR_0x8005, RANKING_HALL_TOWER_MULTIS
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_TowerLinkRecords:: BattleFrontier_RankingHall_EventScript_TowerLinkRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_TOWER_LINK setvar VAR_0x8005, RANKING_HALL_TOWER_LINK
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_ArenaRecords:: BattleFrontier_RankingHall_EventScript_ArenaRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_ARENA setvar VAR_0x8005, RANKING_HALL_ARENA
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_PalaceRecords:: BattleFrontier_RankingHall_EventScript_PalaceRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PALACE setvar VAR_0x8005, RANKING_HALL_PALACE
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_FactoryRecords:: BattleFrontier_RankingHall_EventScript_FactoryRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_FACTORY setvar VAR_0x8005, RANKING_HALL_FACTORY
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_DomeRecords:: BattleFrontier_RankingHall_EventScript_DomeRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_DOME setvar VAR_0x8005, RANKING_HALL_DOME
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_PikeRecords:: BattleFrontier_RankingHall_EventScript_PikeRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PIKE setvar VAR_0x8005, RANKING_HALL_PIKE
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
BattleFrontier_RankingHall_EventScript_PyramidRecords:: BattleFrontier_RankingHall_EventScript_PyramidRecords::
lockall lockall
setvar VAR_0x8005, RANKING_HALL_BATTLE_PYRAMID setvar VAR_0x8005, RANKING_HALL_PYRAMID
goto BattleFrontier_RankingHall_EventScript_ShowRecords goto BattleFrontier_RankingHall_EventScript_ShowRecords
end end
@@ -86,8 +86,7 @@ BattleFrontier_RankingHall_EventScript_NinjaBoy::
lock lock
faceplayer faceplayer
msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO msgbox BattleFrontier_RankingHall_Text_IsYourNameOnThisList, MSGBOX_YESNO
compare VAR_RESULT, YES goto_if_eq VAR_RESULT, YES, BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList
goto_if_eq BattleFrontier_RankingHall_EventScript_NinjaBoyNameOnList
msgbox BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName, MSGBOX_DEFAULT msgbox BattleFrontier_RankingHall_Text_WorkHarderIfYouSawFriendsName, MSGBOX_DEFAULT
release release
end end
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+6 -6
View File
@@ -42,9 +42,9 @@ BattleFrontier_ReceptionGate_EventScript_ScottScene::
msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_EnjoyBattleFrontier, MSGBOX_DEFAULT
msgbox BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_IfItIsntPlayerYouCame, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_GREETER, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_GREETER, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_GUIDE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_GUIDE, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_GREETER, Common_Movement_ExclamationMark applymovement LOCALID_GREETER, Common_Movement_ExclamationMark
@@ -78,7 +78,7 @@ BattleFrontier_ReceptionGate_Movement_PlayerFaceScott:
delay_16 delay_16
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
@ Unused @ Unused
@@ -112,7 +112,7 @@ BattleFrontier_ReceptionGate_Movement_GreeterFaceScott:
delay_16 delay_16
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott: BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott:
@@ -120,7 +120,7 @@ BattleFrontier_ReceptionGate_Movement_FacilityGuideFaceScott:
delay_16 delay_16
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
BattleFrontier_ReceptionGate_EventScript_Greeter:: BattleFrontier_ReceptionGate_EventScript_Greeter::
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+25 -42
View File
@@ -35,8 +35,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckSilverSymbols::
goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_SILVER, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllSilverSymbols, MSGBOX_DEFAULT
giveitem ITEM_LANSAT_BERRY giveitem ITEM_LANSAT_BERRY
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS
setflag FLAG_TEMP_4 setflag FLAG_TEMP_4
release release
@@ -52,8 +51,7 @@ BattleFrontier_ScottsHouse_EventScript_CheckGoldSymbols::
goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield goto_if_unset FLAG_SYS_PYRAMID_GOLD, BattleFrontier_ScottsHouse_EventScript_CheckGiveShield
msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_YouveCollectedAllGoldSymbols, MSGBOX_DEFAULT
giveitem ITEM_STARF_BERRY giveitem ITEM_STARF_BERRY
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
goto_if_eq BattleFrontier_ScottsHouse_EventScript_BerryPocketFull
setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS setflag FLAG_COLLECTED_ALL_GOLD_SYMBOLS
setflag FLAG_TEMP_4 setflag FLAG_TEMP_4
release release
@@ -71,10 +69,8 @@ BattleFrontier_ScottsHouse_EventScript_GivenBerry::
BattleFrontier_ScottsHouse_EventScript_RandomComment:: BattleFrontier_ScottsHouse_EventScript_RandomComment::
random 3 random 3
compare VAR_RESULT, 1 goto_if_eq VAR_RESULT, 1, BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment
goto_if_eq BattleFrontier_ScottsHouse_EventScript_FrontierBrainComment goto_if_eq VAR_RESULT, 2, BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment
compare VAR_RESULT, 2
goto_if_eq BattleFrontier_ScottsHouse_EventScript_ArtisanCaveComment
msgbox BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_WhyIGoSeekingTrainers, MSGBOX_DEFAULT
release release
end end
@@ -93,20 +89,17 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveSilverShield::
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 50 goto_if_ge VAR_RESULT, 50, BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 50 goto_if_ge VAR_RESULT, 50, BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveSilverShield
goto BattleFrontier_ScottsHouse_EventScript_RandomComment goto BattleFrontier_ScottsHouse_EventScript_RandomComment
end end
BattleFrontier_ScottsHouse_EventScript_GiveSilverShield:: BattleFrontier_ScottsHouse_EventScript_GiveSilverShield::
msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_Beat50TrainersInARow, MSGBOX_DEFAULT
givedecoration DECOR_SILVER_SHIELD givedecoration DECOR_SILVER_SHIELD
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
setflag FLAG_RECEIVED_SILVER_SHIELD setflag FLAG_RECEIVED_SILVER_SHIELD
setflag FLAG_TEMP_3 setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_GivenShield goto BattleFrontier_ScottsHouse_EventScript_GivenShield
@@ -126,20 +119,17 @@ BattleFrontier_ScottsHouse_EventScript_CheckGiveGoldShield::
setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES setvar VAR_FRONTIER_BATTLE_MODE, FRONTIER_MODE_SINGLES
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50 frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_50
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 100 goto_if_ge VAR_RESULT, 100, BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN frontier_set FRONTIER_DATA_LVL_MODE, FRONTIER_LVL_OPEN
tower_get TOWER_DATA_WIN_STREAK tower_get TOWER_DATA_WIN_STREAK
compare VAR_RESULT, 100 goto_if_ge VAR_RESULT, 100, BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
goto_if_ge BattleFrontier_ScottsHouse_EventScript_GiveGoldShield
goto BattleFrontier_ScottsHouse_EventScript_RandomComment goto BattleFrontier_ScottsHouse_EventScript_RandomComment
end end
BattleFrontier_ScottsHouse_EventScript_GiveGoldShield:: BattleFrontier_ScottsHouse_EventScript_GiveGoldShield::
msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_Beat100TrainersInARow, MSGBOX_DEFAULT
givedecoration DECOR_GOLD_SHIELD givedecoration DECOR_GOLD_SHIELD
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
goto_if_eq BattleFrontier_ScottsHouse_EventScript_NoRoomForShield
setflag FLAG_RECEIVED_GOLD_SHIELD setflag FLAG_RECEIVED_GOLD_SHIELD
setflag FLAG_TEMP_3 setflag FLAG_TEMP_3
goto BattleFrontier_ScottsHouse_EventScript_GivenShield goto BattleFrontier_ScottsHouse_EventScript_GivenShield
@@ -154,47 +144,40 @@ BattleFrontier_ScottsHouse_EventScript_WelcomeToFrontier::
msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_WelcomeToBattleFrontier, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
compare VAR_FACING, DIR_NORTH call_if_eq VAR_FACING, DIR_NORTH, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth
call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth call_if_eq VAR_FACING, DIR_SOUTH, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth
compare VAR_FACING, DIR_SOUTH call_if_eq VAR_FACING, DIR_EAST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast
call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth call_if_eq VAR_FACING, DIR_WEST, BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest
compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast
compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest
msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_HowMuchEffortItTookToMakeReal, MSGBOX_DEFAULT
applymovement LOCALID_SCOTT, Common_Movement_FacePlayer applymovement LOCALID_SCOTT, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_HaveThisAsMementoOfOurPathsCrossing, MSGBOX_DEFAULT
compare VAR_SCOTT_STATE, 13 goto_if_eq VAR_SCOTT_STATE, 13, BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints
goto_if_eq BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints goto_if_ge VAR_SCOTT_STATE, 9, BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints
compare VAR_SCOTT_STATE, 9 goto_if_ge VAR_SCOTT_STATE, 6, BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints
goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints
compare VAR_SCOTT_STATE, 6
goto_if_ge BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints
goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint goto BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint
end end
BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints:: BattleFrontier_ScottsHouse_EventScript_Give4BattlePoints::
buffernumberstring 0, 4 buffernumberstring STR_VAR_1, 4
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
end end
BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints:: BattleFrontier_ScottsHouse_EventScript_Give3BattlePoints::
buffernumberstring 0, 3 buffernumberstring STR_VAR_1, 3
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
end end
BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints:: BattleFrontier_ScottsHouse_EventScript_Give2BattlePoints::
buffernumberstring 0, 2 buffernumberstring STR_VAR_1, 2
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
end end
BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint:: BattleFrontier_ScottsHouse_EventScript_Give1BattlePoint::
buffernumberstring 0, 1 buffernumberstring STR_VAR_1, 1
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints goto BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints
end end
@@ -209,22 +192,22 @@ BattleFrontier_ScottsHouse_EventScript_GiveBattlePoints::
end end
BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth:: BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayNorth::
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth:: BattleFrontier_ScottsHouse_EventScript_ScottFaceAwaySouth::
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast:: BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayEast::
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest:: BattleFrontier_ScottsHouse_EventScript_ScottFaceAwayWest::
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
data/maps/BirthIsland_Exterior/scripts.inc
+5 -9
View File
@@ -38,8 +38,7 @@ BirthIsland_Exterior_OnResume:
BirthIsland_Exterior_EventScript_TryRemoveDeoxys:: BirthIsland_Exterior_EventScript_TryRemoveDeoxys::
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
goto_if_ne Common_EventScript_NopReturn
removeobject LOCALID_DEOXYS removeobject LOCALID_DEOXYS
return return
@@ -79,7 +78,7 @@ BirthIsland_Exterior_EventScript_Deoxys::
applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach applymovement LOCALID_DEOXYS, BirthIsland_Exterior_Movement_DeoxysApproach
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_DEOXYS, 2 playmoncry SPECIES_DEOXYS, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setvar VAR_LAST_TALKED, LOCALID_DEOXYS setvar VAR_LAST_TALKED, LOCALID_DEOXYS
@@ -92,12 +91,9 @@ BirthIsland_Exterior_EventScript_Deoxys::
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, BirthIsland_Exterior_EventScript_DefeatedDeoxys
goto_if_eq BirthIsland_Exterior_EventScript_DefeatedDeoxys goto_if_eq VAR_RESULT, B_OUTCOME_RAN, BirthIsland_Exterior_EventScript_RanFromDeoxys
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, BirthIsland_Exterior_EventScript_RanFromDeoxys
goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq BirthIsland_Exterior_EventScript_RanFromDeoxys
setflag FLAG_BATTLED_DEOXYS setflag FLAG_BATTLED_DEOXYS
release release
end end
data/maps/BirthIsland_Harbor/scripts.inc
+3 -4
View File
@@ -8,17 +8,16 @@ BirthIsland_Harbor_EventScript_Sailor::
lock lock
faceplayer faceplayer
msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO msgbox BirthIsland_Harbor_Text_SailorReturn, MSGBOX_YESNO
compare VAR_RESULT, NO goto_if_eq VAR_RESULT, NO, BirthIsland_Harbor_EventScript_AsYouLike
goto_if_eq BirthIsland_Harbor_EventScript_AsYouLike
msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat LOCALID_SAILOR, MAP_BIRTH_ISLAND_HARBOR hideobjectat LOCALID_SAILOR, MAP_BIRTH_ISLAND_HARBOR
setvar VAR_0x8004, LOCALID_SS_TIDAL setvar VAR_0x8004, LOCALID_SS_TIDAL
call Common_EventScript_FerryDepartIsland call Common_EventScript_FerryDepartIsland
warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 warp MAP_LILYCOVE_CITY_HARBOR, 8, 11
waitstate waitstate
release release
end end
data/maps/CaveOfOrigin_B1F/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ CaveOfOrigin_B1F_EventScript_Wallace::
faceplayer faceplayer
msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT msgbox CaveOfOrigin_B1F_Text_WallaceStory, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 60 delay 60
playse SE_PIN playse SE_PIN
data/maps/CaveOfOrigin_Entrance/scripts.inc
+1 -1
View File
@@ -3,6 +3,6 @@ CaveOfOrigin_Entrance_MapScripts::
.byte 0 .byte 0
CaveOfOrigin_Entrance_OnResume: CaveOfOrigin_Entrance_OnResume:
setescapewarp MAP_SOOTOPOLIS_CITY, 255, 31, 17 setescapewarp MAP_SOOTOPOLIS_CITY, 31, 17
end end
data/maps/ContestHall/scripts.inc
+15 -25
View File
@@ -19,16 +19,11 @@ ContestHall_OnTransition:
ContestHall_EventScript_ReadyContestMusic:: ContestHall_EventScript_ReadyContestMusic::
call ContestHall_EventScript_TryWaitForLink call ContestHall_EventScript_TryWaitForLink
special GetContestMultiplayerId special GetContestMultiplayerId
compare VAR_RESULT, 0 call_if_eq VAR_RESULT, 0, ContestHall_EventScript_SaveContestMusicPlayer1
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer1 call_if_eq VAR_RESULT, 1, ContestHall_EventScript_SaveContestMusicPlayer2
compare VAR_RESULT, 1 call_if_eq VAR_RESULT, 2, ContestHall_EventScript_SaveContestMusicPlayer3
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer2 call_if_eq VAR_RESULT, 3, ContestHall_EventScript_SaveContestMusicPlayer4
compare VAR_RESULT, 2 call_if_eq VAR_RESULT, 4, ContestHall_EventScript_SaveContestMusic
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer3
compare VAR_RESULT, 3
call_if_eq ContestHall_EventScript_SaveContestMusicPlayer4
compare VAR_RESULT, 4
call_if_eq ContestHall_EventScript_SaveContestMusic
return return
ContestHall_EventScript_SaveContestMusicPlayer1:: ContestHall_EventScript_SaveContestMusicPlayer1::
@@ -52,8 +47,7 @@ ContestHall_EventScript_SaveContestMusic::
return return
ContestHall_OnResume: ContestHall_OnResume:
compare VAR_TEMP_9, 1 call_if_eq VAR_TEMP_9, 1, ContestHall_EventScript_ReShowAudience
call_if_eq ContestHall_EventScript_ReShowAudience
end end
ContestHall_EventScript_ReShowAudience:: ContestHall_EventScript_ReShowAudience::
@@ -84,8 +78,7 @@ ContestHall_EventScript_SetContestObjects::
ContestHall_EventScript_AddRandomAudienceMembers:: ContestHall_EventScript_AddRandomAudienceMembers::
call ContestHall_EventScript_GetRandomAudienceGfxId call ContestHall_EventScript_GetRandomAudienceGfxId
call ContestHall_EventScript_SetRandomAudienceGfx call ContestHall_EventScript_SetRandomAudienceGfx
compare VAR_TEMP_0, 8 goto_if_lt VAR_TEMP_0, 8, ContestHall_EventScript_AddRandomAudienceMembers
goto_if_lt ContestHall_EventScript_AddRandomAudienceMembers
return return
ContestHall_EventScript_SetRandomAudienceGfx:: ContestHall_EventScript_SetRandomAudienceGfx::
@@ -303,8 +296,7 @@ ContestHall_EventScript_RandomAudienceScientist1::
ContestHall_EventScript_CreateAudience:: ContestHall_EventScript_CreateAudience::
specialvar VAR_RESULT, IsWirelessContest specialvar VAR_RESULT, IsWirelessContest
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, ContestHall_EventScript_CreateWirelessContestAudience
goto_if_eq ContestHall_EventScript_CreateWirelessContestAudience
switch VAR_CONTEST_TYPE switch VAR_CONTEST_TYPE
case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience case CONTEST_TYPE_NPC_NORMAL, ContestHall_EventScript_CreateNormalContestAudience
case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience case CONTEST_TYPE_NPC_SUPER, ContestHall_EventScript_CreateSuperContestAudience
@@ -418,36 +410,34 @@ ContestHall_EventScript_SetExitWarp::
return return
ContestHall_EventScript_SetExitWarpNormalContest:: ContestHall_EventScript_SetExitWarpNormalContest::
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
waitstate waitstate
end end
ContestHall_EventScript_SetExitWarpSuperContest:: ContestHall_EventScript_SetExitWarpSuperContest::
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
waitstate waitstate
end end
ContestHall_EventScript_SetExitWarpHyperContest:: ContestHall_EventScript_SetExitWarpHyperContest::
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
waitstate waitstate
end end
ContestHall_EventScript_SetExitWarpMasterContest:: ContestHall_EventScript_SetExitWarpMasterContest::
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 14, 4 warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 14, 4
waitstate waitstate
end end
ContestHall_EventScript_SetExitWarpLinkContest:: ContestHall_EventScript_SetExitWarpLinkContest::
warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 15, 4 warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 15, 4
waitstate waitstate
end end
LilycoveCity_ContestLobby_EventScript_SetPlayerGfx:: LilycoveCity_ContestLobby_EventScript_SetPlayerGfx::
checkplayergender checkplayergender
compare VAR_RESULT, MALE goto_if_eq VAR_RESULT, MALE, LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan
goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan goto_if_eq VAR_RESULT, FEMALE, LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
compare VAR_RESULT, FEMALE
goto_if_eq LilycoveCity_ContestLobby_EventScript_SetPlayerGfxMay
return return
LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan:: LilycoveCity_ContestLobby_EventScript_SetPlayerGfxBrendan::
data/maps/DesertRuins/scripts.inc
+13 -21
View File
@@ -10,8 +10,7 @@ DesertRuins_OnResume:
DesertRuins_EventScript_TryRemoveRegirock:: DesertRuins_EventScript_TryRemoveRegirock::
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT goto_if_ne VAR_RESULT, B_OUTCOME_CAUGHT, Common_EventScript_NopReturn
goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
@@ -20,12 +19,12 @@ DesertRuins_OnLoad:
end end
DesertRuins_EventScript_HideRegiEntrance:: DesertRuins_EventScript_HideRegiEntrance::
setmetatile 7, 19, METATILE_Cave_EntranceCover, 1 setmetatile 7, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 8, 19, METATILE_Cave_EntranceCover, 1 setmetatile 8, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 9, 19, METATILE_Cave_EntranceCover, 1 setmetatile 9, 19, METATILE_Cave_EntranceCover, TRUE
setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 7, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 8, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, 1 setmetatile 9, 20, METATILE_Cave_SealedChamberBraille_Mid, TRUE
return return
DesertRuins_OnTransition: DesertRuins_OnTransition:
@@ -40,9 +39,7 @@ DesertRuins_EventScript_ShowRegirock::
DesertRuins_EventScript_CaveEntranceMiddle:: DesertRuins_EventScript_CaveEntranceMiddle::
lockall lockall
goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall goto_if_set FLAG_SYS_REGIROCK_PUZZLE_COMPLETED, DesertRuins_EventScript_BigHoleInWall
braillemessage DesertRuins_Braille_UseRockSmash braillemsgbox DesertRuins_Braille_UseRockSmash
waitbuttonpress
closebraillemessage
releaseall releaseall
end end
@@ -53,9 +50,7 @@ DesertRuins_EventScript_BigHoleInWall::
DesertRuins_EventScript_CaveEntranceSide:: DesertRuins_EventScript_CaveEntranceSide::
lockall lockall
braillemessage DesertRuins_Braille_UseRockSmash braillemsgbox DesertRuins_Braille_UseRockSmash
waitbuttonpress
closebraillemessage
releaseall releaseall
end end
@@ -63,7 +58,7 @@ DesertRuins_EventScript_Regirock::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_REGIROCK, 2 playmoncry SPECIES_REGIROCK, CRY_MODE_ENCOUNTER
delay 40 delay 40
waitmoncry waitmoncry
setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE
@@ -72,12 +67,9 @@ DesertRuins_EventScript_Regirock::
waitstate waitstate
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON goto_if_eq VAR_RESULT, B_OUTCOME_WON, DesertRuins_EventScript_DefeatedRegirock
goto_if_eq DesertRuins_EventScript_DefeatedRegirock goto_if_eq VAR_RESULT, B_OUTCOME_RAN, DesertRuins_EventScript_RanFromRegirock
compare VAR_RESULT, B_OUTCOME_RAN goto_if_eq VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED, DesertRuins_EventScript_RanFromRegirock
goto_if_eq DesertRuins_EventScript_RanFromRegirock
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq DesertRuins_EventScript_RanFromRegirock
setflag FLAG_DEFEATED_REGIROCK setflag FLAG_DEFEATED_REGIROCK
release release
end end
data/maps/DewfordTown/scripts.inc
+318 -328
View File
@@ -4,7 +4,7 @@
.equ LOCALID_BRINEY_DEWFORD, 2 .equ LOCALID_BRINEY_DEWFORD, 2
.equ LOCALID_BOAT_DEWFORD, 4 .equ LOCALID_BOAT_DEWFORD, 4
.equ LOCALID_BOAT_R109, 1 .equ LOCALID_BOAT_R109, 1
.equ LOCALID_BRINEY_R109, 2 .equ LOCALID_BRINEY_R109, 2
.equ LOCALID_BOAT_R104, 7 .equ LOCALID_BOAT_R104, 7
@@ -54,8 +54,7 @@ DewfordTown_EventScript_CancelSailSelect::
DewfordTown_EventScript_ReturnToPetalburgPrompt:: DewfordTown_EventScript_ReturnToPetalburgPrompt::
msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO msgbox DewfordTown_Text_SetSailBackToPetalburg, MSGBOX_YESNO
compare VAR_RESULT, YES goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_SailBackToPetalburg
goto_if_eq DewfordTown_EventScript_SailBackToPetalburg
msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT msgbox DewfordTown_Text_GoDeliverIllBeWaiting, MSGBOX_DEFAULT
release release
end end
@@ -87,10 +86,8 @@ DewfordTown_EventScript_OldRodFisherman::
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_HowsFishing
msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO msgbox DewfordTown_Text_GettingItchToFish, MSGBOX_YESNO
compare VAR_RESULT, YES goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_GiveOldRod
goto_if_eq DewfordTown_EventScript_GiveOldRod goto_if_eq VAR_RESULT, NO, DewfordTown_EventScript_NotGettingItchToFish
compare VAR_RESULT, NO
goto_if_eq DewfordTown_EventScript_NotGettingItchToFish
end end
DewfordTown_EventScript_GiveOldRod:: DewfordTown_EventScript_GiveOldRod::
@@ -110,10 +107,8 @@ DewfordTown_EventScript_HowsFishing::
message DewfordTown_Text_HowsYourFishing message DewfordTown_Text_HowsYourFishing
waitmessage waitmessage
multichoice 20, 8, MULTI_HOWS_FISHING, TRUE multichoice 20, 8, MULTI_HOWS_FISHING, TRUE
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, DewfordTown_EventScript_FishingExcellent
goto_if_eq DewfordTown_EventScript_FishingExcellent goto_if_eq VAR_RESULT, 1, DewfordTown_EventScript_FishingNotSoGood
compare VAR_RESULT, 1
goto_if_eq DewfordTown_EventScript_FishingNotSoGood
end end
DewfordTown_EventScript_FishingExcellent:: DewfordTown_EventScript_FishingExcellent::
@@ -128,8 +123,8 @@ DewfordTown_EventScript_FishingNotSoGood::
DewfordTown_EventScript_SailToPetalburg:: DewfordTown_EventScript_SailToPetalburg::
call EventScript_BackupMrBrineyLocation call EventScript_BackupMrBrineyLocation
setobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 0
applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat
waitmovement 0 waitmovement 0
removeobject LOCALID_BRINEY_DEWFORD removeobject LOCALID_BRINEY_DEWFORD
@@ -151,8 +146,8 @@ DewfordTown_EventScript_SailToPetalburg::
setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
hideobjectat LOCALID_BOAT_DEWFORD, MAP_DEWFORD_TOWN hideobjectat LOCALID_BOAT_DEWFORD, MAP_DEWFORD_TOWN
setvar VAR_BOARD_BRINEY_BOAT_STATE, 2 setvar VAR_BOARD_BRINEY_BOAT_STATE, 2
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 5, 4
copyvar VAR_BRINEY_LOCATION, VAR_0x8008 copyvar VAR_BRINEY_LOCATION, VAR_0x8008
waitstate waitstate
release release
@@ -160,8 +155,8 @@ DewfordTown_EventScript_SailToPetalburg::
DewfordTown_EventScript_SailToSlateport:: DewfordTown_EventScript_SailToSlateport::
call EventScript_BackupMrBrineyLocation call EventScript_BackupMrBrineyLocation
setobjectpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0 setobjectsubpriority LOCALID_BRINEY_DEWFORD, MAP_DEWFORD_TOWN, 0
setobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1 setobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN, 1
applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat applymovement LOCALID_BRINEY_DEWFORD, DewfordTown_Movement_BrineyBoardBoat
waitmovement 0 waitmovement 0
removeobject LOCALID_BRINEY_DEWFORD removeobject LOCALID_BRINEY_DEWFORD
@@ -178,7 +173,7 @@ DewfordTown_EventScript_SailToSlateport::
waitmovement 0 waitmovement 0
setobjectxyperm LOCALID_BRINEY_R109, 21, 26 setobjectxyperm LOCALID_BRINEY_R109, 21, 26
addobject LOCALID_BRINEY_R109 addobject LOCALID_BRINEY_R109
setobjectpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0 setobjectsubpriority LOCALID_BRINEY_R109, MAP_ROUTE109, 0
applymovement LOCALID_BRINEY_R109, DewfordTown_Movement_BrineyExitBoat applymovement LOCALID_BRINEY_R109, DewfordTown_Movement_BrineyExitBoat
waitmovement 0 waitmovement 0
clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY
@@ -190,8 +185,8 @@ DewfordTown_EventScript_SailToSlateport::
call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_LandedSlateport
closemessage closemessage
copyvar VAR_BRINEY_LOCATION, VAR_0x8008 copyvar VAR_BRINEY_LOCATION, VAR_0x8008
resetobjectpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN resetobjectsubpriority OBJ_EVENT_ID_PLAYER, MAP_DEWFORD_TOWN
resetobjectpriority LOCALID_BRINEY_R109, MAP_ROUTE109 resetobjectsubpriority LOCALID_BRINEY_R109, MAP_ROUTE109
copyobjectxytoperm LOCALID_BRINEY_R109 copyobjectxytoperm LOCALID_BRINEY_R109
release release
end end
@@ -230,46 +225,46 @@ DewfordTown_Movement_SailToPetalburg:
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
@@ -278,119 +273,119 @@ DewfordTown_Movement_SailToPetalburg:
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fastest_left walk_faster_left
walk_fast_left walk_fast_left
walk_fast_left walk_fast_left
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
@@ -405,164 +400,164 @@ DewfordTown_Movement_SailToSlateport:
walk_right walk_right
walk_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fastest_right walk_faster_right
walk_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fastest_up walk_faster_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
@@ -590,7 +585,7 @@ DewfordTown_Movement_ExitBoatSlateport:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
DewfordTown_Movement_BrineyBoardBoat: DewfordTown_Movement_BrineyBoardBoat:
@@ -607,10 +602,8 @@ DewfordTown_EventScript_TrendyPhraseBoy::
faceplayer faceplayer
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO msgbox DewfordTown_Text_XIsTheBiggestHappeningThingRight, MSGBOX_YESNO
compare VAR_RESULT, YES goto_if_eq VAR_RESULT, YES, DewfordTown_EventScript_ConfirmTrendyPhrase
goto_if_eq DewfordTown_EventScript_ConfirmTrendyPhrase goto_if_eq VAR_RESULT, NO, DewfordTown_EventScript_RejectTrendyPhrase
compare VAR_RESULT, NO
goto_if_eq DewfordTown_EventScript_RejectTrendyPhrase
end end
DewfordTown_EventScript_ConfirmTrendyPhrase:: DewfordTown_EventScript_ConfirmTrendyPhrase::
@@ -624,16 +617,13 @@ DewfordTown_EventScript_RejectTrendyPhrase::
call Common_ShowEasyChatScreen call Common_ShowEasyChatScreen
lock lock
faceplayer faceplayer
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, DewfordTown_EventScript_GiveNewTrendyPhrase
goto_if_eq DewfordTown_EventScript_GiveNewTrendyPhrase goto_if_eq VAR_RESULT, FALSE, DewfordTown_EventScript_CancelNewTrendyPhrase
compare VAR_RESULT, FALSE
goto_if_eq DewfordTown_EventScript_CancelNewTrendyPhrase
end end
DewfordTown_EventScript_GiveNewTrendyPhrase:: DewfordTown_EventScript_GiveNewTrendyPhrase::
incrementgamestat GAME_STAT_STARTED_TRENDS incrementgamestat GAME_STAT_STARTED_TRENDS
compare VAR_0x8004, FALSE goto_if_eq VAR_0x8004, FALSE, DewfordTown_EventScript_PhraseNotTrendyEnough
goto_if_eq DewfordTown_EventScript_PhraseNotTrendyEnough
msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT msgbox DewfordTown_Text_OfCourseIKnowAboutThat, MSGBOX_DEFAULT
release release
end end
data/maps/DewfordTown_Gym/scripts.inc
+44 -59
View File
@@ -3,77 +3,66 @@ DewfordTown_Gym_MapScripts::
.byte 0 .byte 0
DewfordTown_Gym_OnTransition: DewfordTown_Gym_OnTransition:
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
end end
DewfordTown_Gym_EventScript_SetFlashRadius:: DewfordTown_Gym_EventScript_SetFlashLevel::
goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn goto_if_defeated TRAINER_BRAWLY_1, DewfordTown_Gym_EventScript_SetLightsOn
call DewfordTown_Gym_EventScript_CountTrainersDefeated call DewfordTown_Gym_EventScript_CountTrainersDefeated
copyvar VAR_0x8001, VAR_0x8000 copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 0 goto_if_eq VAR_0x8000, 0, DewfordTown_Gym_EventScript_SetFlashLevel7
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius7 goto_if_eq VAR_0x8000, 1, DewfordTown_Gym_EventScript_SetFlashLevel6
compare VAR_0x8000, 1 goto_if_eq VAR_0x8000, 2, DewfordTown_Gym_EventScript_SetFlashLevel5
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius6 goto_if_eq VAR_0x8000, 3, DewfordTown_Gym_EventScript_SetFlashLevel4
compare VAR_0x8000, 2 goto_if_eq VAR_0x8000, 4, DewfordTown_Gym_EventScript_SetFlashLevel3
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius5 goto_if_eq VAR_0x8000, 5, DewfordTown_Gym_EventScript_SetFlashLevel2
compare VAR_0x8000, 3 goto DewfordTown_Gym_EventScript_SetFlashLevel1
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius4
compare VAR_0x8000, 4
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius3
compare VAR_0x8000, 5
goto_if_eq DewfordTown_Gym_EventScript_SetFlashRadius2
goto DewfordTown_Gym_EventScript_SetFlashRadius1
DewfordTown_Gym_EventScript_SetLightsOn:: DewfordTown_Gym_EventScript_SetLightsOn::
setflashradius 0 setflashlevel 0
return return
DewfordTown_Gym_EventScript_SetFlashRadius1:: @ Brightest
setflashradius 1 DewfordTown_Gym_EventScript_SetFlashLevel1::
setflashlevel 1
return return
DewfordTown_Gym_EventScript_SetFlashRadius2:: DewfordTown_Gym_EventScript_SetFlashLevel2::
setflashradius 2 setflashlevel 2
return return
DewfordTown_Gym_EventScript_SetFlashRadius3:: DewfordTown_Gym_EventScript_SetFlashLevel3::
setflashradius 3 setflashlevel 3
return return
DewfordTown_Gym_EventScript_SetFlashRadius4:: DewfordTown_Gym_EventScript_SetFlashLevel4::
setflashradius 4 setflashlevel 4
return return
DewfordTown_Gym_EventScript_SetFlashRadius5:: DewfordTown_Gym_EventScript_SetFlashLevel5::
setflashradius 5 setflashlevel 5
return return
DewfordTown_Gym_EventScript_SetFlashRadius6:: DewfordTown_Gym_EventScript_SetFlashLevel6::
setflashradius 6 setflashlevel 6
return return
DewfordTown_Gym_EventScript_SetFlashRadius7:: @ Darkest
setflashradius 7 DewfordTown_Gym_EventScript_SetFlashLevel7::
setflashlevel 7
return return
DewfordTown_Gym_EventScript_BrightenRoom:: DewfordTown_Gym_EventScript_BrightenRoom::
call DewfordTown_Gym_EventScript_CountTrainersDefeated call DewfordTown_Gym_EventScript_CountTrainersDefeated
nop1 nop1
compare VAR_0x8000, VAR_0x8001 goto_if_eq VAR_0x8000, VAR_0x8001, DewfordTown_Gym_EventScript_NoLightChange
goto_if_eq DewfordTown_Gym_EventScript_NoLightChange
copyvar VAR_0x8001, VAR_0x8000 copyvar VAR_0x8001, VAR_0x8000
compare VAR_0x8000, 1 goto_if_eq VAR_0x8000, 1, DewfordTown_Gym_EventScript_AnimateFlash1Trainer
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash1Trainer goto_if_eq VAR_0x8000, 2, DewfordTown_Gym_EventScript_AnimateFlash2Trainers
compare VAR_0x8000, 2 goto_if_eq VAR_0x8000, 3, DewfordTown_Gym_EventScript_AnimateFlash3Trainers
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash2Trainers goto_if_eq VAR_0x8000, 4, DewfordTown_Gym_EventScript_AnimateFlash4Trainers
compare VAR_0x8000, 3 goto_if_eq VAR_0x8000, 5, DewfordTown_Gym_EventScript_AnimateFlash5Trainers
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash3Trainers goto_if_eq VAR_0x8000, 6, DewfordTown_Gym_EventScript_AnimateFlash6Trainers
compare VAR_0x8000, 4
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash4Trainers
compare VAR_0x8000, 5
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash5Trainers
compare VAR_0x8000, 6
goto_if_eq DewfordTown_Gym_EventScript_AnimateFlash6Trainers
DewfordTown_Gym_EventScript_NoLightChange:: DewfordTown_Gym_EventScript_NoLightChange::
return return
@@ -82,43 +71,43 @@ DewfordTown_Gym_EventScript_NoLightChange::
DewfordTown_Gym_EventScript_AnimateFlash1Trainer:: DewfordTown_Gym_EventScript_AnimateFlash1Trainer::
playse SE_SWITCH playse SE_SWITCH
animateflash 6 animateflash 6
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlash2Trainers:: DewfordTown_Gym_EventScript_AnimateFlash2Trainers::
playse SE_SWITCH playse SE_SWITCH
animateflash 5 animateflash 5
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlash3Trainers:: DewfordTown_Gym_EventScript_AnimateFlash3Trainers::
playse SE_SWITCH playse SE_SWITCH
animateflash 4 animateflash 4
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlash4Trainers:: DewfordTown_Gym_EventScript_AnimateFlash4Trainers::
playse SE_SWITCH playse SE_SWITCH
animateflash 3 animateflash 3
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlash5Trainers:: DewfordTown_Gym_EventScript_AnimateFlash5Trainers::
playse SE_SWITCH playse SE_SWITCH
animateflash 2 animateflash 2
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlash6Trainers:: DewfordTown_Gym_EventScript_AnimateFlash6Trainers::
playse SE_SWITCH playse SE_SWITCH
animateflash 1 animateflash 1
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_AnimateFlashFullBrightness:: DewfordTown_Gym_EventScript_AnimateFlashFullBrightness::
playse SE_SWITCH playse SE_SWITCH
animateflash 0 animateflash 0
call DewfordTown_Gym_EventScript_SetFlashRadius call DewfordTown_Gym_EventScript_SetFlashLevel
return return
DewfordTown_Gym_EventScript_CountTrainersDefeated:: DewfordTown_Gym_EventScript_CountTrainersDefeated::
@@ -146,8 +135,7 @@ DewfordTown_Gym_EventScript_StopCountingTrainers::
DewfordTown_Gym_EventScript_Brawly:: DewfordTown_Gym_EventScript_Brawly::
trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC trainerbattle_single TRAINER_BRAWLY_1, DewfordTown_Gym_Text_BrawlyIntro, DewfordTown_Gym_Text_BrawlyDefeat, DewfordTown_Gym_EventScript_BrawlyDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle specialvar VAR_RESULT, ShouldTryRematchBattle
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, DewfordTown_Gym_EventScript_BrawlyRematch
goto_if_eq DewfordTown_Gym_EventScript_BrawlyRematch
goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2 goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_GiveBulkUp2
msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT msgbox DewfordTown_Gym_Text_BrawlyPostBattle, MSGBOX_DEFAULT
release release
@@ -162,8 +150,7 @@ DewfordTown_Gym_EventScript_BrawlyDefeated::
setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_DEFEATED_DEWFORD_GYM
setflag FLAG_BADGE02_GET setflag FLAG_BADGE02_GET
addvar VAR_PETALBURG_GYM_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1
compare VAR_PETALBURG_GYM_STATE, 6 call_if_eq VAR_PETALBURG_GYM_STATE, 6, Common_EventScript_ReadyPetalburgGymForBattle
call_if_eq Common_EventScript_ReadyPetalburgGymForBattle
setvar VAR_0x8008, 2 setvar VAR_0x8008, 2
call Common_EventScript_SetGymTrainers call Common_EventScript_SetGymTrainers
call DewfordTown_Gym_EventScript_GiveBulkUp call DewfordTown_Gym_EventScript_GiveBulkUp
@@ -182,16 +169,14 @@ DewfordTown_Gym_EventScript_BrawlyDefeated::
DewfordTown_Gym_EventScript_GiveBulkUp:: DewfordTown_Gym_EventScript_GiveBulkUp::
giveitem ITEM_TM08 giveitem ITEM_TM08
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, Common_EventScript_BagIsFull
goto_if_eq Common_EventScript_BagIsFull
msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08 setflag FLAG_RECEIVED_TM08
return return
DewfordTown_Gym_EventScript_GiveBulkUp2: DewfordTown_Gym_EventScript_GiveBulkUp2:
giveitem ITEM_TM08 giveitem ITEM_TM08
compare VAR_RESULT, 0 goto_if_eq VAR_RESULT, 0, Common_EventScript_ShowBagIsFull
goto_if_eq Common_EventScript_ShowBagIsFull
msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT msgbox DewfordTown_Gym_Text_ExplainBulkUp, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM08 setflag FLAG_RECEIVED_TM08
release release
data/maps/DewfordTown_Hall/scripts.inc
+18 -30
View File
@@ -11,8 +11,7 @@ DewfordTown_Hall_EventScript_Girl::
faceplayer faceplayer
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
special IsTrendyPhraseBoring special IsTrendyPhraseBoring
compare VAR_RESULT, TRUE goto_if_eq VAR_RESULT, TRUE, DewfordTown_Hall_EventScript_GirlBoredOfTrend
goto_if_eq DewfordTown_Hall_EventScript_GirlBoredOfTrend
msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_CantImagineLifeWithoutTrend, MSGBOX_DEFAULT
release release
end end
@@ -36,10 +35,8 @@ DewfordTown_Hall_EventScript_Man::
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
special BufferDeepLinkPhrase special BufferDeepLinkPhrase
msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO msgbox DewfordTown_Hall_Text_DeepLinkBetweenXAndY, MSGBOX_YESNO
compare VAR_RESULT, YES goto_if_eq VAR_RESULT, YES, DewfordTown_Hall_EventScript_ConfirmTrendLink
goto_if_eq DewfordTown_Hall_EventScript_ConfirmTrendLink goto_if_eq VAR_RESULT, NO, DewfordTown_Hall_EventScript_RejectTrendLink
compare VAR_RESULT, NO
goto_if_eq DewfordTown_Hall_EventScript_RejectTrendLink
end end
DewfordTown_Hall_EventScript_ConfirmTrendLink:: DewfordTown_Hall_EventScript_ConfirmTrendLink::
@@ -58,7 +55,7 @@ DewfordTown_Hall_EventScript_ExpertM::
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_TVShowAboutTrend, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_EXPERT_M, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_EXPERT_M, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
release release
end end
@@ -69,7 +66,7 @@ DewfordTown_Hall_EventScript_Twin::
call Common_EventScript_BufferTrendyPhrase call Common_EventScript_BufferTrendyPhrase
msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_IsTrendMorePopularAcrossSea, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
release release
end end
@@ -196,16 +193,13 @@ DewfordTown_Hall_EventScript_DontMovePlayer1::
DewfordTown_Hall_EventScript_DebateReact1:: DewfordTown_Hall_EventScript_DebateReact1::
applymovement LOCALID_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft applymovement LOCALID_PSYCHIC_M, DewfordTown_Hall_Movement_PsychicWalkInPlaceLeft
waitmovement 0 waitmovement 0
compare VAR_0x8008, 0 goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactWest
goto_if_eq DewfordTown_Hall_EventScript_PlayerReactWest goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_DontMovePlayer2
compare VAR_0x8008, 1
goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer2
end end
DewfordTown_Hall_EventScript_PlayerReactWest:: DewfordTown_Hall_EventScript_PlayerReactWest::
compare VAR_FACING, DIR_EAST goto_if_eq VAR_FACING, DIR_EAST, DewfordTown_Hall_EventScript_DontMovePlayer1
goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -215,33 +209,28 @@ DewfordTown_Hall_EventScript_DontMovePlayer2::
DewfordTown_Hall_EventScript_DebateReact2:: DewfordTown_Hall_EventScript_DebateReact2::
applymovement LOCALID_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight applymovement LOCALID_SCHOOL_KID_M, DewfordTown_Hall_Movement_SchoolKidWalkInPlaceRight
waitmovement 0 waitmovement 0
compare VAR_0x8008, 0 goto_if_eq VAR_0x8008, 0, DewfordTown_Hall_EventScript_PlayerReactNorthSouth
goto_if_eq DewfordTown_Hall_EventScript_PlayerReactNorthSouth goto_if_eq VAR_0x8008, 1, DewfordTown_Hall_EventScript_PlayerReactEast
compare VAR_0x8008, 1
goto_if_eq DewfordTown_Hall_EventScript_PlayerReactEast
end end
DewfordTown_Hall_EventScript_PlayerReactNorthSouth:: DewfordTown_Hall_EventScript_PlayerReactNorthSouth::
compare VAR_FACING, DIR_NORTH call_if_eq VAR_FACING, DIR_NORTH, DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp
call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp call_if_eq VAR_FACING, DIR_SOUTH, DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown
compare VAR_FACING, DIR_SOUTH
call_if_eq DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown
return return
DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp:: DewfordTown_Hall_EventScript_PlayerWalkInPlaceUp::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown:: DewfordTown_Hall_EventScript_PlayerWalkInPlaceDown::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
DewfordTown_Hall_EventScript_PlayerReactEast:: DewfordTown_Hall_EventScript_PlayerReactEast::
compare VAR_FACING, DIR_WEST goto_if_eq VAR_FACING, DIR_WEST, DewfordTown_Hall_EventScript_DontMovePlayer1
goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
@@ -260,8 +249,7 @@ DewfordTown_Hall_EventScript_SludgeBombMan::
goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_ReceivedSludgeBomb
msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_GiveYouSludgeBomb, MSGBOX_DEFAULT
giveitem ITEM_TM36 giveitem ITEM_TM36
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_TM36 setflag FLAG_RECEIVED_TM36
release release
end end
data/maps/DewfordTown_House1/scripts.inc
+1 -1
View File
@@ -13,7 +13,7 @@ DewfordTown_House1_EventScript_Zigzagoon::
lock lock
faceplayer faceplayer
waitse waitse
playmoncry SPECIES_ZIGZAGOON, 0 playmoncry SPECIES_ZIGZAGOON, CRY_MODE_NORMAL
msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT msgbox DewfordTown_House1_Text_Zigzagoon, MSGBOX_DEFAULT
waitmoncry waitmoncry
release release
data/maps/DewfordTown_House2/scripts.inc
+1 -2
View File
@@ -7,8 +7,7 @@ DewfordTown_House2_EventScript_Man::
goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_ExplainSilkScarf
msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT msgbox DewfordTown_House2_Text_WantYouToHaveSilkScarf, MSGBOX_DEFAULT
giveitem ITEM_SILK_SCARF giveitem ITEM_SILK_SCARF
compare VAR_RESULT, FALSE goto_if_eq VAR_RESULT, FALSE, DewfordTown_House2_EventScript_NoRoomForScarf
goto_if_eq DewfordTown_House2_EventScript_NoRoomForScarf
setflag FLAG_RECEIVED_SILK_SCARF setflag FLAG_RECEIVED_SILK_SCARF
release release
end end
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+22 -28
View File
@@ -50,24 +50,20 @@ EverGrandeCity_ChampionsRoom_EventScript_Wallace::
EverGrandeCity_ChampionsRoom_EventScript_Defeated:: EverGrandeCity_ChampionsRoom_EventScript_Defeated::
playse SE_DOOR playse SE_DOOR
setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, 0 setmetatile 6, 1, METATILE_EliteFour_OpenDoorChampion_Frame, FALSE
setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, 0 setmetatile 6, 2, METATILE_EliteFour_OpenDoorChampion_Opening, FALSE
special DrawWholeMapView special DrawWholeMapView
msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_PostBattleSpeech, MSGBOX_DEFAULT
closemessage closemessage
playse SE_DOOR playse SE_DOOR
checkplayergender checkplayergender
compare VAR_RESULT, MALE call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
compare VAR_RESULT, FEMALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
addobject LOCALID_RIVAL addobject LOCALID_RIVAL
call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer
checkplayergender checkplayergender
compare VAR_RESULT, MALE goto_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayAdvice
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice goto_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
compare VAR_RESULT, FEMALE
goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
end end
EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic:: EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic::
@@ -109,39 +105,37 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF::
addobject LOCALID_BIRCH addobject LOCALID_BIRCH
applymovement LOCALID_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives applymovement LOCALID_BIRCH, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_BirchArriveRatePokedex, MSGBOX_DEFAULT
call ProfBirch_EventScript_RatePokedex call ProfBirch_EventScript_RatePokedex
msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_BirchCongratulations, MSGBOX_DEFAULT
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_WallaceComeWithMe, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT
checkplayergender checkplayergender
compare VAR_RESULT, MALE call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
compare VAR_RESULT, FEMALE
call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
closemessage closemessage
applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit
waitmovement 0 waitmovement 0
setflag FLAG_HIDE_PETALBURG_GYM_GREETER setflag FLAG_HIDE_PETALBURG_GYM_GREETER
warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 7, 16
waitstate waitstate
releaseall releaseall
end end
@@ -157,7 +151,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations::
EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer::
applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer applymovement LOCALID_RIVAL, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
@@ -187,17 +181,17 @@ EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer:
walk_up walk_up
walk_left walk_left
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth: EverGrandeCity_ChampionsRoom_Movement_RivalLookBackAndForth:
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
step_end step_end
@@ -209,7 +203,7 @@ EverGrandeCity_ChampionsRoom_Movement_RivalFollows:
EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart: EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart:
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
EverGrandeCity_ChampionsRoom_Movement_WallaceExit: EverGrandeCity_ChampionsRoom_Movement_WallaceExit:
@@ -226,7 +220,7 @@ EverGrandeCity_ChampionsRoom_Movement_BirchArrives:
walk_up walk_up
walk_right walk_right
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
EverGrandeCity_ChampionsRoom_Text_IntroSpeech: EverGrandeCity_ChampionsRoom_Text_IntroSpeech:
Loaded 100 of 2040 files, more files were not shown because too many files have changed in this diff. Show more