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

Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync

Browse Source
This commit is contained in:
ultima-soul committed 2021-11-21 10:40:26 -08:00
2 parents 23104a02e7 ef935f6f4a
commit 3ed51d6d91
965 files changed
+54032 -52665
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

.github/calcrom/calcrom.pl
+13 -11
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";
@@ -149,17 +155,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_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
+3 -3
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
@@ -109,7 +109,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 +141,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_script.inc
+247 -241
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
+37 -32
View File
@@ -274,8 +274,8 @@
.2byte \functionId .2byte \functionId
.endm .endm
@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific @ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific
@ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock @ commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock
@ state, the script will remain blocked indefinitely (essentially a hang). @ state, the script will remain blocked indefinitely (essentially a hang).
.macro waitstate .macro waitstate
.byte 0x27 .byte 0x27
@@ -317,7 +317,7 @@
.byte 0x2d .byte 0x2d
.endm .endm
@ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG, @ Sets the values of variables 0x8000, 0x8001, and 0x8002 to the current hour, minute, and second. In FRLG,
@ this command sets those variables to zero. @ this command sets those variables to zero.
.macro gettime .macro gettime
.byte 0x2e .byte 0x2e
@@ -382,7 +382,7 @@
.byte \speed .byte \speed
.endm .endm
@ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF, @ Sends the player to Warp warp on Map bank.map. If the specified warp is 0xFF,
@ then the player will instead be sent to (X, Y) on the map. @ then the player will instead be sent to (X, Y) on the map.
.macro warp map:req, warp:req, X:req, Y:req .macro warp map:req, warp:req, X:req, Y:req
.byte 0x39 .byte 0x39
@@ -434,7 +434,7 @@
.2byte \Y .2byte \Y
.endm .endm
@ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to. @ Sets the warp destination that a warp to Warp 127 on Map 127.127 will connect to.
@ Useful when a map has warps that need to go to script-controlled locations (i.e. elevators). @ Useful when a map has warps that need to go to script-controlled locations (i.e. elevators).
.macro setdynamicwarp map:req, warp:req, X:req, Y:req .macro setdynamicwarp map:req, warp:req, X:req, Y:req
.byte 0x3f .byte 0x3f
@@ -474,7 +474,7 @@
.byte 0x43 .byte 0x43
.endm .endm
@ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and @ Attempts to add quantity of item index to the player's Bag. If the player has enough room, the item will be added and
@ VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE. @ VAR_RESULT will be set to TRUE; otherwise, VAR_RESULT is set to FALSE.
.macro additem index:req, quantity=1 .macro additem index:req, quantity=1
.byte 0x44 .byte 0x44
@@ -489,7 +489,7 @@
.2byte \quantity .2byte \quantity
.endm .endm
@ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to @ Checks if the player has enough space in their Bag to hold quantity more of item index. Sets VAR_RESULT to
@ TRUE if there is room, or FALSE is there is no room. @ TRUE if there is room, or FALSE is there is no room.
.macro checkitemspace index:req, quantity:req .macro checkitemspace index:req, quantity:req
.byte 0x46 .byte 0x46
@@ -505,7 +505,7 @@
.2byte \quantity .2byte \quantity
.endm .endm
@ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT. @ Checks which Bag pocket the specified item belongs in, and writes the pocket value (POCKET_*) to VAR_RESULT.
@ This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE). @ This script is used to show the name of the proper Bag pocket when the player receives an item via callstd (simplified to giveitem in XSE).
.macro checkitemtype index:req .macro checkitemtype index:req
.byte 0x48 .byte 0x48
@@ -544,7 +544,7 @@
.2byte \decoration .2byte \decoration
.endm .endm
@ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or @ Checks if the player has enough space in their PC to hold decoration. Sets VAR_RESULT to TRUE if there is room, or
@ FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.) @ FALSE is there is no room. In FireRed, this command is a nop. (The argument is read, but not used for anything.)
.macro checkdecorspace decoration:req .macro checkdecorspace decoration:req
.byte 0x4e .byte 0x4e
@@ -567,9 +567,9 @@
.endif .endif
.endm .endm
@ Blocks script execution until the movements being applied to the specified (index) Object finish. @ Blocks script execution until the movements being applied to the specified (index) Object finish.
@ If the specified Object is 0x0000, then the command will block script execution until all Objects @ If the specified Object is 0x0000, then the command will block script execution until all Objects
@ affected by applymovement finish their movements. If the specified Object is not currently being @ affected by applymovement finish their movements. If the specified Object is not currently being
@ manipulated with applymovement, then this command does nothing. @ manipulated with applymovement, then this command does nothing.
@ If no map is specified, then the current map is used. @ If no map is specified, then the current map is used.
.macro waitmovement index:req, map .macro waitmovement index:req, map
@@ -583,8 +583,8 @@
.endif .endif
.endm .endm
@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, @ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map,
@ by setting its visibility flag if it has a valid one. If the Object does not have a valid @ by setting its visibility flag if it has a valid one. If the Object does not have a valid
@ visibility flag, this command does nothing. @ visibility flag, this command does nothing.
@ If no map is specified, then the current map is used. @ If no map is specified, then the current map is used.
.macro removeobject index:req, map .macro removeobject index:req, map
@@ -598,7 +598,7 @@
.endif .endif
.endm .endm
@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. @ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one.
@ If the Object does not have a valid visibility flag, this command does nothing. @ If the Object does not have a valid visibility flag, this command does nothing.
@ If no map is specified, then the current map is used. @ If no map is specified, then the current map is used.
.macro addobject index:req, map .macro addobject index:req, map
@@ -740,7 +740,7 @@
.endm .endm
@ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this @ Starts a trainer battle using the battle information stored in RAM (usually by trainerbattle, which actually calls this
@ command behind-the-scenes), and blocks script execution until the battle finishes. @ command behind-the-scenes), and blocks script execution until the battle finishes.
.macro trainerbattlebegin .macro trainerbattlebegin
.byte 0x5d .byte 0x5d
@@ -781,7 +781,7 @@
.2byte \y .2byte \y
.endm .endm
@ Copies a live object event's xy position to its template, so that if the sprite goes off screen, @ Copies a live object event's xy position to its template, so that if the sprite goes off screen,
@ it'll still be there when it comes back on screen. @ it'll still be there when it comes back on screen.
.macro copyobjectxytoperm index:req .macro copyobjectxytoperm index:req
.byte 0x64 .byte 0x64
@@ -794,14 +794,14 @@
.byte \byte .byte \byte
.endm .endm
@ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the @ If a standard message box (or its text) is being drawn on-screen, this command blocks script execution until the
@ box and its text have been fully drawn. @ box and its text have been fully drawn.
.macro waitmessage .macro waitmessage
.byte 0x66 .byte 0x66
.endm .endm
@ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at @ Starts displaying a standard message box containing the specified text. If text is a pointer, then the string at
@ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as @ that offset will be loaded and used. If text is script bank 0, then the value of script bank 0 will be treated as
@ a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.) @ a pointer to the text. (You can use loadpointer to place a string pointer in a script bank.)
.macro message text:req .macro message text:req
.byte 0x67 .byte 0x67
@@ -846,7 +846,7 @@
.byte \y .byte \y
.endm .endm
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId. @ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req .macro multichoice x:req, y:req, multichoiceId:req, ignoreBPress:req
@@ -859,7 +859,7 @@
@ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made. @ Displays a multichoice box from which the user can choose a selection, and blocks script execution until a selection is made.
@ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId. @ Lists of options are predefined (sMultichoiceLists) and the one to be used is specified with multichoiceId.
@ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00. @ The default argument determines the initial position of the cursor when the box is first opened; it is zero-indexed, and if it is too large, it is treated as 0x00.
@ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button. @ If ignoreBPress is set to a non-zero value, then the user will not be allowed to back out of the multichoice with the B button.
.macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req .macro multichoicedefault x:req, y:req, multichoiceId:req, default:req, ignoreBPress:req
.byte 0x70 .byte 0x70
@@ -925,8 +925,8 @@
.byte \winnerId .byte \winnerId
.endm .endm
@ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille @ Displays the string at pointer as braille text in a standard message box. The string must be formatted to use braille
@ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the @ characters and needs to provide six extra starting characters that are skipped (in RS, these characters determined the
@ box's size and position, but in Emerald these are calculated automatically). @ box's size and position, but in Emerald these are calculated automatically).
.macro braillemessage text:req .macro braillemessage text:req
.byte 0x78 .byte 0x78
@@ -996,7 +996,7 @@
.2byte \slot .2byte \slot
.endm .endm
@ Writes the name of the item at index item to the specified buffer. If the specified index is larger than @ Writes the name of the item at index item to the specified buffer. If the specified index is larger than
@ the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead. @ the number of items in the game (0x176), the name of item 0 ("????????") is buffered instead.
.macro bufferitemname out:req, item:req .macro bufferitemname out:req, item:req
.byte 0x80 .byte 0x80
@@ -1112,7 +1112,7 @@
.byte \check .byte \check
.endm .endm
@ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player @ If check is 0x00, this command will check if the player has money >= value; VAR_RESULT is set to TRUE if the player
@ has enough money, or FALSE if they do not. @ has enough money, or FALSE if they do not.
.macro checkmoney value:req, check:req .macro checkmoney value:req, check:req
.byte 0x92 .byte 0x92
@@ -1343,7 +1343,7 @@
@ Prepares to start a wild battle against a species at Level level holding item. @ Prepares to start a wild battle against a species at Level level holding item.
@ If species2 is something other than SPECIES_NONE, then the battle is a double battle with another pokemon @ If species2 is something other than SPECIES_NONE, then the battle is a double battle with another pokemon
@ with species species2 at Level level2 holding item2. @ with species species2 at Level level2 holding item2.
@ Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle. @ Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@ If the player only has one pokemon, a scripted double battle will be buggy. @ If the player only has one pokemon, a scripted double battle will be buggy.
.macro setwildbattle species:req, level:req, item:req, species2=SPECIES_NONE, level2=0, item2=ITEM_NONE .macro setwildbattle species:req, level:req, item:req, species2=SPECIES_NONE, level2=0, item2=ITEM_NONE
@@ -1452,7 +1452,7 @@
.2byte \box .2byte \box
.endm .endm
@ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text, @ Sets the color of the text in standard message boxes. 0x00 produces blue (male) text, 0x01 produces red (female) text,
@ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text. @ 0xFF resets the color to the default for the current OW's gender, and all other values produce black text.
@ Used only in FireRed/LeafGreen, does nothing in Emerald. @ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro textcolor color:req .macro textcolor color:req
@@ -1460,7 +1460,7 @@
.byte \color .byte \color
.endm .endm
@ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom @ The exact purpose of this command is unknown, but it is related to the blue help-text box that appears on the bottom
@ of the screen when the Main Menu is opened. @ of the screen when the Main Menu is opened.
@ Used only in FireRed/LeafGreen, does nothing in Emerald. @ Used only in FireRed/LeafGreen, does nothing in Emerald.
.macro loadhelp pointer:req .macro loadhelp pointer:req
@@ -1649,7 +1649,7 @@
.macro goto_if_lt dest:req @ LESS THAN .macro goto_if_lt dest:req @ LESS THAN
goto_if 0, \dest goto_if 0, \dest
.endm .endm
.macro goto_if_eq dest:req @ EQUAL .macro goto_if_eq dest:req @ EQUAL
goto_if 1, \dest goto_if 1, \dest
@@ -1683,7 +1683,7 @@
.macro call_if_lt dest:req @ LESS THAN .macro call_if_lt dest:req @ LESS THAN
call_if 0, \dest call_if 0, \dest
.endm .endm
.macro call_if_eq dest:req @ EQUAL .macro call_if_eq dest:req @ EQUAL
call_if 1, \dest call_if 1, \dest
@@ -1799,6 +1799,12 @@
dofieldeffect FLDEFF_SPARKLE dofieldeffect FLDEFF_SPARKLE
.endm .endm
.macro braillemsgbox text:req
braillemessage \text
waitbuttonpress
closebraillemessage
.endm
@ Set up a totem boost for the next battle. @ Set up a totem boost for the next battle.
@ 'battler' is the position of the mon you want to gain a boost. see B_POSITION_xx in include/constants/battle.h. @ 'battler' is the position of the mon you want to gain a boost. see B_POSITION_xx in include/constants/battle.h.
@ The rest of the arguments are the stat change values to each stat. @ The rest of the arguments are the stat change values to each stat.
@@ -1859,4 +1865,3 @@
.macro totemboost_evas2 battler:req .macro totemboost_evas2 battler:req
settotemboost \battler, 0, 0, 0, 0, 0, 0, 2 settotemboost \battler, 0, 0, 0, 0, 0, 0, 2
.endm .endm
asm/macros/movement.inc
+8 -8
View File
@@ -43,18 +43,18 @@
create_movement_action walk_in_place_fast_up create_movement_action walk_in_place_fast_up
create_movement_action walk_in_place_fast_left create_movement_action walk_in_place_fast_left
create_movement_action walk_in_place_fast_right create_movement_action walk_in_place_fast_right
create_movement_action walk_in_place_fastest_down create_movement_action walk_in_place_faster_down
create_movement_action walk_in_place_fastest_up create_movement_action walk_in_place_faster_up
create_movement_action walk_in_place_fastest_left create_movement_action walk_in_place_faster_left
create_movement_action walk_in_place_fastest_right create_movement_action walk_in_place_faster_right
create_movement_action ride_water_current_down create_movement_action ride_water_current_down
create_movement_action ride_water_current_up create_movement_action ride_water_current_up
create_movement_action ride_water_current_left create_movement_action ride_water_current_left
create_movement_action ride_water_current_right create_movement_action ride_water_current_right
create_movement_action walk_fastest_down create_movement_action walk_faster_down
create_movement_action walk_fastest_up create_movement_action walk_faster_up
create_movement_action walk_fastest_left create_movement_action walk_faster_left
create_movement_action walk_fastest_right create_movement_action walk_faster_right
create_movement_action slide_down create_movement_action slide_down
create_movement_action slide_up create_movement_action slide_up
create_movement_action slide_left create_movement_action slide_left
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
data/battle_anim_scripts.s
+225 -225
View File
File diff suppressed because it is too large. Load diff
data/battle_scripts_1.s
+299 -293
View File
File diff suppressed because it is too large. Load diff
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
+4 -4
View File
@@ -787,7 +787,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
@@ -957,7 +957,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::
@@ -1007,7 +1007,7 @@ Common_EventScript_LegendaryFlewAway::
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 +1027,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/AncientTomb/scripts.inc
+2 -6
View File
@@ -40,9 +40,7 @@ AncientTomb_EventScript_HideRegiEntrance::
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 +51,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
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
+8 -8
View File
@@ -426,15 +426,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 +475,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 +497,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
+2 -2
View File
@@ -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
+2 -2
View File
@@ -247,7 +247,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 +289,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
+4 -4
View File
@@ -758,7 +758,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 +800,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:
@@ -936,7 +936,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 +947,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
+2 -2
View File
@@ -56,7 +56,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 +100,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_BattleFactoryBattleRoom/scripts.inc
+6 -6
View File
@@ -257,12 +257,12 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_WarpToLobbyDoubles::
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_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -252,8 +252,8 @@ 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
@@ -287,8 +287,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
@@ -435,7 +435,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 +447,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_BattlePyramidTop/scripts.inc
+3 -3
View File
@@ -204,12 +204,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 +218,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_BattleTowerMultiBattleRoom/scripts.inc
+2 -2
View File
@@ -408,7 +408,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 +449,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
+4 -4
View File
@@ -76,8 +76,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
@@ -149,7 +149,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 +160,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
+3 -3
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::
@@ -101,7 +101,7 @@ 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
data/maps/BattleFrontier_Lounge2/scripts.inc
+1 -1
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
data/maps/BattleFrontier_OutsideWest/scripts.inc
+14 -14
View File
@@ -72,7 +72,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 +137,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
@@ -168,7 +168,7 @@ BattleFrontier_OutsideWest_EventScript_Camper::
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
@@ -213,23 +213,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::
data/maps/BattleFrontier_RankingHall/scripts.inc
+10 -10
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
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
+4 -4
View File
@@ -209,22 +209,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_Harbor/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ BirthIsland_Harbor_EventScript_Sailor::
goto_if_eq 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
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/DesertRuins/scripts.inc
+2 -6
View File
@@ -40,9 +40,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 +51,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
data/maps/DewfordTown/scripts.inc
+299 -299
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
@@ -230,46 +230,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 +278,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 +405,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 +590,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:
data/maps/DewfordTown_Hall/scripts.inc
+6 -6
View File
@@ -58,7 +58,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 +69,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
@@ -205,7 +205,7 @@ DewfordTown_Hall_EventScript_DebateReact1::
DewfordTown_Hall_EventScript_PlayerReactWest:: DewfordTown_Hall_EventScript_PlayerReactWest::
compare VAR_FACING, DIR_EAST compare VAR_FACING, DIR_EAST
goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -229,19 +229,19 @@ DewfordTown_Hall_EventScript_PlayerReactNorthSouth::
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 compare VAR_FACING, DIR_WEST
goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1 goto_if_eq DewfordTown_Hall_EventScript_DontMovePlayer1
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+13 -13
View File
@@ -109,26 +109,26 @@ 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
@@ -157,7 +157,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 +187,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 +209,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 +226,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:
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+6 -6
View File
@@ -22,8 +22,8 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame::
applymovement LOCALID_WALLACE, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 applymovement LOCALID_WALLACE, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1 applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame1
waitmovement 0 waitmovement 0
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT msgbox EverGrandeCity_HallOfFame_Text_HereWeHonorLeagueChampions, MSGBOX_DEFAULT
closemessage closemessage
@@ -31,13 +31,13 @@ EverGrandeCity_HallOfFame_EventScript_EnterHallOfFame::
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2 applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_WalkIntoHallOfFame2
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT msgbox EverGrandeCity_HallOfFame_Text_LetsRecordYouAndYourPartnersNames, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WALLACE, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 20 delay 20
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc
+4 -4
View File
@@ -108,23 +108,23 @@ EverGrandeCity_PokemonLeague_1F_EventScript_GoForth::
EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight: EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromRight:
walk_down walk_down
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft: EverGrandeCity_PokemonLeague_1F_Movement_MoveToFrontFromLeft:
walk_down walk_down
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay: EverGrandeCity_PokemonLeague_1F_Movement_LeftGuardOutOfWay:
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay: EverGrandeCity_PokemonLeague_1F_Movement_RightGuardOutOfWay:
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges: EverGrandeCity_PokemonLeague_1F_Text_MustHaveAllGymBadges:
data/maps/FallarborTown_BattleTentBattleRoom/scripts.inc
+6 -6
View File
@@ -185,15 +185,15 @@ FallarborTown_BattleTentBattleRoom_Movement_PlayerEnter:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle: FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceBattle:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant: FallarborTown_BattleTentBattleRoom_Movement_PlayerFaceAttendant:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter: FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter:
@@ -201,7 +201,7 @@ FallarborTown_BattleTentBattleRoom_Movement_OpponentEnter:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
@ Unused @ Unused
@@ -225,14 +225,14 @@ FallarborTown_BattleTentBattleRoom_Movement_AttendantApproachPlayer:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos: FallarborTown_BattleTentBattleRoom_Movement_AttendantReturnToPos:
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
FallarborTown_BattleTentBattleRoom_OnWarp: FallarborTown_BattleTentBattleRoom_OnWarp:
data/maps/FarawayIsland_Entrance/scripts.inc
+1 -1
View File
@@ -27,7 +27,7 @@ FarawayIsland_Entrance_EventScript_Sailor::
goto_if_eq FarawayIsland_Entrance_EventScript_AsYouLike goto_if_eq FarawayIsland_Entrance_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_FARAWAY_ISLAND_ENTRANCE hideobjectat LOCALID_SAILOR, MAP_FARAWAY_ISLAND_ENTRANCE
data/maps/FarawayIsland_Interior/scripts.inc
+1 -1
View File
@@ -73,7 +73,7 @@ FarawayIsland_Interior_Movement_MewMoveAndHide:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
set_invisible set_invisible
step_end step_end
data/maps/FortreeCity_House4/scripts.inc
+1 -1
View File
@@ -51,7 +51,7 @@ FortreeCity_House4_Movement_WingullExit:
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_right walk_fast_right
walk_in_place_fastest_down walk_in_place_faster_down
delay_8 delay_8
step_end step_end
data/maps/GraniteCave_StevensRoom/scripts.inc
+1 -1
View File
@@ -72,7 +72,7 @@ GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit:
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
GraniteCave_StevensRoom_Movement_StevenExitSouth: GraniteCave_StevensRoom_Movement_StevenExitSouth:
data/maps/LavaridgeTown/scripts.inc
+4 -4
View File
@@ -113,7 +113,7 @@ LavaridgeTown_EventScript_PlayBrendanMusic::
return return
LavaridgeTown_EventScript_RivalNoticePlayer:: LavaridgeTown_EventScript_RivalNoticePlayer::
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
@@ -130,14 +130,14 @@ LavaridgeTown_EventScript_RivalExitHerbShop::
waitmovement 0 waitmovement 0
closedoor 12, 15 closedoor 12, 15
waitdooranim waitdooranim
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_Delay48 applymovement LOCALID_RIVAL, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -178,7 +178,7 @@ LavaridgeTown_Movement_RivalExit2:
LavaridgeTown_Movement_PlayerWatchRivalExit: LavaridgeTown_Movement_PlayerWatchRivalExit:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LavaridgeTown_Movement_RivalExit1: LavaridgeTown_Movement_RivalExit1:
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -390,7 +390,7 @@ LilycoveCity_EventScript_BrendanBattleFrontier::
LilycoveCity_EventScript_RivalFlyAway:: LilycoveCity_EventScript_RivalFlyAway::
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 50 delay 50
setfieldeffectargument 0, 1 setfieldeffectargument 0, 1
data/maps/LilycoveCity_ContestLobby/scripts.inc
+11 -11
View File
@@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_ArtistExit:
step_end step_end
LilycoveCity_ContestLobby_Movement_PlayerFaceArtist: LilycoveCity_ContestLobby_Movement_PlayerFaceArtist:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LilycoveCity_ContestLobby_Movement_ArtistBeginToExit: LilycoveCity_ContestLobby_Movement_ArtistBeginToExit:
@@ -205,7 +205,7 @@ LilycoveCity_ContestLobby_Movement_ArtistReturnToPlayer:
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist:: LilycoveCity_ContestLobby_EventScript_TryDoLinkContestArtist::
@@ -303,7 +303,7 @@ LilycoveCity_ContestLobby_Movement_LinkArtistExit:
step_end step_end
LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist: LilycoveCity_ContestLobby_Movement_PlayerFaceLinkArtist:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit: LilycoveCity_ContestLobby_Movement_LinkArtistBeginExit:
@@ -320,7 +320,7 @@ LilycoveCity_ContestLobby_Movement_LinkArtistReturnToPlayer:
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
@ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted @ EventScript_SpeakToContestReceptionist either ends or returns after a contest entry is submitted
@@ -453,20 +453,20 @@ LilycoveCity_ContestLobby_Movement_PlayerWalkToContestHall:
step_end step_end
LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist: LilycoveCity_ContestLobby_Movement_PlayerApproachReceptionist:
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
step_end step_end
LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter: LilycoveCity_ContestLobby_Movement_ReceptionistApproachCounter:
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter: LilycoveCity_ContestLobby_Movement_ReceptionistExitCounter:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall: LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall:
@@ -481,7 +481,7 @@ LilycoveCity_ContestLobby_Movement_ReceptionistWalkToContestHall:
step_end step_end
LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer: LilycoveCity_ContestLobby_Movement_ReceptionistFacePlayer:
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LilycoveCity_ContestLobby_EventScript_BlackBelt:: LilycoveCity_ContestLobby_EventScript_BlackBelt::
@@ -984,13 +984,13 @@ LilycoveCity_ContestLobby_Movement_PlayerApproachLinkReceptionist:
LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter: LilycoveCity_ContestLobby_Movement_LinkReceptionistApproachCounter:
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter: LilycoveCity_ContestLobby_Movement_LinkReceptionistExitCounter:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall: LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall:
@@ -1006,7 +1006,7 @@ LilycoveCity_ContestLobby_Movement_LinkReceptionistWalkToContestHall:
step_end step_end
LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer: LilycoveCity_ContestLobby_Movement_LinkReceptionistFacePlayer:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LilycoveCity_ContestLobby_EventScript_LittleGirl:: LilycoveCity_ContestLobby_EventScript_LittleGirl::
data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_BlockingTV::
waitmovement 0 waitmovement 0
applymovement LOCALID_OWNER, Common_Movement_Delay48 applymovement LOCALID_OWNER, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT msgbox LilycoveCity_CoveLilyMotel_1F_Text_CantSeeTheTV, MSGBOX_DEFAULT
closemessage closemessage
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+1 -1
View File
@@ -115,7 +115,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_ExitFloorSelect::
LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator:: LilycoveCity_DepartmentStoreElevator_EventScript_MoveElevator::
special CloseDeptStoreElevatorWindow special CloseDeptStoreElevatorWindow
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
waitse waitse
special MoveElevator special MoveElevator
data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_LotteryClerk::
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
special BufferLottoTicketNumber special BufferLottoTicketNumber
msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT msgbox LilycoveCity_DepartmentStore_1F_Text_TicketNumberIsXPleaseWait, MSGBOX_DEFAULT
applymovement LOCALID_LOTTERY_CLERK, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_LOTTERY_CLERK, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
playse SE_PC_ON playse SE_PC_ON
special DoLotteryCornerComputerEffect special DoLotteryCornerComputerEffect
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+2 -2
View File
@@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_Pokemart_Dolls:
.2byte DECOR_PIKACHU_DOLL .2byte DECOR_PIKACHU_DOLL
.2byte DECOR_MARILL_DOLL .2byte DECOR_MARILL_DOLL
.2byte DECOR_JIGGLYPUFF_DOLL .2byte DECOR_JIGGLYPUFF_DOLL
.2byte DECOR_DUSKULL_DOLL .2byte DECOR_DUSKULL_DOLL
.2byte DECOR_WYNAUT_DOLL .2byte DECOR_WYNAUT_DOLL
.2byte DECOR_BALTOY_DOLL .2byte DECOR_BALTOY_DOLL
.2byte DECOR_KECLEON_DOLL .2byte DECOR_KECLEON_DOLL
@@ -145,7 +145,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_WomanNormal::
LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather:: LilycoveCity_DepartmentStore_5F_EventScript_WomanLegendaryWeather::
msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT msgbox LilycoveCity_DepartmentStore_5F_Text_ClosedRooftopForWeather, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_WOMAN, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WOMAN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
data/maps/LilycoveCity_Harbor/scripts.inc
+16 -16
View File
@@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_FerryAttendant::
goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime goto_if_eq LilycoveCity_Harbor_EventScript_AuroraTicketFirstTime
compare VAR_TEMP_B, 4 compare VAR_TEMP_B, 4
goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime goto_if_eq LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime
compare VAR_TEMP_B, 8 compare VAR_TEMP_B, 8
goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime goto_if_eq LilycoveCity_Harbor_EventScript_MysticTicketFirstTime
compare VAR_TEMP_B, 0 compare VAR_TEMP_B, 0
goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime goto_if_ne LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime
@@ -252,7 +252,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime::
call LilycoveCity_Harbor_EventScript_GetEventTicketSailor call LilycoveCity_Harbor_EventScript_GetEventTicketSailor
msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT msgbox EventTicket_Text_OldSeaMapTooFar, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_FERRY_SAILOR, Common_Movement_ExclamationMark applymovement LOCALID_FERRY_SAILOR, Common_Movement_ExclamationMark
@@ -334,12 +334,12 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime::
LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect::
msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 30 delay 30
removeobject LOCALID_FERRY_SAILOR removeobject LOCALID_FERRY_SAILOR
delay 30 delay 30
applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_ATTENDANT, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
showobjectat LOCALID_ATTENDANT, MAP_LILYCOVE_CITY_HARBOR showobjectat LOCALID_ATTENDANT, MAP_LILYCOVE_CITY_HARBOR
delay 30 delay 30
@@ -348,7 +348,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect::
end end
LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: LilycoveCity_Harbor_EventScript_GetEventTicketSailor::
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -360,7 +360,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor::
return return
LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: LilycoveCity_Harbor_EventScript_BoardFerryWithSailor::
applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_FERRY_SAILOR, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 30 delay 30
removeobject LOCALID_FERRY_SAILOR removeobject LOCALID_FERRY_SAILOR
@@ -424,7 +424,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind::
LilycoveCity_Harbor_EventScript_BoardFerry:: LilycoveCity_Harbor_EventScript_BoardFerry::
msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -455,7 +455,7 @@ LilycoveCity_Harbor_EventScript_ExitSailSelect::
LilycoveCity_Harbor_Movement_PlayerBoardFerryEast: LilycoveCity_Harbor_Movement_PlayerBoardFerryEast:
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth: LilycoveCity_Harbor_Movement_PlayerBoardFerryNorth:
@@ -490,7 +490,7 @@ LilycoveCity_Harbor_EventScript_MoveSailorOutOfWayEast::
return return
LilycoveCity_Harbor_Movement_SailorOutOfWayNorth: LilycoveCity_Harbor_Movement_SailorOutOfWayNorth:
walk_in_place_fastest_right walk_in_place_faster_right
lock_facing_direction lock_facing_direction
walk_left walk_left
unlock_facing_direction unlock_facing_direction
@@ -503,22 +503,22 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast:
step_end step_end
LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth::
applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast::
applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth::
applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast::
applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_BRINEY, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
@@ -537,7 +537,7 @@ LilycoveCity_Harbor_EventScript_BoardFerryWithBrineyAndSailorEast::
return return
LilycoveCity_Harbor_Movement_BrineyBoardFerry: LilycoveCity_Harbor_Movement_BrineyBoardFerry:
walk_in_place_fastest_up walk_in_place_faster_up
delay_8 delay_8
set_invisible set_invisible
step_end step_end
@@ -554,7 +554,7 @@ LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth:
delay_16 delay_16
delay_16 delay_16
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
set_invisible set_invisible
step_end step_end
@@ -562,7 +562,7 @@ LilycoveCity_Harbor_Movement_SailorBoardWithBrineyNorth:
LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast: LilycoveCity_Harbor_Movement_PlayerBoardWithBrineyEast:
delay_16 delay_16
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
set_invisible set_invisible
step_end step_end
data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc
+1 -1
View File
@@ -83,7 +83,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_ShowExhibitHall::
end end
LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft: LilycoveCity_LilycoveMuseum_2F_Movement_PlayerWalkInPlaceLeft:
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall: LilycoveCity_LilycoveMuseum_2F_Movement_FaceExhibitHall:
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+6 -6
View File
@@ -20,18 +20,18 @@ LilycoveCity_PokemonTrainerFanClub_OnFrame:
LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans:: LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
lockall lockall
applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_LASS, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_OhWowItsPlayer, MSGBOX_DEFAULT
applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer
applymovement LOCALID_MAN, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer applymovement LOCALID_MAN, LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer
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 LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_HeardAboutYouImYourFan, MSGBOX_DEFAULT
applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer applymovement LOCALID_LITTLE_GIRL, LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer
waitmovement 0 waitmovement 0
@@ -41,7 +41,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_MeetFirstFans::
LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer: LilycoveCity_PokemonTrainerFanClub_Movement_FanApproachPlayer:
delay_8 delay_8
walk_in_place_fastest_down walk_in_place_faster_down
walk_down walk_down
walk_down walk_down
walk_down walk_down
@@ -60,7 +60,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlWatchPlayer:
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer: LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlMoveCloserToPlayer:
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer: LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:
@@ -68,7 +68,7 @@ LilycoveCity_PokemonTrainerFanClub_Movement_LittleGirlHideFromPlayer:
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_right walk_fast_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LilycoveCity_PokemonTrainerFanClub_OnTransition: LilycoveCity_PokemonTrainerFanClub_OnTransition:
data/maps/LittlerootTown/scripts.inc
+27 -27
View File
@@ -185,7 +185,7 @@ LittlerootTown_Movement_MomExitHouse:
LittlerootTown_Movement_MomApproachPlayerAtTruck: LittlerootTown_Movement_MomApproachPlayerAtTruck:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_Movement_MomApproachDoor: LittlerootTown_Movement_MomApproachDoor:
@@ -203,7 +203,7 @@ LittlerootTown_Movement_PlayerApproachDoor:
delay_16 delay_16
delay_8 delay_8
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LittlerootTown_Movement_PlayerEnterHouse: LittlerootTown_Movement_PlayerEnterHouse:
@@ -347,7 +347,7 @@ LittlerootTown_Movement_TwinReturnLeft:
walk_left walk_left
walk_left walk_left
walk_up walk_up
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LittlerootTown_Movement_PushPlayerBackFromRoute: LittlerootTown_Movement_PushPlayerBackFromRoute:
@@ -387,14 +387,14 @@ LittlerootTown_Movement_TwinReturnRight:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LittlerootTown_EventScript_GoSaveBirchTrigger:: LittlerootTown_EventScript_GoSaveBirchTrigger::
lockall lockall
applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_TWIN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
special GetPlayerBigGuyGirlString special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT msgbox LittlerootTown_Text_CanYouGoSeeWhatsHappening, MSGBOX_DEFAULT
@@ -525,12 +525,12 @@ LittlerootTown_EventScript_SetHomeDoorCoordsFemale::
return return
LittlerootTown_EventScript_MomNoticePlayerMale:: LittlerootTown_EventScript_MomNoticePlayerMale::
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomNoticePlayerFemale:: LittlerootTown_EventScript_MomNoticePlayerFemale::
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
@@ -565,70 +565,70 @@ LittlerootTown_EventScript_MomApproachPlayerFemale::
return return
LittlerootTown_EventScript_MomApproachPlayer0:: LittlerootTown_EventScript_MomApproachPlayer0::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer0 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer0
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayer1:: LittlerootTown_EventScript_MomApproachPlayer1::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer1 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayer1
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerMale2:: LittlerootTown_EventScript_MomApproachPlayerMale2::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale2 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale2
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerMale3:: LittlerootTown_EventScript_MomApproachPlayerMale3::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale3 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale3
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerMale4:: LittlerootTown_EventScript_MomApproachPlayerMale4::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale4 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale4
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerMale5:: LittlerootTown_EventScript_MomApproachPlayerMale5::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale5 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerMale5
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerFemale2:: LittlerootTown_EventScript_MomApproachPlayerFemale2::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale2 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale2
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerFemale3:: LittlerootTown_EventScript_MomApproachPlayerFemale3::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale3 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale3
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerFemale4:: LittlerootTown_EventScript_MomApproachPlayerFemale4::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale4 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale4
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_MomApproachPlayerFemale5:: LittlerootTown_EventScript_MomApproachPlayerFemale5::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale5 applymovement LOCALID_MOM, LittlerootTown_Movement_MomApproachPlayerFemale5
waitmovement 0 waitmovement 0
@@ -861,7 +861,7 @@ LittlerootTown_Movement_MomReturnHomeMale2:
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
LittlerootTown_Movement_MomReturnHomeMale3: LittlerootTown_Movement_MomReturnHomeMale3:
@@ -870,33 +870,33 @@ LittlerootTown_Movement_MomReturnHomeMale3:
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
LittlerootTown_Movement_MomReturnHomeMale4: LittlerootTown_Movement_MomReturnHomeMale4:
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LittlerootTown_Movement_MomReturnHomeMale5: LittlerootTown_Movement_MomReturnHomeMale5:
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
LittlerootTown_Movement_MomReturnHomeFemale2: LittlerootTown_Movement_MomReturnHomeFemale2:
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
LittlerootTown_Movement_MomReturnHomeFemale3: LittlerootTown_Movement_MomReturnHomeFemale3:
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LittlerootTown_Movement_MomReturnHomeFemale4: LittlerootTown_Movement_MomReturnHomeFemale4:
@@ -905,7 +905,7 @@ LittlerootTown_Movement_MomReturnHomeFemale4:
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
LittlerootTown_Movement_MomReturnHomeFemale5: LittlerootTown_Movement_MomReturnHomeFemale5:
@@ -913,7 +913,7 @@ LittlerootTown_Movement_MomReturnHomeFemale5:
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
LittlerootTown_Movement_MomExitThroughDoor: LittlerootTown_Movement_MomExitThroughDoor:
@@ -929,7 +929,7 @@ LittlerootTown_EventScript_Mom::
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale call_if_eq LittlerootTown_EventScript_SetHomeDoorCoordsFemale
call LittlerootTown_EventScript_GiveRunningShoes call LittlerootTown_EventScript_GiveRunningShoes
applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MOM, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
opendoor VAR_0x8009, VAR_0x800A opendoor VAR_0x8009, VAR_0x800A
waitdooranim waitdooranim
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+19 -19
View File
@@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor::
waitmovement 0 waitmovement 0
applymovement LOCALID_RIVAL_MOM, Common_Movement_Delay48 applymovement LOCALID_RIVAL_MOM, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_RIVAL_MOM, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach applymovement LOCALID_RIVAL_MOM, LittlerootTown_BrendansHouse_1F_Movement_RivalMomApproach
waitmovement 0 waitmovement 0
special GetRivalSonDaughterString special GetRivalSonDaughterString
@@ -123,7 +123,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_GoSeeRoom::
lockall lockall
setvar VAR_0x8004, LOCALID_MOM setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, MALE setvar VAR_0x8005, MALE
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
goto PlayersHouse_1F_EventScript_MomGoSeeRoom goto PlayersHouse_1F_EventScript_MomGoSeeRoom
end end
@@ -187,7 +187,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_MeetRival::
end end
LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan:: LittlerootTown_BrendansHouse_1F_EventScript_PlayerFaceBrendan::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -207,9 +207,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_BrendanApproachPlayer2::
return return
LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0: LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer0:
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -223,9 +223,9 @@ LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer1:
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2: LittlerootTown_BrendansHouse_1F_Movement_BrendanApproachPlayer2:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -253,48 +253,48 @@ LittlerootTown_BrendansHouse_1F_EventScript_BrendanGoUpstairs2::
LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0: LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit0:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1: LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit1:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2: LittlerootTown_BrendansHouse_1F_Movement_PlayerWatchBrendanExit2:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0: LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs0:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1: LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs1:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
step_end step_end
LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2: LittlerootTown_BrendansHouse_1F_Movement_BrendanGoUpstairs2:
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
step_end step_end
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+18 -18
View File
@@ -95,7 +95,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendan::
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth:: LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth
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 RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -107,7 +107,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanNorth::
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth:: LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth
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 RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -119,7 +119,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanSouth::
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest:: LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest
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 RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -131,7 +131,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanWest::
LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast:: LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast::
applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast applymovement LOCALID_RIVAL, LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_BrendanWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -142,7 +142,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_MeetBrendanEast::
LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters: LittlerootTown_BrendansHouse_2F_Movement_BrendanEnters:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth: LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerNorth:
@@ -161,17 +161,17 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCNorth:
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
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth: LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanNorth:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth: LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerSouth:
@@ -186,22 +186,22 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCSouth:
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
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth: LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanSouth:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest: LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerWest:
walk_left walk_left
walk_left walk_left
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest: LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest:
@@ -212,16 +212,16 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCWest:
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
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest: LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanWest:
delay_8 delay_8
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast: LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast:
@@ -230,21 +230,21 @@ LittlerootTown_BrendansHouse_2F_Movement_BrendanApproachPlayerEast:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast: LittlerootTown_BrendansHouse_2F_Movement_BrendanWalkToPCEast:
walk_up walk_up
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
@ Unused, the player is already facing this direction so its unneeded @ Unused, the player is already facing this direction so its unneeded
LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast: LittlerootTown_BrendansHouse_2F_Movement_PlayerWatchBrendanEast:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_BrendansHouse_2F_EventScript_PC:: LittlerootTown_BrendansHouse_2F_EventScript_PC::
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+19 -19
View File
@@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor::
waitmovement 0 waitmovement 0
applymovement LOCALID_RIVAL_MOM, Common_Movement_Delay48 applymovement LOCALID_RIVAL_MOM, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
applymovement LOCALID_RIVAL_MOM, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach applymovement LOCALID_RIVAL_MOM, LittlerootTown_MaysHouse_1F_Movement_RivalMomApproach
waitmovement 0 waitmovement 0
special GetRivalSonDaughterString special GetRivalSonDaughterString
@@ -157,7 +157,7 @@ LittlerootTown_MaysHouse_1F_EventScript_GoSeeRoom::
lockall lockall
setvar VAR_0x8004, LOCALID_MOM setvar VAR_0x8004, LOCALID_MOM
setvar VAR_0x8005, FEMALE setvar VAR_0x8005, FEMALE
applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight applymovement VAR_0x8004, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
goto PlayersHouse_1F_EventScript_MomGoSeeRoom goto PlayersHouse_1F_EventScript_MomGoSeeRoom
end end
@@ -221,7 +221,7 @@ LittlerootTown_MaysHouse_1F_EventScript_MeetRival::
end end
LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay:: LittlerootTown_MaysHouse_1F_EventScript_PlayerFaceMay::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -241,9 +241,9 @@ LittlerootTown_MaysHouse_1F_EventScript_MayApproachPlayer2::
return return
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0: LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer0:
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -257,9 +257,9 @@ LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer1:
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2: LittlerootTown_MaysHouse_1F_Movement_MayApproachPlayer2:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_up walk_up
@@ -287,48 +287,48 @@ LittlerootTown_MaysHouse_1F_EventScript_MayGoUpstairs2::
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0: LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit0:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1: LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit1:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2: LittlerootTown_MaysHouse_1F_Movement_PlayerWatchMayExit2:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0: LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs0:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1: LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs1:
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
step_end step_end
LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2: LittlerootTown_MaysHouse_1F_Movement_MayGoUpstairs2:
walk_in_place_fastest_left walk_in_place_faster_left
walk_left walk_left
walk_in_place_fastest_up walk_in_place_faster_up
walk_up walk_up
walk_up walk_up
step_end step_end
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+20 -20
View File
@@ -95,7 +95,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMay::
LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth:: LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -107,7 +107,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayNorth::
LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth:: LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -119,7 +119,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMaySouth::
LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest:: LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -130,7 +130,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayWest::
LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast:: LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast::
applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast applymovement LOCALID_RIVAL, LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT msgbox RivalsHouse_2F_Text_MayWhoAreYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -142,7 +142,7 @@ LittlerootTown_MaysHouse_2F_EventScript_MeetMayEast::
LittlerootTown_MaysHouse_2F_Movement_MayEnters: LittlerootTown_MaysHouse_2F_Movement_MayEnters:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth: LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerNorth:
@@ -157,22 +157,22 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCNorth:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
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
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth: LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayNorth:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth: LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth:
@@ -183,20 +183,20 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerSouth:
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth: LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCSouth:
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
walk_right walk_right
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
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth: LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMaySouth:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest: LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest:
@@ -205,28 +205,28 @@ LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerWest:
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest: LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCWest:
walk_up walk_up
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
@ Unused, the player is already facing this direction so its unneeded @ Unused, the player is already facing this direction so its unneeded
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest: LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayWest:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast: LittlerootTown_MaysHouse_2F_Movement_MayApproachPlayerEast:
walk_right walk_right
walk_right walk_right
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast: LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast:
@@ -237,15 +237,15 @@ LittlerootTown_MaysHouse_2F_Movement_MayWalkToPCEast:
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
LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast: LittlerootTown_MaysHouse_2F_Movement_PlayerWatchMayEast:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
RivalsHouse_2F_EventScript_Rival:: RivalsHouse_2F_EventScript_Rival::
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+13 -13
View File
@@ -191,8 +191,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex::
delay 10 delay 10
playse SE_CLICK playse SE_CLICK
delay 20 delay 20
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
@@ -204,8 +204,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_UpgradeToNationalDex::
delay 20 delay 20
applymovement LOCALID_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex applymovement LOCALID_BIRCH, LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex
waitmovement 0 waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterUp
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_OkayAllDone, MSGBOX_DEFAULT
playfanfare MUS_OBTAIN_ITEM playfanfare MUS_OBTAIN_ITEM
@@ -236,11 +236,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanUpgradeComment::
LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes: LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes:
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_16 delay_16
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_16 delay_16
walk_right walk_right
@@ -251,7 +251,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchRetrievePokedexes:
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
LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex: LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex:
@@ -263,7 +263,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_BirchReturnPokedex:
walk_up walk_up
walk_up walk_up
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter:: LittlerootTown_ProfessorBirchsLab_EventScript_ChooseJohtoStarter::
@@ -310,7 +310,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil::
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_CYNDAQUIL, 10, 3 showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeCyndaquil, MSGBOX_YESNO
@@ -323,7 +323,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Totodile::
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_TOTODILE, 10, 3 showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeTotodile, MSGBOX_YESNO
@@ -336,7 +336,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita::
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_AlreadyChoseJohtoStarter
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_CHIKORITA, 10, 3 showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_YoullTakeChikorita, MSGBOX_YESNO
@@ -553,7 +553,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_GivePokedex::
closemessage closemessage
applymovement LOCALID_RIVAL, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer applymovement LOCALID_RIVAL, LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
@@ -611,7 +611,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_BrendanNoRoomForPokeBalls::
LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer: LittlerootTown_ProfessorBirchsLab_Movement_RivalApproachPlayer:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
LittlerootTown_ProfessorBirchsLab_EventScript_Machine:: LittlerootTown_ProfessorBirchsLab_EventScript_Machine::
data/maps/MagmaHideout_4F/scripts.inc
+2 -2
View File
@@ -23,7 +23,7 @@ MagmaHideout_4F_EventScript_Maxie::
playfanfare MUS_AWAKEN_LEGEND playfanfare MUS_AWAKEN_LEGEND
playse SE_ORB playse SE_ORB
special DoOrbEffect special DoOrbEffect
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 150 delay 150
removeobject LOCALID_GROUDON_SLEEPING removeobject LOCALID_GROUDON_SLEEPING
@@ -55,7 +55,7 @@ MagmaHideout_4F_EventScript_Maxie::
waitmovement 0 waitmovement 0
msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT msgbox MagmaHideout_4F_Text_MaxieGroudonWhatsWrong, MSGBOX_DEFAULT
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement LOCALID_MAXIE, Common_Movement_FacePlayer applymovement LOCALID_MAXIE, Common_Movement_FacePlayer
data/maps/MauvilleCity/scripts.inc
+15 -15
View File
@@ -90,7 +90,7 @@ MauvilleCity_EventScript_UncleAskPlayerToBattleWally::
MauvilleCity_EventScript_Wally:: MauvilleCity_EventScript_Wally::
lockall lockall
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_WallyRequestBattleAgain
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyWantToChallengeGym, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT msgbox MauvilleCity_Text_UncleYourePushingIt, MSGBOX_DEFAULT
@@ -122,7 +122,7 @@ MauvilleCity_EventScript_WallyAndUncleExitNorth::
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitNorth1 applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitNorth1
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth1 applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitNorth1
waitmovement 0 waitmovement 0
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth applymovement OBJ_EVENT_ID_PLAYER, MauvilleCity_Movement_PlayerFaceUncleNorth
@@ -142,7 +142,7 @@ MauvilleCity_EventScript_WallyAndUncleExitEast::
applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitEast1 applymovement LOCALID_WALLY, MauvilleCity_Movement_WallyExitEast1
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast1 applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleExitEast1
waitmovement 0 waitmovement 0
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerEast applymovement LOCALID_WALLYS_UNCLE, MauvilleCity_Movement_WallysUncleApproachPlayerEast
@@ -168,7 +168,7 @@ MauvilleCity_EventScript_DefeatedWally::
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth call_if_eq MauvilleCity_EventScript_ScottApproachPlayerNorth
compare VAR_FACING, DIR_EAST compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast call_if_eq MauvilleCity_EventScript_ScottApproachPlayerEast
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT msgbox MauvilleCity_Text_ScottYouDidntHoldBack, MSGBOX_DEFAULT
closemessage closemessage
@@ -209,13 +209,13 @@ MauvilleCity_EventScript_ScottExitEast::
MauvilleCity_EventScript_BattleWally:: MauvilleCity_EventScript_BattleWally::
msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyHereICome, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat trainerbattle_no_intro TRAINER_WALLY_MAUVILLE, MauvilleCity_Text_WallyDefeat
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT msgbox MauvilleCity_Text_WallyIllGoBackToVerdanturf, MSGBOX_DEFAULT
applymovement LOCALID_WALLY, Common_Movement_FacePlayer applymovement LOCALID_WALLY, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT msgbox MauvilleCity_Text_ThankYouNotEnoughToBattle, MSGBOX_DEFAULT
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT msgbox MauvilleCity_Text_UncleNoNeedToBeDown, MSGBOX_DEFAULT
return return
@@ -280,35 +280,35 @@ MauvilleCity_Movement_WallyExitEast2:
MauvilleCity_Movement_PlayerWatchWallyExitNorth2: MauvilleCity_Movement_PlayerWatchWallyExitNorth2:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MauvilleCity_Movement_PlayerWatchWallyExitEast2: MauvilleCity_Movement_PlayerWatchWallyExitEast2:
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MauvilleCity_Movement_PlayerWatchScottExitNorth: MauvilleCity_Movement_PlayerWatchScottExitNorth:
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MauvilleCity_Movement_PlayerWatchScottExitEast: MauvilleCity_Movement_PlayerWatchScottExitEast:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MauvilleCity_Movement_PlayerWatchWallyExitEast1: MauvilleCity_Movement_PlayerWatchWallyExitEast1:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MauvilleCity_Movement_PlayerWatchWallyExitNorth1: MauvilleCity_Movement_PlayerWatchWallyExitNorth1:
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MauvilleCity_Movement_WallysUncleExitNorth1: MauvilleCity_Movement_WallysUncleExitNorth1:
@@ -331,13 +331,13 @@ MauvilleCity_Movement_PlayerFaceUncleNorth:
delay_16 delay_16
delay_8 delay_8
delay_4 delay_4
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MauvilleCity_Movement_WallysUncleApproachPlayerNorth: MauvilleCity_Movement_WallysUncleApproachPlayerNorth:
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
MauvilleCity_Movement_WallysUncleApproachPlayerEast: MauvilleCity_Movement_WallysUncleApproachPlayerEast:
@@ -379,7 +379,7 @@ MauvilleCity_Movement_ScottApproachPlayerNorth:
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
MauvilleCity_Movement_ScottApproachPlayerEast: MauvilleCity_Movement_ScottApproachPlayerEast:
data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ MauvilleCity_PokemonCenter_1F_OnTransition:
end end
MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx:: MauvilleCity_PokemonCenter_1F_EventScript_SetMauvilleOldManGfx::
special ScrSpecial_SetMauvilleOldManObjEventGfx special SetMauvilleOldManObjEventGfx
end end
MauvilleCity_PokemonCenter_1F_EventScript_Nurse:: MauvilleCity_PokemonCenter_1F_EventScript_Nurse::
data/maps/MeteorFalls_1F_1R/scripts.inc
+15 -15
View File
@@ -29,8 +29,8 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_WithThisMeteorite, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_ExclamationMark applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_ExclamationMark
@@ -43,9 +43,9 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_HoldItRightThereMagma, MSGBOX_DEFAULT
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
addobject LOCALID_ARCHIE addobject LOCALID_ARCHIE
addobject LOCALID_AQUA_GRUNT_1 addobject LOCALID_AQUA_GRUNT_1
@@ -55,8 +55,8 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive applymovement LOCALID_AQUA_GRUNT_1, MeteorFalls_1F_1R_Movement_AquaGrunt1Arrive
applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2Arrive
waitmovement 0 waitmovement 0
applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MAGMA_GRUNT_1, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MAGMA_GRUNT_2, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_BeSeeingYouTeamAqua, MSGBOX_DEFAULT
closemessage closemessage
@@ -74,10 +74,10 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie applymovement LOCALID_AQUA_GRUNT_2, MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_BossWeShouldChaseMagma, MSGBOX_DEFAULT
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_ArchieYesNoTellingWhatMagmaWillDo, MSGBOX_DEFAULT
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_ArchieFarewell, MSGBOX_DEFAULT
closemessage closemessage
@@ -99,7 +99,7 @@ MeteorFalls_1F_1R_EventScript_MagmaStealsMeteoriteScene::
MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer: MeteorFalls_1F_1R_Movement_MagmaGruntApproachPlayer:
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit: MeteorFalls_1F_1R_Movement_MagmaGrunt1Exit:
@@ -171,7 +171,7 @@ MeteorFalls_1F_1R_Movement_ArchieApproachPlayer:
walk_right walk_right
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MeteorFalls_1F_1R_Movement_AquaGrunt1Exit: MeteorFalls_1F_1R_Movement_AquaGrunt1Exit:
@@ -190,7 +190,7 @@ MeteorFalls_1F_1R_Movement_AquaGrunt1ApproachArchie:
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
MeteorFalls_1F_1R_Movement_AquaGrunt2Exit: MeteorFalls_1F_1R_Movement_AquaGrunt2Exit:
@@ -210,13 +210,13 @@ MeteorFalls_1F_1R_Movement_AquaGrunt2ApproachArchie:
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
MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay: MeteorFalls_1F_1R_Movement_PushPlayerOutOfWay:
walk_in_place_fastest_down walk_in_place_faster_down
delay_4 delay_4
walk_in_place_fastest_right walk_in_place_faster_right
lock_facing_direction lock_facing_direction
walk_left walk_left
unlock_facing_direction unlock_facing_direction
data/maps/MossdeepCity/scripts.inc
+1 -1
View File
@@ -286,7 +286,7 @@ MossdeepCity_EventScript_ScottExitEast::
MossdeepCity_Movement_PlayerWatchScottExit: MossdeepCity_Movement_PlayerWatchScottExit:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MossdeepCity_Movement_ScottExitNorth: MossdeepCity_Movement_ScottExitNorth:
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+4 -4
View File
@@ -90,7 +90,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_RocketLaunchCounterMagma::
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_ShowLaunchNumberMagma
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
release release
end end
@@ -114,7 +114,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_Scientist::
MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma:: MossdeepCity_SpaceCenter_1F_EventScript_ScientistMagma::
msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_MagmaHaveSightsOnSpaceCenter, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
release release
end end
@@ -147,14 +147,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_SunStoneManMagma::
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP
msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
release release
end end
MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma:: MossdeepCity_SpaceCenter_1F_EventScript_GaveSunStoneMagma::
msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_CantStrollOnBeachWithMagma, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
release release
end end
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+8 -8
View File
@@ -68,13 +68,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_BattleThreeMagmaGrunts::
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_5, MossdeepCity_SpaceCenter_2F_Text_Grunt5Defeat
applymovement LOCALID_GRUNT_5, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated applymovement LOCALID_GRUNT_5, MossdeepCity_SpaceCenter_2F_Movement_Grunt5Defeated
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt6Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_6, MossdeepCity_SpaceCenter_2F_Text_Grunt6Defeat
applymovement LOCALID_GRUNT_6, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated applymovement LOCALID_GRUNT_6, MossdeepCity_SpaceCenter_2F_Movement_Grunt6Defeated
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 MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_Grunt7Intro, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat trainerbattle_no_intro TRAINER_GRUNT_SPACE_CENTER_7, MossdeepCity_SpaceCenter_2F_Text_Grunt7Defeat
@@ -250,13 +250,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_ReadyForBattlePrompt::
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle
msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_StevenHurryGetReadyQuickly, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
releaseall releaseall
end end
MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle:: MossdeepCity_SpaceCenter_2F_EventScript_ChoosePartyForMultiBattle::
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
special SavePlayerParty special SavePlayerParty
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
@@ -286,12 +286,12 @@ MossdeepCity_SpaceCenter_2F_EventScript_DefeatedMaxieTabitha::
msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeFailedIsAquaAlsoMisguided, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
applymovement LOCALID_MAXIE, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_MAXIE, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 60 delay 60
applymovement LOCALID_MAXIE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_MAXIE, Common_Movement_WalkInPlaceFasterUp
applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_TABITHA, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_MaxieWeWillGiveUp, MSGBOX_DEFAULT
data/maps/MossdeepCity_StevensHouse/scripts.inc
+3 -3
View File
@@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_OnFrame:
MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: MossdeepCity_StevensHouse_EventScript_StevenGivesDive::
lockall lockall
applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_STEVEN, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement LOCALID_STEVEN, Common_Movement_ExclamationMark applymovement LOCALID_STEVEN, Common_Movement_ExclamationMark
@@ -62,7 +62,7 @@ MossdeepCity_StevensHouse_Movement_StevenApproachPlayer:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MossdeepCity_StevensHouse_Movement_StevenReturn: MossdeepCity_StevensHouse_Movement_StevenReturn:
@@ -70,7 +70,7 @@ MossdeepCity_StevensHouse_Movement_StevenReturn:
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
MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: MossdeepCity_StevensHouse_EventScript_BeldumPokeball::
data/maps/MtChimney/scripts.inc
+5 -5
View File
@@ -67,7 +67,7 @@ MtChimney_EventScript_Maxie::
call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast call_if_eq MtChimney_EventScript_ArchieApproachPlayerEast
compare VAR_FACING, DIR_NORTH compare VAR_FACING, DIR_NORTH
call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth call_if_eq MtChimney_EventScript_ArchieApproachPlayerNorth
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT msgbox MtChimney_Text_ArchieThankYou, MSGBOX_DEFAULT
closemessage closemessage
@@ -323,7 +323,7 @@ MtChimney_Movement_Unused8:
walk_left walk_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtChimney_Movement_Unused9: MtChimney_Movement_Unused9:
@@ -359,7 +359,7 @@ MtChimney_Movement_Unused11:
MtChimney_Movement_Unused12: MtChimney_Movement_Unused12:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_down walk_down
walk_down walk_down
@@ -375,7 +375,7 @@ MtChimney_Movement_Unused13:
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_down walk_down
walk_down walk_down
@@ -390,7 +390,7 @@ MtChimney_Movement_Unused14:
MtChimney_Movement_Unused15: MtChimney_Movement_Unused15:
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
step_end step_end
data/maps/MtChimney_CableCarStation/scripts.inc
+1 -1
View File
@@ -64,7 +64,7 @@ MtChimney_CableCarStation_Movement_LeadPlayerToCableCar:
walk_up walk_up
walk_up walk_up
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar: MtChimney_CableCarStation_Movement_FollowPlayerOutFromCableCar:
data/maps/MtPyre_Summit/scripts.inc
+26 -26
View File
@@ -42,7 +42,7 @@ MtPyre_Summit_EventScript_TeamAquaExits::
playbgm MUS_ENCOUNTER_AQUA, FALSE playbgm MUS_ENCOUNTER_AQUA, FALSE
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_FaceUp
waitmovement 0 waitmovement 0
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 50 delay 50
compare VAR_0x8008, 0 compare VAR_0x8008, 0
@@ -95,7 +95,7 @@ MtPyre_Summit_EventScript_ArchieFacePlayer2::
MtPyre_Summit_EventScript_OldLadyApproachPlayer0:: MtPyre_Summit_EventScript_OldLadyApproachPlayer0::
applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0 applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer0
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -107,14 +107,14 @@ MtPyre_Summit_EventScript_OldLadyApproachPlayer1::
MtPyre_Summit_EventScript_OldLadyApproachPlayer2:: MtPyre_Summit_EventScript_OldLadyApproachPlayer2::
applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2 applymovement LOCALID_OLD_LADY, MtPyre_Summit_Movement_OldLadyApproachPlayer2
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
MtPyre_Summit_Movement_OldLadyApproachPlayer0: MtPyre_Summit_Movement_OldLadyApproachPlayer0:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MtPyre_Summit_Movement_OldLadyApproachPlayer1: MtPyre_Summit_Movement_OldLadyApproachPlayer1:
@@ -124,17 +124,17 @@ MtPyre_Summit_Movement_OldLadyApproachPlayer1:
MtPyre_Summit_Movement_OldLadyApproachPlayer2: MtPyre_Summit_Movement_OldLadyApproachPlayer2:
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
MtPyre_Summit_Movement_ArchieFacePlayer0: MtPyre_Summit_Movement_ArchieFacePlayer0:
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_Movement_ArchieFacePlayer2: MtPyre_Summit_Movement_ArchieFacePlayer2:
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_EventScript_OldMan:: MtPyre_Summit_EventScript_OldMan::
@@ -216,7 +216,7 @@ MtPyre_Summit_EventScript_ArchieMaxieTrigger2::
end end
MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs:: MtPyre_Summit_EventScript_ArchieMaxieReturnOrbs::
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 60 delay 60
compare VAR_0x8008, 0 compare VAR_0x8008, 0
@@ -301,7 +301,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie0::
applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0 applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie0
waitmovement 0 waitmovement 0
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -309,7 +309,7 @@ MtPyre_Summit_EventScript_MaxieApproachArchie1::
applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1 applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie1
waitmovement 0 waitmovement 0
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -317,20 +317,20 @@ MtPyre_Summit_EventScript_MaxieApproachArchie2::
applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie applymovement OBJ_EVENT_ID_PLAYER, MtPyre_Summit_Movement_PlayerWatchMaxie
applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2 applymovement LOCALID_MAXIE, MtPyre_Summit_Movement_MaxieApproachArchie2
waitmovement 0 waitmovement 0
applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_ARCHIE, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
MtPyre_Summit_Movement_PlayerFaceMaxie0: MtPyre_Summit_Movement_PlayerFaceMaxie0:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
MtPyre_Summit_Movement_PlayerFaceMaxie: MtPyre_Summit_Movement_PlayerFaceMaxie:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MtPyre_Summit_Movement_ArchieExit: MtPyre_Summit_Movement_ArchieExit:
@@ -355,26 +355,26 @@ MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit0:
delay_16 delay_16
delay_8 delay_8
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1: MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit1:
delay_16 delay_16
delay_8 delay_8
walk_right walk_right
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2: MtPyre_Summit_Movement_PlayerWatchArchieMaxieExit2:
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_Movement_MaxieApproachPlayer0: MtPyre_Summit_Movement_MaxieApproachPlayer0:
@@ -388,24 +388,24 @@ MtPyre_Summit_Movement_MaxieApproachPlayer1:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
MtPyre_Summit_Movement_MaxieApproachPlayer2: MtPyre_Summit_Movement_MaxieApproachPlayer2:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
MtPyre_Summit_Movement_ArchieWatchMaxie: MtPyre_Summit_Movement_ArchieWatchMaxie:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
MtPyre_Summit_Movement_PlayerWatchMaxie: MtPyre_Summit_Movement_PlayerWatchMaxie:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
MtPyre_Summit_Movement_MaxieApproachArchie0: MtPyre_Summit_Movement_MaxieApproachArchie0:
@@ -413,21 +413,21 @@ MtPyre_Summit_Movement_MaxieApproachArchie0:
walk_right walk_right
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MtPyre_Summit_Movement_MaxieApproachArchie1: MtPyre_Summit_Movement_MaxieApproachArchie1:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MtPyre_Summit_Movement_MaxieApproachArchie2: MtPyre_Summit_Movement_MaxieApproachArchie2:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
MtPyre_Summit_EventScript_Grunt1:: MtPyre_Summit_EventScript_Grunt1::
data/maps/NavelRock_Harbor/scripts.inc
+1 -1
View File
@@ -12,7 +12,7 @@ NavelRock_Harbor_EventScript_Sailor::
goto_if_eq NavelRock_Harbor_EventScript_AsYouLike goto_if_eq NavelRock_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_NAVEL_ROCK_HARBOR hideobjectat LOCALID_SAILOR, MAP_NAVEL_ROCK_HARBOR
data/maps/NewMauville_Entrance/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ NewMauville_Entrance_OnTransition:
NewMauville_Entrance_EventScript_Door:: NewMauville_Entrance_EventScript_Door::
lockall lockall
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT msgbox NewMauville_Entrance_Text_DoorIsLocked, MSGBOX_DEFAULT
checkitem ITEM_BASEMENT_KEY, 1 checkitem ITEM_BASEMENT_KEY, 1
data/maps/OldaleTown/scripts.inc
+9 -9
View File
@@ -103,7 +103,7 @@ OldaleTown_Movement_EmployeeEast:
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
OldaleTown_Movement_EmployeeSouth: OldaleTown_Movement_EmployeeSouth:
@@ -116,7 +116,7 @@ OldaleTown_Movement_EmployeeSouth:
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
OldaleTown_Movement_EmployeeNorth: OldaleTown_Movement_EmployeeNorth:
@@ -127,7 +127,7 @@ OldaleTown_Movement_EmployeeNorth:
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
OldaleTown_Movement_Unknown1: OldaleTown_Movement_Unknown1:
@@ -143,7 +143,7 @@ OldaleTown_Movement_Unknown1:
walk_up walk_up
walk_up walk_up
delay_8 delay_8
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
OldaleTown_Movement_PlayerEast: OldaleTown_Movement_PlayerEast:
@@ -232,7 +232,7 @@ OldaleTown_EventScript_RivalTrigger1::
lockall lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer1 applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer1
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage goto OldaleTown_EventScript_ShowRivalMessage
@@ -242,7 +242,7 @@ OldaleTown_EventScript_RivalTrigger2::
lockall lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer2 applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer2
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage goto OldaleTown_EventScript_ShowRivalMessage
@@ -252,7 +252,7 @@ OldaleTown_EventScript_RivalTrigger3::
lockall lockall
applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer3 applymovement LOCALID_RIVAL, OldaleTown_Movement_RivalApproachPlayer3
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_ShowRivalMessage goto OldaleTown_EventScript_ShowRivalMessage
@@ -328,7 +328,7 @@ OldaleTown_Movement_RivalExit:
OldaleTown_Movement_WatchRivalExit: OldaleTown_Movement_WatchRivalExit:
delay_8 delay_8
delay_4 delay_4
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
OldaleTown_Movement_PlayerStepBack: OldaleTown_Movement_PlayerStepBack:
@@ -338,7 +338,7 @@ OldaleTown_Movement_PlayerStepBack:
OldaleTown_Movement_BackUp: OldaleTown_Movement_BackUp:
walk_fast_up walk_fast_up
walk_in_place_fastest_left walk_in_place_faster_left
lock_facing_direction lock_facing_direction
walk_right walk_right
unlock_facing_direction unlock_facing_direction
data/maps/PetalburgCity/scripts.inc
+27 -27
View File
@@ -50,7 +50,7 @@ PetalburgCity_EventScript_WallyTutorial::
special StartWallyTutorialBattle special StartWallyTutorialBattle
waitstate waitstate
msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT msgbox Route102_Text_WallyIDidIt, MSGBOX_DEFAULT
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterLeft, MAP_PETALBURG_CITY
waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY waitmovement LOCALID_WALLY, MAP_PETALBURG_CITY
msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT msgbox Route102_Text_LetsGoBack, MSGBOX_DEFAULT
closemessage closemessage
@@ -186,7 +186,7 @@ PetalburgCity_Movement_WallyTutorialPlayer:
walk_right walk_right
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
PetalburgCity_Movement_WallyTutorialWally: PetalburgCity_Movement_WallyTutorialWally:
@@ -222,10 +222,10 @@ PetalburgCity_Movement_WallyTutorialWally:
walk_up walk_up
walk_right walk_right
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
PetalburgCity_EventScript_GymSign:: PetalburgCity_EventScript_GymSign::
@@ -296,8 +296,8 @@ PetalburgCity_EventScript_ShowGymToPlayer::
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3 call_if_eq PetalburgCity_EventScript_LeadPlayerToGym3
msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT msgbox PetalburgCity_Text_ThisIsPetalburgGym, MSGBOX_DEFAULT
applymovement LOCALID_GYM_BOY, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_GYM_BOY, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT msgbox PetalburgCity_Text_ThisIsGymSign, MSGBOX_DEFAULT
closemessage closemessage
@@ -310,7 +310,7 @@ PetalburgCity_EventScript_ShowGymToPlayer::
PetalburgCity_EventScript_BoyApproachPlayer0:: PetalburgCity_EventScript_BoyApproachPlayer0::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0 applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer0
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -322,14 +322,14 @@ PetalburgCity_EventScript_BoyApproachPlayer1::
PetalburgCity_EventScript_BoyApproachPlayer2:: PetalburgCity_EventScript_BoyApproachPlayer2::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2 applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer2
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_EventScript_BoyApproachPlayer3:: PetalburgCity_EventScript_BoyApproachPlayer3::
applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3 applymovement LOCALID_GYM_BOY, PetalburgCity_Movement_BoyApproachPlayer3
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
@@ -368,7 +368,7 @@ PetalburgCity_Movement_BoyApproachPlayer0:
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
PetalburgCity_Movement_BoyApproachPlayer1: PetalburgCity_Movement_BoyApproachPlayer1:
@@ -380,7 +380,7 @@ PetalburgCity_Movement_BoyApproachPlayer2:
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
PetalburgCity_Movement_BoyApproachPlayer3: PetalburgCity_Movement_BoyApproachPlayer3:
@@ -388,7 +388,7 @@ PetalburgCity_Movement_BoyApproachPlayer3:
walk_right walk_right
walk_right walk_right
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
PetalburgCity_Movement_BoyWalkToGym0: PetalburgCity_Movement_BoyWalkToGym0:
@@ -401,7 +401,7 @@ PetalburgCity_Movement_BoyWalkToGym0:
walk_right walk_right
walk_up walk_up
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgCity_Movement_BoyWalkToGym1: PetalburgCity_Movement_BoyWalkToGym1:
@@ -417,7 +417,7 @@ PetalburgCity_Movement_BoyWalkToGym1:
walk_up walk_up
walk_up walk_up
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgCity_Movement_BoyWalkToGym2: PetalburgCity_Movement_BoyWalkToGym2:
@@ -430,7 +430,7 @@ PetalburgCity_Movement_BoyWalkToGym2:
walk_right walk_right
walk_up walk_up
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgCity_Movement_BoyWalkToGym3: PetalburgCity_Movement_BoyWalkToGym3:
@@ -444,7 +444,7 @@ PetalburgCity_Movement_BoyWalkToGym3:
walk_up walk_up
walk_up walk_up
walk_right walk_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgCity_Movement_BoyWalkAway: PetalburgCity_Movement_BoyWalkAway:
@@ -556,17 +556,17 @@ PetalburgCity_EventScript_Scott::
waitmovement 0 waitmovement 0
applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer applymovement LOCALID_SCOTT, PetalburgCity_Movement_ScottApproachPlayer
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
setvar VAR_SCOTT_STATE, 1 setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT msgbox PetalburgCity_Text_AreYouATrainer, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT msgbox PetalburgCity_Text_WellMaybeNot, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_SCOTT, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT msgbox PetalburgCity_Text_ImLookingForTalentedTrainers, MSGBOX_DEFAULT
@@ -640,11 +640,11 @@ PetalburgCity_Movement_ScottExit0:
PetalburgCity_Movement_PlayerWatchScottExit0: PetalburgCity_Movement_PlayerWatchScottExit0:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
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
PetalburgCity_Movement_ScottExit1: PetalburgCity_Movement_ScottExit1:
@@ -664,10 +664,10 @@ PetalburgCity_Movement_ScottExit1:
PetalburgCity_Movement_PlayerWatchScottExit1: PetalburgCity_Movement_PlayerWatchScottExit1:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
PetalburgCity_Movement_ScottExit2: PetalburgCity_Movement_ScottExit2:
@@ -687,10 +687,10 @@ PetalburgCity_Movement_ScottExit2:
PetalburgCity_Movement_PlayerWatchScottExit2: PetalburgCity_Movement_PlayerWatchScottExit2:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
PetalburgCity_Movement_ScottExit3: PetalburgCity_Movement_ScottExit3:
@@ -710,10 +710,10 @@ PetalburgCity_Movement_ScottExit3:
PetalburgCity_Movement_PlayerWatchScottExit3: PetalburgCity_Movement_PlayerWatchScottExit3:
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
PetalburgCity_EventScript_GymBoy:: PetalburgCity_EventScript_GymBoy::
data/maps/PetalburgCity_Gym/scripts.inc
+45 -45
View File
@@ -88,14 +88,14 @@ PetalburgCity_Gym_EventScript_ReturnFromWallyTutorial::
msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_DadSoDidItWorkOut, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_WallyThankYouBye, MSGBOX_DEFAULT
closemessage closemessage
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitGym
waitmovement 0 waitmovement 0
playse SE_EXIT playse SE_EXIT
removeobject LOCALID_WALLY removeobject LOCALID_WALLY
setflag FLAG_HIDE_PETALBURG_CITY_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30 delay 30
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_DadGoCollectBadges, MSGBOX_DEFAULT
setvar VAR_PETALBURG_GYM_STATE, 2 setvar VAR_PETALBURG_GYM_STATE, 2
@@ -226,7 +226,7 @@ PetalburgCity_Gym_EventScript_BeginWallyTutorial::
end end
PetalburgCity_Gym_EventScript_WallyArriveSouth:: PetalburgCity_Gym_EventScript_WallyArriveSouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0 waitmovement 0
return return
@@ -234,20 +234,20 @@ PetalburgCity_Gym_EventScript_WallyArriveSouth::
PetalburgCity_Gym_EventScript_WallyArriveNorth:: PetalburgCity_Gym_EventScript_WallyArriveNorth::
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArriveNorth
waitmovement 0 waitmovement 0
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallyArriveWestEast:: PetalburgCity_Gym_EventScript_WallyArriveWestEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyArrive
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_ExitGymWithWallySouth:: PetalburgCity_Gym_EventScript_ExitGymWithWallySouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest applymovement LOCALID_WALLY, PetalburgCity_Gym_Movement_WallyExitSouthWest
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallySouth
waitmovement 0 waitmovement 0
@@ -272,45 +272,45 @@ PetalburgCity_Gym_EventScript_ExitGymWithWallyEast::
return return
PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth:: PetalburgCity_Gym_EventScript_NormanAddressPlayerSouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth:: PetalburgCity_Gym_EventScript_NormanAddressPlayerNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressPlayerWest:: PetalburgCity_Gym_EventScript_NormanAddressPlayerWest::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressPlayerEast:: PetalburgCity_Gym_EventScript_NormanAddressPlayerEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressWallySouth:: PetalburgCity_Gym_EventScript_NormanAddressWallySouth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressWallyNorth:: PetalburgCity_Gym_EventScript_NormanAddressWallyNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressWallyWest:: PetalburgCity_Gym_EventScript_NormanAddressWallyWest::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_NormanAddressWallyEast:: PetalburgCity_Gym_EventScript_NormanAddressWallyEast::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -320,7 +320,7 @@ PetalburgCity_Gym_EventScript_WallyFacePlayer::
return return
PetalburgCity_Gym_EventScript_WallyFaceDown:: PetalburgCity_Gym_EventScript_WallyFaceDown::
applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_WALLY, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -349,7 +349,7 @@ PetalburgCity_Gym_EventScript_NormanFaceDoorSouth::
@ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX @ For all other NormanFaceDoorX, Norman is already facing the door from NormanAddressWallyX
PetalburgCity_Gym_EventScript_NormanFaceDoorNorth:: PetalburgCity_Gym_EventScript_NormanFaceDoorNorth::
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
@@ -503,47 +503,47 @@ PetalburgCity_Gym_EventScript_WallysDadArrives::
end end
PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth:: PetalburgCity_Gym_EventScript_WallysDadFaceNormanNorth::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast:: PetalburgCity_Gym_EventScript_WallysDadFaceNormanEast::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest:: PetalburgCity_Gym_EventScript_WallysDadFaceNormanWest::
applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_WALLYS_DAD, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth:: PetalburgCity_Gym_EventScript_WallysDadApproachPlayerNorth::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast:: PetalburgCity_Gym_EventScript_WallysDadApproachPlayerEast::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest:: PetalburgCity_Gym_EventScript_WallysDadApproachPlayerWest::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth:: PetalburgCity_Gym_EventScript_ExitGymWithWallysDadNorth::
applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth applymovement LOCALID_WALLYS_DAD, PetalburgCity_Gym_Movement_WallysDadExitNorth
applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_NORMAN, Common_Movement_WalkInPlaceFasterDown
applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth applymovement OBJ_EVENT_ID_PLAYER, PetalburgCity_Gym_Movement_PlayerExitWithWallysDadNorth
waitmovement 0 waitmovement 0
return return
@@ -567,7 +567,7 @@ PetalburgCity_Gym_Movement_WallysDadExitNorth:
walk_left walk_left
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_8 delay_8
walk_in_place_down walk_in_place_down
set_invisible set_invisible
@@ -580,7 +580,7 @@ PetalburgCity_Gym_Movement_WallysDadExitEast:
walk_left walk_left
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_8 delay_8
walk_in_place_down walk_in_place_down
set_invisible set_invisible
@@ -595,7 +595,7 @@ PetalburgCity_Gym_Movement_WallysDadExitWest:
walk_left walk_left
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_8 delay_8
walk_in_place_down walk_in_place_down
set_invisible set_invisible
@@ -636,11 +636,11 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallysDadWest:
PetalburgCity_Gym_Movement_WallysDadEnterGym: PetalburgCity_Gym_Movement_WallysDadEnterGym:
walk_up walk_up
delay_8 delay_8
walk_in_place_fastest_right walk_in_place_faster_right
delay_8 delay_8
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth: PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth:
@@ -649,7 +649,7 @@ PetalburgCity_Gym_Movement_WallysDadApproachPlayerNorth:
walk_up walk_up
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast: PetalburgCity_Gym_Movement_WallysDadApproachPlayerEast:
@@ -671,14 +671,14 @@ PetalburgCity_Gym_Movement_WallysDadApproachPlayerWest:
step_end step_end
PetalburgCity_Gym_Movement_Unused: PetalburgCity_Gym_Movement_Unused:
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
delay_8 delay_8
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
PetalburgCity_Gym_Movement_WallyArriveNorth: PetalburgCity_Gym_Movement_WallyArriveNorth:
@@ -690,7 +690,7 @@ PetalburgCity_Gym_Movement_WallyArriveNorth:
walk_right walk_right
walk_up walk_up
walk_up walk_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
PetalburgCity_Gym_Movement_WallyArrive: PetalburgCity_Gym_Movement_WallyArrive:
@@ -707,7 +707,7 @@ PetalburgCity_Gym_Movement_WallyExitNorth:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
walk_in_place_down walk_in_place_down
step_end step_end
@@ -717,7 +717,7 @@ PetalburgCity_Gym_Movement_WallyExitEast:
walk_down walk_down
walk_right walk_right
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
walk_in_place_down walk_in_place_down
step_end step_end
@@ -726,7 +726,7 @@ PetalburgCity_Gym_Movement_WallyExitSouthWest:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_up walk_in_place_faster_up
delay_16 delay_16
walk_in_place_down walk_in_place_down
step_end step_end
@@ -764,7 +764,7 @@ PetalburgCity_Gym_Movement_PlayerExitWithWallyWest:
step_end step_end
PetalburgCity_Gym_Movement_PlayerExitWithWallyEast: PetalburgCity_Gym_Movement_PlayerExitWithWallyEast:
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_16 delay_16
walk_down walk_down
data/maps/PetalburgCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_NONE", "trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MysteryEventClub_EventScript_Man", "script": "ProfileMan_EventScript_Man",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/PetalburgWoods/scripts.inc
+10 -10
View File
@@ -18,7 +18,7 @@ PetalburgWoods_EventScript_DevonResearcherLeft::
closemessage closemessage
applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherLeft
waitmovement 0 waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT
closemessage closemessage
@@ -44,7 +44,7 @@ PetalburgWoods_EventScript_DevonResearcherRight::
call PetalburgWoods_EventScript_DevonResearcherIntro call PetalburgWoods_EventScript_DevonResearcherIntro
applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherApproachPlayerRight
waitmovement 0 waitmovement 0
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_HaveYouSeenShroomish, MSGBOX_DEFAULT
closemessage closemessage
@@ -55,14 +55,14 @@ PetalburgWoods_EventScript_DevonResearcherRight::
closemessage closemessage
applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaApproachResearcherRight
waitmovement 0 waitmovement 0
applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_DEVON_EMPLOYEE, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_HandOverThosePapers, MSGBOX_DEFAULT
closemessage closemessage
applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight applymovement LOCALID_DEVON_EMPLOYEE, PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_YouHaveToHelpMe, MSGBOX_DEFAULT
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_NoOneCrossesTeamAqua, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe trainerbattle_no_intro TRAINER_GRUNT_PETALBURG_WOODS, PetalburgWoods_Text_YoureKiddingMe
@@ -88,7 +88,7 @@ PetalburgWoods_EventScript_DevonResearcherPostBattle::
applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaRunAway applymovement LOCALID_GRUNT, PetalburgWoods_Movement_AquaRunAway
waitmovement 0 waitmovement 0
removeobject LOCALID_GRUNT removeobject LOCALID_GRUNT
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_ThatWasAwfullyClose, MSGBOX_DEFAULT
giveitem ITEM_GREAT_BALL giveitem ITEM_GREAT_BALL
@@ -159,7 +159,7 @@ PetalburgWoods_Movement_DevonResearcherApproachPlayerRight:
walk_down walk_down
walk_down walk_down
walk_down walk_down
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
PetalburgWoods_Movement_DevonResearcherExitRight: PetalburgWoods_Movement_DevonResearcherExitRight:
@@ -176,7 +176,7 @@ PetalburgWoods_Movement_DevonResearcherExitRight:
PetalburgWoods_Movement_WatchResearcherLeave: PetalburgWoods_Movement_WatchResearcherLeave:
delay_16 delay_16
delay_16 delay_16
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft: PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft:
@@ -184,17 +184,17 @@ PetalburgWoods_Movement_DevonResearcherFleeToPlayerLeft:
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_left walk_fast_left
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight: PetalburgWoods_Movement_DevonResearcherFleeToPlayerRight:
walk_fast_down walk_fast_down
walk_fast_right walk_fast_right
walk_in_place_fastest_up walk_in_place_faster_up
step_end step_end
PetalburgWoods_Movement_DevonResearcherStartExit: PetalburgWoods_Movement_DevonResearcherStartExit:
walk_in_place_fastest_down walk_in_place_faster_down
delay_16 delay_16
delay_16 delay_16
delay_16 delay_16
data/maps/Route101/scripts.inc
+3 -3
View File
@@ -33,7 +33,7 @@ Route101_EventScript_StartBirchRescue::
applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonChaseInCircles
applymovement LOCALID_BIRCH, Route101_Movement_BirchRunInCircles applymovement LOCALID_BIRCH, Route101_Movement_BirchRunInCircles
waitmovement 0 waitmovement 0
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch applymovement LOCALID_ZIGZAGOON, Route101_Movement_ZigzagoonFaceBirch
applymovement LOCALID_BIRCH, Route101_Movement_BirchFaceZigzagoon applymovement LOCALID_BIRCH, Route101_Movement_BirchFaceZigzagoon
@@ -140,7 +140,7 @@ Route101_Movement_EnterScene:
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_fast_up walk_fast_up
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
Route101_Movement_BirchRunInCircles: Route101_Movement_BirchRunInCircles:
@@ -226,7 +226,7 @@ Route101_EventScript_BirchsBag::
fadescreen FADE_TO_BLACK fadescreen FADE_TO_BLACK
removeobject LOCALID_ZIGZAGOON removeobject LOCALID_ZIGZAGOON
setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13 setobjectxy OBJ_EVENT_ID_PLAYER, 6, 13
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
special ChooseStarter special ChooseStarter
waitstate waitstate
data/maps/Route103/scripts.inc
+3 -3
View File
@@ -169,9 +169,9 @@ Route103_EventScript_RivalExitFacingNorth2:
Route103_Movement_WatchRivalExitFacingNorth: Route103_Movement_WatchRivalExitFacingNorth:
delay_16 delay_16
delay_4 delay_4
walk_in_place_fastest_left walk_in_place_faster_left
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
Route103_Movement_RivalExit1: Route103_Movement_RivalExit1:
@@ -188,7 +188,7 @@ Route103_Movement_RivalExit2:
Route103_Movement_WatchRivalExitFacingEastOrWest: Route103_Movement_WatchRivalExitFacingEastOrWest:
delay_16 delay_16
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
Route103_EventScript_Boy:: Route103_EventScript_Boy::
data/maps/Route104/scripts.inc
+287 -287
View File
@@ -1,4 +1,4 @@
@ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map. @ NOTE: Route 104's sail to Dewford script references local IDs from Dewford's map.
@ These are labeled in DewfordTown/scripts.inc @ These are labeled in DewfordTown/scripts.inc
.set LOCALID_RIVAL, 34 .set LOCALID_RIVAL, 34
@@ -55,7 +55,7 @@ Route104_EventScript_RivalTrigger::
setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL setflag FLAG_HIDE_RUSTBORO_CITY_RIVAL
setvar VAR_RUSTBORO_CITY_STATE, 8 setvar VAR_RUSTBORO_CITY_STATE, 8
setvar VAR_ROUTE104_STATE, 2 setvar VAR_ROUTE104_STATE, 2
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
delay 10 delay 10
addobject LOCALID_RIVAL addobject LOCALID_RIVAL
@@ -139,7 +139,7 @@ Route104_Movement_RivalApproachPlayer:
Route104_Movement_PlayerFaceRival: Route104_Movement_PlayerFaceRival:
delay_4 delay_4
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
Route104_EventScript_MayAskToBattle:: Route104_EventScript_MayAskToBattle::
@@ -446,122 +446,122 @@ Route104_Movement_SailToDewfordBeforeDadCalls:
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
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_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
step_end step_end
Route104_Movement_SailToDewfordAfterDadCalls: Route104_Movement_SailToDewfordAfterDadCalls:
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
@@ -570,46 +570,46 @@ Route104_Movement_SailToDewfordAfterDadCalls:
walk_fast_right walk_fast_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_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fast_right walk_fast_right
@@ -646,119 +646,119 @@ Route104_Movement_SailToDewford:
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
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_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
@@ -767,46 +767,46 @@ Route104_Movement_SailToDewford:
walk_fast_right walk_fast_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_fast_right walk_fast_right
walk_fast_right walk_fast_right
walk_fast_right walk_fast_right
@@ -847,7 +847,7 @@ Route104_Movement_PlayerExitBoat:
Route104_Movement_PlayerMoveForBriney: Route104_Movement_PlayerMoveForBriney:
walk_down walk_down
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
Route104_Movement_BrineyBoardBoat: Route104_Movement_BrineyBoardBoat:
@@ -857,7 +857,7 @@ Route104_Movement_BrineyBoardBoat:
Route104_Movement_BrineyExitBoat: Route104_Movement_BrineyExitBoat:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
Route104_EventScript_Ivan:: Route104_EventScript_Ivan::
data/maps/Route109/scripts.inc
+157 -157
View File
@@ -1,4 +1,4 @@
@ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map. @ NOTE: Route 109's sail to Dewford script references local IDs from Dewford's map.
@ These are labeled in DewfordTown/scripts.inc @ These are labeled in DewfordTown/scripts.inc
Route109_MapScripts:: Route109_MapScripts::
@@ -66,167 +66,167 @@ Route109_EventScript_DoSailToDewford::
end end
Route109_Movement_SailToDewford: Route109_Movement_SailToDewford:
walk_in_place_fastest_down walk_in_place_faster_down
walk_down walk_down
walk_down walk_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fastest_down walk_faster_down
walk_fast_down walk_fast_down
walk_fast_down walk_fast_down
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_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_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_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
@@ -238,7 +238,7 @@ Route109_Movement_SailToDewford:
walk_fast_left walk_fast_left
walk_left walk_left
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
Route109_Movement_PlayerEnterBoatSouth: Route109_Movement_PlayerEnterBoatSouth:
@@ -250,7 +250,7 @@ Route109_Movement_PlayerExitBoat:
walk_down walk_down
walk_down walk_down
walk_left walk_left
walk_in_place_fastest_right walk_in_place_faster_right
step_end step_end
Route109_Movement_PlayerEnterBoatEast: Route109_Movement_PlayerEnterBoatEast:
@@ -269,7 +269,7 @@ Route109_Movement_BrineyEnterBoat:
Route109_Movement_BrineyExitBoat: Route109_Movement_BrineyExitBoat:
walk_down walk_down
walk_in_place_fastest_left walk_in_place_faster_left
step_end step_end
Route109_EventScript_MrBriney:: Route109_EventScript_MrBriney::
data/maps/Route110/scripts.inc
+7 -7
View File
@@ -312,7 +312,7 @@ Route110_EventScript_Alyssa::
Route110_EventScript_CyclingChallengeEnd:: Route110_EventScript_CyclingChallengeEnd::
lockall lockall
applymovement LOCALID_CHALLENGE_BIKER, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_CHALLENGE_BIKER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
call Route110_EventScript_CyclingChallengeResults call Route110_EventScript_CyclingChallengeResults
releaseall releaseall
@@ -388,7 +388,7 @@ Route110_EventScript_RivalScene::
call_if_eq Route110_EventScript_PlayMayMusic call_if_eq Route110_EventScript_PlayMayMusic
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
call_if_eq Route110_EventScript_PlayBrendanMusic call_if_eq Route110_EventScript_PlayBrendanMusic
applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_RIVAL, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark applymovement LOCALID_RIVAL, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
@@ -552,7 +552,7 @@ Route110_EventScript_MoveRival3::
Route110_Movement_RivalApproachPlayer1: Route110_Movement_RivalApproachPlayer1:
walk_down walk_down
walk_left walk_left
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
Route110_Movement_RivalApproachPlayer2: Route110_Movement_RivalApproachPlayer2:
@@ -562,7 +562,7 @@ Route110_Movement_RivalApproachPlayer2:
Route110_Movement_RivalApproachPlayer3: Route110_Movement_RivalApproachPlayer3:
walk_down walk_down
walk_right walk_right
walk_in_place_fastest_down walk_in_place_faster_down
step_end step_end
Route110_Movement_RivalExit1: Route110_Movement_RivalExit1:
@@ -636,13 +636,13 @@ Route110_EventScript_BirchScene::
msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT msgbox Route110_Text_ImagineSeeingYouHere, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
delay 10 delay 10
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_BIRCH, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT msgbox Route110_Text_HeardYouInstallMatchCall, MSGBOX_DEFAULT
data/maps/Route110_TrickHouseEnd/scripts.inc
+5 -5
View File
@@ -214,22 +214,22 @@ Route110_TrickHouseEnd_EventScript_NoRoomForTent::
return return
Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth::
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestDown applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth::
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest::
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestLeft applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterLeft
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast::
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestRight applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterRight
waitmovement 0 waitmovement 0
return return
@@ -243,7 +243,7 @@ Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger::
applymovement LOCALID_TRICK_MASTER, Route110_TrickHouseEnd_Movement_TrickMasterSurprise applymovement LOCALID_TRICK_MASTER, Route110_TrickHouseEnd_Movement_TrickMasterSurprise
waitmovement 0 waitmovement 0
playse SE_M_EXPLOSION playse SE_M_EXPLOSION
applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown applymovement OBJ_EVENT_ID_PLAYER, Common_Movement_WalkInPlaceFasterDown
waitmovement 0 waitmovement 0
msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT
closemessage closemessage
data/maps/Route110_TrickHouseEntrance/scripts.inc
+2 -2
View File
@@ -343,7 +343,7 @@ Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle::
applymovement LOCALID_TRICK_MASTER, Common_Movement_Delay48 applymovement LOCALID_TRICK_MASTER, Common_Movement_Delay48
waitmovement 0 waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
@@ -441,7 +441,7 @@ Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward::
Route110_TrickHouseEntrance_EventScript_GotReward:: Route110_TrickHouseEntrance_EventScript_GotReward::
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFastestUp applymovement LOCALID_TRICK_MASTER, Common_Movement_WalkInPlaceFasterUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
Loaded 100 of 965 files, more files were not shown because too many files have changed in this diff. Show more