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

Merge branch 'master' into doc-inc2

Browse Source
This commit is contained in:
GriffinR
2019-10-14 19:25:10 -04:00
committed by GitHub
parent 30ef494163 26962b7725
commit 928cdf2531
144 changed files with 1290 additions and 1106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+6 -2
View File
@@ -1,5 +1,7 @@
#include "constants/global.h" #include "constants/global.h"
#include "constants/battle.h" #include "constants/battle.h"
#include "constants/battle_pike.h"
#include "constants/battle_pyramid.h"
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/berry.h" #include "constants/berry.h"
@@ -11,6 +13,7 @@
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h" #include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/field_poison.h"
#include "constants/field_specials.h" #include "constants/field_specials.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/game_stat.h" #include "constants/game_stat.h"
@@ -23,6 +26,7 @@
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/metatile_labels.h" #include "constants/metatile_labels.h"
#include "constants/moves.h" #include "constants/moves.h"
#include "constants/party_menu.h"
#include "constants/pokemon.h" #include "constants/pokemon.h"
#include "constants/script_menu.h" #include "constants/script_menu.h"
#include "constants/secret_bases.h" #include "constants/secret_bases.h"
@@ -903,7 +907,7 @@ EventScript_PickItemUp:: @ 8271C3A
waitfanfare waitfanfare
waitmessage waitmessage
bufferitemnameplural 1, VAR_0x8004, VAR_0x8005 bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
special CallBattlePyramidFunction special CallBattlePyramidFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq EventScript_271C86 goto_if_eq EventScript_271C86
@@ -1299,7 +1303,7 @@ RusturfTunnel_EventScript_272216:: @ 8272216
EventScript_27222B:: @ 827222B EventScript_27222B:: @ 827222B
delay 30 delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
showobjectat 255, MAP_PETALBURG_CITY showobjectat 255, MAP_PETALBURG_CITY
delay 30 delay 30
data/maps/AquaHideout_B2F/scripts.inc
+2 -2
View File
@@ -31,14 +31,14 @@ AquaHideout_B2F_EventScript_233E09:: @ 8233E09
AquaHideout_B2F_EventScript_233E25:: @ 8233E25 AquaHideout_B2F_EventScript_233E25:: @ 8233E25
setvar VAR_0x8008, 1 setvar VAR_0x8008, 1
setvar VAR_0x8009, 4 setvar VAR_0x8009, 4
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
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_233FA6, MSGBOX_DEFAULT msgbox AquaHideout_B2F_Text_233FA6, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_0x8008, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8008, Common_Movement_WalkInPlaceFastestLeft
applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80 applymovement VAR_0x8009, AquaHideout_B2F_Movement_233E80
waitmovement 0 waitmovement 0
removeobject VAR_0x8009 removeobject VAR_0x8009
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
+3 -3
View File
@@ -43,7 +43,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BD0A:: @ 824BD0A
call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD call BattleFrontier_BattleDomeBattleRoom_EventScript_24C1BD
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24C938
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5 call BattleFrontier_BattleDomeBattleRoom_EventScript_24BFD5
msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT msgbox BattleFrontier_BattleDomeBattleRoom_Text_24C970, MSGBOX_DEFAULT
@@ -114,7 +114,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BDF7:: @ 824BDF7
case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0 case 1, BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0
BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F BattleFrontier_BattleDomeBattleRoom_EventScript_24BE4F:: @ 824BE4F
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
special CallBattleDomeFunction special CallBattleDomeFunction
@@ -163,7 +163,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24BED9:: @ 824BED9
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0 BattleFrontier_BattleDomeBattleRoom_EventScript_24BEE0:: @ 824BEE0
applymovement 1, BattleFrontier_BattleDomeBattleRoom_Movement_2725B4 applymovement 1, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
compare VAR_TEMP_2, 0 compare VAR_TEMP_2, 0
call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3 call_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_24BFC3
data/maps/BattleFrontier_BattleFactoryBattleRoom/scripts.inc
+6 -6
View File
@@ -304,12 +304,12 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25B1AA:: @ 825B1AA
end end
BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4 BattleFrontier_BattleFactoryBattleRoom_EventScript_25B1B4:: @ 825B1B4
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement 3, Common_Movement_WalkInPlaceRight applymovement 3, Common_Movement_WalkInPlaceFastestRight
applymovement 4, Common_Movement_WalkInPlaceRight applymovement 4, Common_Movement_WalkInPlaceFastestRight
applymovement 5, Common_Movement_WalkInPlaceLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
applymovement 7, Common_Movement_WalkInPlaceLeft applymovement 7, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/BattleFrontier_BattlePalaceBattleRoom/scripts.inc
+6 -6
View File
@@ -278,10 +278,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FCC7:: @ 824FCC7
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special CallFrontierUtilFunc special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 applymovement 2, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement 3, Common_Movement_WalkInPlaceRight applymovement 3, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_250412, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
@@ -321,10 +321,10 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FD84:: @ 824FD84
waitfanfare waitfanfare
setvar VAR_0x8004, 13 setvar VAR_0x8004, 13
special CallFrontierUtilFunc special CallFrontierUtilFunc
applymovement 2, BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6 applymovement 2, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement 3, Common_Movement_WalkInPlaceRight applymovement 3, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePalaceBattleRoom_Text_2506C4, MSGBOX_DEFAULT
goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28 goto BattleFrontier_BattlePalaceBattleRoom_EventScript_24FB28
data/maps/BattleFrontier_BattlePikeCorridor/scripts.inc
+2 -2
View File
@@ -13,9 +13,9 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C786:: @ 825C786
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 20 setvar VAR_0x8004, BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 24 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeCorridor_Movement_25C80B
data/maps/BattleFrontier_BattlePikeLobby/scripts.inc
+14 -14
View File
@@ -26,16 +26,16 @@ BattleFrontier_BattlePikeLobby_EventScript_25B707:: @ 825B707
BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710 BattleFrontier_BattlePikeLobby_EventScript_25B710:: @ 825B710
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 27 setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
lockall lockall
msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePikeLobby_Text_25C2E0, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePikeFunction special CallBattlePikeFunction
@@ -68,21 +68,21 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9 msgbox BattleFrontier_BattlePikeLobby_Text_241520, 9
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattlePikeFunction special CallBattlePikeFunction
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction special CallBattlePikeFunction
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 27 setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
message BattleFrontier_BattlePikeLobby_Text_25C1DF message BattleFrontier_BattlePikeLobby_Text_25C1DF
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
@@ -103,15 +103,15 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePikeFunction special CallBattlePikeFunction
special LoadPlayerParty special LoadPlayerParty
special HealPlayerParty special HealPlayerParty
setvar VAR_0x8004, 27 setvar VAR_0x8004, BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
@@ -176,17 +176,17 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 28 setvar VAR_0x8004, BATTLE_PIKE_FUNC_INIT_CHALLENGE
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 26 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
@@ -197,7 +197,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
delay 2 delay 2
call Common_EventScript_SaveGame call Common_EventScript_SaveGame
setvar VAR_TEMP_0, 255 setvar VAR_TEMP_0, 255
setvar VAR_0x8004, 26 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C goto_if_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
data/maps/BattleFrontier_BattlePikeRandomRoom1/scripts.inc
+17 -17
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom1_MapScript2_25D167: @ 825D167
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171 BattleFrontier_BattlePikeRandomRoom1_EventScript_25D171:: @ 825D171
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 5 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6 case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6
@@ -27,7 +27,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D1C6:: @ 825D1C6
delay 16 delay 16
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 21 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@@ -63,7 +63,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D231:: @ 825D231
closemessage closemessage
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D795
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 21 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@@ -102,7 +102,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF
lockall lockall
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 23 setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC case 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D4DC
@@ -136,7 +136,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB
waitse waitse
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 22 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416 case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D416
@@ -217,11 +217,11 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D49D:: @ 825D49D
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
addvar VAR_RESULT, 1 addvar VAR_RESULT, 1
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
copyvar VAR_0x8006, VAR_RESULT copyvar VAR_0x8006, VAR_RESULT
special CallBattlePikeFunction special CallBattlePikeFunction
@@ -279,7 +279,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 21 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePikeFunction special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@@ -287,7 +287,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D53E:: @ 825D53E
delay 16 delay 16
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 21 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
@@ -317,7 +317,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D605:: @ 825D605
message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1 message BattleFrontier_BattlePikeRandomRoom1_Text_25DBD1
applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA
waitmovement 0 waitmovement 0
setvar VAR_0x8004, 12 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON
special CallBattlePikeFunction special CallBattlePikeFunction
copyvar VAR_0x8004, VAR_RESULT copyvar VAR_0x8004, VAR_RESULT
compare VAR_0x8004, 0 compare VAR_0x8004, 0
@@ -335,7 +335,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
waitse waitse
playmoncry SPECIES_KIRLIA, 0 playmoncry SPECIES_KIRLIA, 0
waitmoncry waitmoncry
setvar VAR_0x8004, 11 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D751
@@ -345,7 +345,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D643:: @ 825D643
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D75F
compare VAR_RESULT, 4 compare VAR_RESULT, 4
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D766
setvar VAR_0x8004, 15 setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction special CallBattlePikeFunction
waitstate waitstate
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -372,13 +372,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D6D5:: @ 825D6D5
waitse waitse
playmoncry SPECIES_DUSCLOPS, 0 playmoncry SPECIES_DUSCLOPS, 0
waitmoncry waitmoncry
setvar VAR_0x8004, 11 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_STATUS
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D76D
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D774
setvar VAR_0x8004, 15 setvar VAR_0x8004, BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE
special CallBattlePikeFunction special CallBattlePikeFunction
waitstate waitstate
applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2 applymovement 1, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2
@@ -578,7 +578,7 @@ BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA
step_end step_end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
setvar VAR_0x8004, 5 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B case 2, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B
@@ -588,7 +588,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B BattleFrontier_BattlePikeRandomRoom1_EventScript_25D81B:: @ 825D81B
lock lock
faceplayer faceplayer
setvar VAR_0x8004, 14 setvar VAR_0x8004, BATTLE_PIKE_FUNC_BUFFER_NPC_MSG
special CallBattlePikeFunction special CallBattlePikeFunction
msgbox gStringVar4, MSGBOX_DEFAULT msgbox gStringVar4, MSGBOX_DEFAULT
waitmessage waitmessage
@@ -605,7 +605,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D831:: @ 825D831
end end
BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E BattleFrontier_BattlePikeRandomRoom1_EventScript_25D83E:: @ 825D83E
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 2 compare VAR_RESULT, 2
call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881 call_if_eq BattleFrontier_BattlePikeRandomRoom1_EventScript_25D881
data/maps/BattleFrontier_BattlePikeRandomRoom3/scripts.inc
+1 -1
View File
@@ -11,7 +11,7 @@ BattleFrontier_BattlePikeRandomRoom3_MapScript2_25E42A: @ 825E42A
BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C BattleFrontier_BattlePikeRandomRoom3_EventScript_25E43C:: @ 825E43C
setvar VAR_TEMP_0, 1 setvar VAR_TEMP_0, 1
setvar VAR_0x8004, 6 setvar VAR_0x8004, BATTLE_PIKE_FUNC_6
special CallBattlePikeFunction special CallBattlePikeFunction
end end
data/maps/BattleFrontier_BattlePikeThreePathRoom/scripts.inc
+7 -7
View File
@@ -35,7 +35,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
lockall lockall
message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75 message BattleFrontier_BattlePikeThreePathRoom_Text_25CD75
waitmessage waitmessage
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
@@ -137,7 +137,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08 message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
waitmessage waitmessage
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_PIKE_FUNC_8
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
special CallBattlePikeFunction special CallBattlePikeFunction
playse SE_SAVE playse SE_SAVE
@@ -161,12 +161,12 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA5A:: @ 825CA5A
waitmessage waitmessage
multichoicedefault 20, 8, MULTI_YESNO, 1, 0 multichoicedefault 20, 8, MULTI_YESNO, 1, 0
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4222 case 0, BattleFrontier_BattlePike_EventScript_Retire
release release
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA78:: @ 825CA78
setvar VAR_0x8004, 17 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA91
@@ -189,7 +189,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CA97:: @ 825CA97
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB:: @ 825CABB
setvar VAR_0x8004, 19 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
special CallBattlePikeFunction special CallBattlePikeFunction
compare VAR_RESULT, 4 compare VAR_RESULT, 4
goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2 goto_if_eq BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2
@@ -209,7 +209,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB00:: @ 825CB00
end end
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB0A:: @ 825CB0A
setvar VAR_0x8004, 18 setvar VAR_0x8004, BATTLE_PIKE_FUNC_SET_HINT_ROOM_ID
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39 case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB39
@@ -230,7 +230,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB53:: @ 825CB53
goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60 goto BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60
BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60 BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB60:: @ 825CB60
setvar VAR_0x8004, 19 setvar VAR_0x8004, BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT
special CallBattlePikeFunction special CallBattlePikeFunction
switch VAR_RESULT switch VAR_RESULT
case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A case 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CB9A
data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+13 -13
View File
@@ -12,7 +12,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript2_252A43: @ 8252A43
BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D BattleFrontier_BattlePyramidEmptySquare_EventScript_252A5D:: @ 8252A5D
lockall lockall
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
setvar VAR_0x8007, 55 setvar VAR_0x8007, 55
@@ -38,7 +38,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252A98:: @ 8252A98
end end
BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2 BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_0x8004, 15 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special CallFrontierUtilFunc special CallFrontierUtilFunc
@@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252AA2: @ 8252AA2
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B39:: @ 8252B39
setvar VAR_0x8004, 17 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction special CallBattlePyramidFunction
end end
@@ -77,18 +77,18 @@ BattleFrontier_BattlePyramidTop_EventScript_252B42:: @ 8252B42
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 7 setvar VAR_0x8005, 7
setvar VAR_0x8006, 255 setvar VAR_0x8006, 255
special CallBattlePyramidFunction special CallBattlePyramidFunction
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidEmptySquare_EventScript_252B66:: @ 8252B66
BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66 BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 14 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction special CallBattlePyramidFunction
special HealPlayerParty special HealPlayerParty
warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13 warpsilent MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY, 255, 7, 13
@@ -96,7 +96,7 @@ BattleFrontier_BattlePyramidTop_EventScript_252B66:: @ 8252B66
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8004, 3 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePyramidFunction special CallBattlePyramidFunction
special SavePlayerParty special SavePlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 9 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
@@ -118,7 +118,7 @@ BattleFrontier_BattlePyramidEmptySquare_MapScript1_252BCA: @ 8252BCA
end end
BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5 BattleFrontier_BattlePyramidEmptySquare_EventScript_252BD5:: @ 8252BD5
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 32 setvar VAR_0x8005, 32
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
@@ -136,7 +136,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8:: @ 8252BE8
special CallFrontierUtilFunc special CallFrontierUtilFunc
compare VAR_RESULT, 7 compare VAR_RESULT, 7
goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45 goto_if_eq BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45
setvar VAR_0x8004, 6 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -154,7 +154,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
BattlePyramid_TrainerBattle:: @ 8252C4F BattlePyramid_TrainerBattle:: @ 8252C4F
trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
setvar VAR_0x8004, 10 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
special CallBattlePyramidFunction special CallBattlePyramidFunction
waitmessage waitmessage
waitbuttonpress waitbuttonpress
@@ -163,12 +163,12 @@ BattlePyramid_TrainerBattle:: @ 8252C4F
end end
BattlePyramid_FindItemBall:: @ 8252C6A BattlePyramid_FindItemBall:: @ 8252C6A
setvar VAR_0x8004, 7 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_ITEM
special CallBattlePyramidFunction special CallBattlePyramidFunction
callstd STD_FIND_ITEM callstd STD_FIND_ITEM
compare VAR_0x8007, 0 compare VAR_0x8007, 0
goto_if_eq BattlePyramid_FindItemBall_End goto_if_eq BattlePyramid_FindItemBall_End
setvar VAR_0x8004, 8 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_HIDE_ITEM
special CallBattlePyramidFunction special CallBattlePyramidFunction
BattlePyramid_FindItemBall_End:: @ 8252C87 BattlePyramid_FindItemBall_End:: @ 8252C87
data/maps/BattleFrontier_BattlePyramidLobby/scripts.inc
+17 -17
View File
@@ -32,11 +32,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250768:: @ 8250768
playse SE_EXPMAX playse SE_EXPMAX
waitse waitse
closemessage closemessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
@@ -68,7 +68,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special CallFrontierUtilFunc special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 14 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction special CallBattlePyramidFunction
special HealPlayerParty special HealPlayerParty
message BattleFrontier_BattlePyramidLobby_Text_2519F8 message BattleFrontier_BattlePyramidLobby_Text_2519F8
@@ -81,9 +81,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9 msgbox BattleFrontier_BattlePyramidLobby_Text_241520, 9
message BattleFrontier_BattlePyramidLobby_Text_251A77 message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage waitmessage
setvar VAR_0x8004, 4 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_REWARD
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 3 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
playse SE_SAVE playse SE_SAVE
@@ -98,7 +98,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
setvar VAR_0x8004, 8 setvar VAR_0x8004, 8
special CallFrontierUtilFunc special CallFrontierUtilFunc
special LoadPlayerParty special LoadPlayerParty
setvar VAR_0x8004, 14 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS
special CallBattlePyramidFunction special CallBattlePyramidFunction
special HealPlayerParty special HealPlayerParty
lockall lockall
@@ -108,11 +108,11 @@ BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
waitse waitse
message BattleFrontier_BattlePyramidLobby_Text_251A77 message BattleFrontier_BattlePyramidLobby_Text_251A77
waitmessage waitmessage
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 3 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
playse SE_SAVE playse SE_SAVE
@@ -179,9 +179,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 0 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_CHALLENGE
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 2 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SET_DATA
setvar VAR_0x8005, 2 setvar VAR_0x8005, 2
setvar VAR_0x8006, 1 setvar VAR_0x8006, 1
special CallBattlePyramidFunction special CallBattlePyramidFunction
@@ -193,9 +193,9 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 6 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SEED_FLOOR
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 9 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction special CallBattlePyramidFunction
special LoadPlayerParty special LoadPlayerParty
closemessage closemessage
@@ -282,7 +282,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B27:: @ 8250B27
BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28 BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 5 setvar VAR_0x8005, 5
special CallBattlePyramidFunction special CallBattlePyramidFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -292,7 +292,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B28:: @ 8250B28
return return
BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53 BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
special CallBattlePyramidFunction special CallBattlePyramidFunction
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -300,7 +300,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B53:: @ 8250B53
BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66 BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_251C8A, MSGBOX_DEFAULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 6 setvar VAR_0x8005, 6
special CallBattlePyramidFunction special CallBattlePyramidFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
@@ -310,7 +310,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250B66:: @ 8250B66
return return
BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91 BattleFrontier_BattlePyramidLobby_EventScript_250B91:: @ 8250B91
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 4 setvar VAR_0x8005, 4
special CallBattlePyramidFunction special CallBattlePyramidFunction
goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4 goto BattleFrontier_BattlePyramidLobby_EventScript_250BA4
@@ -437,7 +437,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D56:: @ 8250D56
applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD applymovement EVENT_OBJ_ID_PLAYER, BattleFrontier_BattlePyramidLobby_Movement_250DCD
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT msgbox BattleFrontier_BattlePyramidLobby_Text_251569, MSGBOX_DEFAULT
setvar VAR_0x8004, 1 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_GET_DATA
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePyramidFunction special CallBattlePyramidFunction
compare VAR_RESULT, 0 compare VAR_RESULT, 0
data/maps/BattleFrontier_BattlePyramidTop/scripts.inc
+3 -3
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattlePyramidTop_MapScripts:: @ 82550A1
.byte 0 .byte 0
BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6 BattleFrontier_BattlePyramidTop_MapScript1_2550B6: @ 82550B6
setvar VAR_0x8004, 13 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_UPDATE_LIGHT
setvar VAR_0x8005, 200 setvar VAR_0x8005, 200
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallBattlePyramidFunction special CallBattlePyramidFunction
@@ -69,7 +69,7 @@ BattleFrontier_BattlePyramidTop_EventScript_25518A:: @ 825518A
end end
BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193 BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8004, 3 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_3
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
special CallBattlePyramidFunction special CallBattlePyramidFunction
special SavePlayerParty special SavePlayerParty
@@ -77,7 +77,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
setvar VAR_0x8006, 0 setvar VAR_0x8006, 0
special CallFrontierUtilFunc special CallFrontierUtilFunc
setvar VAR_0x8004, 9 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_INIT_TRAINERS
special CallBattlePyramidFunction special CallBattlePyramidFunction
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+1 -1
View File
@@ -230,7 +230,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_241EBA:: @ 8241EBA
BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3 BattleFrontier_BattleTowerBattleRoom_EventScript_241EC3:: @ 8241EC3
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_24219A
waitmovement 0 waitmovement 0
applymovement 3, BattleFrontier_BattleTowerBattleRoom_Movement_2725B6 applymovement 3, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 2, Common_Movement_ExclamationMark applymovement 2, Common_Movement_ExclamationMark
data/maps/BattleFrontier_BattleTowerCorridor2/scripts.inc
+2 -2
View File
@@ -68,8 +68,8 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248DBC:: @ 8248DBC
applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5 applymovement 2, BattleFrontier_BattleTowerCorridor2_Movement_248ED5
waitmovement 0 waitmovement 0
delay 40 delay 40
applymovement 3, Common_Movement_WalkInPlaceUp applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement 2, Common_Movement_WalkInPlaceUp applymovement 2, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
opendoor 7, 1 opendoor 7, 1
waitdooranim waitdooranim
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+3 -3
View File
@@ -6,7 +6,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScripts:: @ 8243D92
.byte 0 .byte 0
BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7
setvar VAR_0x8004, 17 setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_RESTORE_PARTY
special CallBattlePyramidFunction special CallBattlePyramidFunction
end end
@@ -64,7 +64,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41
applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77 applymovement 1, BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77
waitmovement 0 waitmovement 0
copyobjectxytoperm 1 copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244056, MSGBOX_DEFAULT
special HealPlayerParty special HealPlayerParty
@@ -104,7 +104,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E9D:: @ 8243E9D
BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5 BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243EB5:: @ 8243EB5
msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT msgbox BattleFrontier_BattleTowerMultiBattleRoom_Text_244149, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
opendoor 10, 1 opendoor 10, 1
waitdooranim waitdooranim
data/maps/BattleFrontier_Lounge7/scripts.inc
+1 -1
View File
@@ -265,7 +265,7 @@ BattleFrontier_Lounge7_EventScript_265696:: @ 8265696
fadescreen 1 fadescreen 1
special CloseBattlePointsWindow special CloseBattlePointsWindow
special CloseBattleFrontierTutorWindow special CloseBattleFrontierTutorWindow
special sub_81B892C special OpenPartyMenuForMoveTutor
waitstate waitstate
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq BattleFrontier_Lounge7_EventScript_265645 goto_if_eq BattleFrontier_Lounge7_EventScript_265645
data/maps/BattleFrontier_OutsideWest/scripts.inc
+6 -6
View File
@@ -63,7 +63,7 @@ BattleFrontier_OutsideWest_EventScript_23D4AE:: @ 823D4AE
BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA BattleFrontier_OutsideWest_EventScript_23D4BA:: @ 823D4BA
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST hideobjectat 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST
@@ -126,16 +126,16 @@ BattleFrontier_OutsideWest_EventScript_23D53D:: @ 823D53D
end end
BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544 BattleFrontier_OutsideWest_EventScript_23D544:: @ 823D544
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_23DB7D, MSGBOX_DEFAULT
applymovement 10, Common_Movement_WalkInPlaceLeft applymovement 10, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_23DBCE, MSGBOX_DEFAULT
closemessage closemessage
delay 25 delay 25
applymovement 9, Common_Movement_WalkInPlaceUp applymovement 9, Common_Movement_WalkInPlaceFastestUp
applymovement 10, Common_Movement_WalkInPlaceUp applymovement 10, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
release release
end end
@@ -157,7 +157,7 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
end end
BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA BattleFrontier_OutsideWest_EventScript_23D5BA:: @ 823D5BA
applymovement 14, Common_Movement_WalkInPlaceUp applymovement 14, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
data/maps/BattleFrontier_ReceptionGate/scripts.inc
+3 -3
View File
@@ -38,9 +38,9 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229
msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_2666C6, MSGBOX_DEFAULT
msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT msgbox BattleFrontier_ReceptionGate_Text_266703, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement 2, Common_Movement_WalkInPlaceUp applymovement 2, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark applymovement 1, Common_Movement_ExclamationMark
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -227,22 +227,22 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8
end end
BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13 BattleFrontier_ScottsHouse_EventScript_263A13:: @ 8263A13
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E BattleFrontier_ScottsHouse_EventScript_263A1E:: @ 8263A1E
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29 BattleFrontier_ScottsHouse_EventScript_263A29:: @ 8263A29
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34 BattleFrontier_ScottsHouse_EventScript_263A34:: @ 8263A34
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/BirthIsland_Harbor/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ BirthIsland_Harbor_EventScript_26805D:: @ 826805D
goto_if_eq BirthIsland_Harbor_EventScript_2680A2 goto_if_eq BirthIsland_Harbor_EventScript_2680A2
msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR hideobjectat 1, MAP_BIRTH_ISLAND_HARBOR
data/maps/CaveOfOrigin_B1F/scripts.inc
+1 -1
View File
@@ -6,7 +6,7 @@ CaveOfOrigin_B1F_EventScript_2357A9:: @ 82357A9
faceplayer faceplayer
msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT msgbox CaveOfOrigin_B1F_Text_23586E, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 60 delay 60
playse SE_PIN playse SE_PIN
data/maps/DewfordTown_Hall/scripts.inc
+6 -6
View File
@@ -53,7 +53,7 @@ DewfordTown_Hall_EventScript_1FD547:: @ 81FD547
call DewfordTown_Hall_EventScript_271E8B call DewfordTown_Hall_EventScript_271E8B
msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_1FDA5C, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
release release
end end
@@ -64,7 +64,7 @@ DewfordTown_Hall_EventScript_1FD563:: @ 81FD563
call DewfordTown_Hall_EventScript_271E8B call DewfordTown_Hall_EventScript_271E8B
msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT msgbox DewfordTown_Hall_Text_1FDA99, MSGBOX_DEFAULT
closemessage closemessage
applymovement 5, Common_Movement_WalkInPlaceUp applymovement 5, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
release release
end end
@@ -200,7 +200,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
compare VAR_FACING, DIR_EAST compare VAR_FACING, DIR_EAST
goto_if_eq DewfordTown_Hall_EventScript_1FD739 goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -224,19 +224,19 @@ DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
return return
DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA DewfordTown_Hall_EventScript_1FD7AA:: @ 81FD7AA
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5 DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
compare VAR_FACING, DIR_WEST compare VAR_FACING, DIR_WEST
goto_if_eq DewfordTown_Hall_EventScript_1FD739 goto_if_eq DewfordTown_Hall_EventScript_1FD739
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+6 -6
View File
@@ -105,26 +105,26 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF:: @ 8228B30
addobject 3 addobject 3
applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives applymovement 3, EverGrandeCity_ChampionsRoom_Movement_BirchArrives
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
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 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
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 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart applymovement 1, EverGrandeCity_ChampionsRoom_Movement_WallaceExitStart
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExitStart
applymovement 3, Common_Movement_WalkInPlaceUp applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalFollows
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT
checkplayergender checkplayergender
@@ -153,7 +153,7 @@ EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations:: @ 8228BF4
EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer:: @ 8228BFD
applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer applymovement 2, EverGrandeCity_ChampionsRoom_Movement_RivalApproachPlayer
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/EverGrandeCity_HallOfFame/scripts.inc
+6 -6
View File
@@ -20,8 +20,8 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement 1, EverGrandeCity_HallOfFame_Movement_229901 applymovement 1, EverGrandeCity_HallOfFame_Movement_229901
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229901
waitmovement 0 waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT msgbox EverGrandeCity_HallOfFame_Text_22990E, MSGBOX_DEFAULT
closemessage closemessage
@@ -29,13 +29,13 @@ EverGrandeCity_HallOfFame_EventScript_229850:: @ 8229850
applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908 applymovement EVENT_OBJ_ID_PLAYER, EverGrandeCity_HallOfFame_Movement_229908
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT msgbox EverGrandeCity_HallOfFame_Text_2299A3, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 20 delay 20
dofieldeffect FLDEFF_HALL_OF_FAME_RECORD dofieldeffect FLDEFF_HALL_OF_FAME_RECORD
data/maps/FallarborTown_Mart/map.json
+1 -1
View File
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FallarborTown_Mart_EventScript_2C80B6", "script": "FallarborTown_Mart_EventScript_MetronomeTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/FarawayIsland_Entrance/scripts.inc
+1 -1
View File
@@ -24,7 +24,7 @@ FarawayIsland_Entrance_EventScript_267CA2:: @ 8267CA2
goto_if_eq FarawayIsland_Entrance_EventScript_267CE7 goto_if_eq FarawayIsland_Entrance_EventScript_267CE7
msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE hideobjectat 1, MAP_FARAWAY_ISLAND_ENTRANCE
data/maps/FortreeCity/scripts.inc
+1 -1
View File
@@ -72,7 +72,7 @@ FortreeCity_EventScript_1E2630:: @ 81E2630
FortreeCity_EventScript_1E2645:: @ 81E2645 FortreeCity_EventScript_1E2645:: @ 81E2645
msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT msgbox FortreeCity_Text_1E2A48, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, FortreeCity_Movement_2723C7 applymovement VAR_LAST_TALKED, Movement_KecleonAppears
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_KECLEON, 2 playmoncry SPECIES_KECLEON, 2
data/maps/FortreeCity_House2/map.json
+1 -1
View File
@@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "FortreeCity_House2_EventScript_2C811E", "script": "FortreeCity_House2_EventScript_SleepTalkTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/GraniteCave_B1F/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
GraniteCave_B1F_MapScripts:: @ 822DC5E GraniteCave_B1F_MapScripts:: @ 822DC5E
map_script MAP_SCRIPT_ON_FRAME_TABLE, GraniteCave_B1F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, GraniteCave_B1F_MapScript1_2A8331 map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_MapScript1_22DC6E map_script MAP_SCRIPT_ON_RESUME, GraniteCave_B1F_SetHoleWarp
.byte 0 .byte 0
GraniteCave_B1F_MapScript1_22DC6E: @ 822DC6E GraniteCave_B1F_SetHoleWarp: @ 822DC6E
setstepcallback 7 setstepcallback 7
setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0
end end
data/maps/LavaridgeTown/scripts.inc
+3 -3
View File
@@ -110,7 +110,7 @@ LavaridgeTown_EventScript_1EA635:: @ 81EA635
return return
LavaridgeTown_EventScript_1EA63A:: @ 81EA63A LavaridgeTown_EventScript_1EA63A:: @ 81EA63A
applymovement 8, Common_Movement_WalkInPlaceUp applymovement 8, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 8, Common_Movement_ExclamationMark applymovement 8, Common_Movement_ExclamationMark
@@ -127,14 +127,14 @@ LavaridgeTown_EventScript_1EA65C:: @ 81EA65C
waitmovement 0 waitmovement 0
closedoor 12, 15 closedoor 12, 15
waitdooranim waitdooranim
applymovement 8, Common_Movement_WalkInPlaceLeft applymovement 8, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 8, Common_Movement_ExclamationMark applymovement 8, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 8, Common_Movement_Delay48 applymovement 8, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
data/maps/LavaridgeTown_House/map.json
+1 -1
View File
@@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LavaridgeTown_House_EventScript_2C804E", "script": "LavaridgeTown_House_EventScript_MimicTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/LilycoveCity/scripts.inc
+1 -1
View File
@@ -387,7 +387,7 @@ LilycoveCity_EventScript_1E2FFD:: @ 81E2FFD
LilycoveCity_EventScript_1E3006:: @ 81E3006 LilycoveCity_EventScript_1E3006:: @ 81E3006
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 50 delay 50
setfieldeffectargument 0, 1 setfieldeffectargument 0, 1
data/maps/LilycoveCity_CoveLilyMotel_1F/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211
waitmovement 0 waitmovement 0
applymovement 1, Common_Movement_Delay48 applymovement 1, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT msgbox LilycoveCity_CoveLilyMotel_1F_Text_21839B, MSGBOX_DEFAULT
closemessage closemessage
data/maps/LilycoveCity_DepartmentStoreElevator/scripts.inc
+1 -1
View File
@@ -114,7 +114,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_2207E0:: @ 82207E0
LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5 LilycoveCity_DepartmentStoreElevator_EventScript_2207E5:: @ 82207E5
special CloseDeptStoreElevatorWindow special CloseDeptStoreElevatorWindow
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
waitse waitse
special MoveElevator special MoveElevator
data/maps/LilycoveCity_DepartmentStoreRooftop/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186", "script": "LilycoveCity_DepartmentStoreRooftop_EventScript_SubstituteTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc
+1 -1
View File
@@ -22,7 +22,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C
copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8008, VAR_RESULT
special BufferLottoTicketNumber special BufferLottoTicketNumber
msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT msgbox LilycoveCity_DepartmentStore_1F_Text_2A650B, MSGBOX_DEFAULT
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
playse SE_PC_ON playse SE_PC_ON
special DoLotteryCornerComputerEffect special DoLotteryCornerComputerEffect
data/maps/LilycoveCity_DepartmentStore_5F/scripts.inc
+1 -1
View File
@@ -141,7 +141,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_22009C:: @ 822009C
LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7 LilycoveCity_DepartmentStore_5F_EventScript_2200A7:: @ 82200A7
msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT msgbox LilycoveCity_DepartmentStore_5F_Text_2201C4, MSGBOX_DEFAULT
closemessage closemessage
applymovement 7, Common_Movement_WalkInPlaceUp applymovement 7, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
data/maps/LilycoveCity_Harbor/scripts.inc
+10 -10
View File
@@ -247,7 +247,7 @@ LilycoveCity_Harbor_EventScript_OldSeaMapFirstTime:: @ 821E350
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 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 4, Common_Movement_ExclamationMark applymovement 4, Common_Movement_ExclamationMark
@@ -329,12 +329,12 @@ LilycoveCity_Harbor_EventScript_MultipleEventTicketsFirstTime:: @ 821E44D
LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6 LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT msgbox EventTicket_Text_AsYouLike, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 30 delay 30
removeobject 4 removeobject 4
delay 30 delay 30
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
showobjectat 1, MAP_LILYCOVE_CITY_HARBOR showobjectat 1, MAP_LILYCOVE_CITY_HARBOR
delay 30 delay 30
@@ -343,7 +343,7 @@ LilycoveCity_Harbor_EventScript_ExitFirstTimeTicketSailSelect:: @ 821E4B6
end end
LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -355,7 +355,7 @@ LilycoveCity_Harbor_EventScript_GetEventTicketSailor:: @ 821E4EE
return return
LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514 LilycoveCity_Harbor_EventScript_BoardFerryWithSailor:: @ 821E514
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 30 delay 30
removeobject 4 removeobject 4
@@ -419,7 +419,7 @@ LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind:: @ 821E5C0
LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC LilycoveCity_Harbor_EventScript_BoardFerry:: @ 821E5CC
msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT msgbox LilycoveCity_Harbor_Text_PleaseBoard, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR
@@ -499,22 +499,22 @@ LilycoveCity_Harbor_Movement_SailorOutOfWayEast: @ 821E671
step_end step_end
LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675 LilycoveCity_Harbor_EventScript_BrineyFaceSailorNorth:: @ 821E675
applymovement 5, Common_Movement_WalkInPlaceLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680 LilycoveCity_Harbor_EventScript_BrineyFaceSailorEast:: @ 821E680
applymovement 5, Common_Movement_WalkInPlaceDown applymovement 5, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B LilycoveCity_Harbor_EventScript_BrineyFacePlayerNorth:: @ 821E68B
applymovement 5, Common_Movement_WalkInPlaceDown applymovement 5, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696 LilycoveCity_Harbor_EventScript_BrineyFacePlayerEast:: @ 821E696
applymovement 5, Common_Movement_WalkInPlaceLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc
+3 -3
View File
@@ -9,18 +9,18 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_21C790: @ 821C790
LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A
lockall lockall
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF00, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD
applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5 applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT msgbox LilycoveCity_PokemonTrainerFanClub_Text_21CF12, MSGBOX_DEFAULT
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C804
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_21C807
waitmovement 0 waitmovement 0
data/maps/LittlerootTown/scripts.inc
+15 -15
View File
@@ -357,9 +357,9 @@ LittlerootTown_Movement_1E8118: @ 81E8118
LittlerootTown_EventScript_1E811F:: @ 81E811F LittlerootTown_EventScript_1E811F:: @ 81E811F
lockall lockall
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
special GetPlayerBigGuyGirlString special GetPlayerBigGuyGirlString
msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT msgbox LittlerootTown_Text_1E8C3A, MSGBOX_DEFAULT
@@ -490,12 +490,12 @@ LittlerootTown_EventScript_1E828C:: @ 81E828C
return return
LittlerootTown_EventScript_1E8297:: @ 81E8297 LittlerootTown_EventScript_1E8297:: @ 81E8297
applymovement 4, Common_Movement_WalkInPlaceRight applymovement 4, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E82A2:: @ 81E82A2 LittlerootTown_EventScript_1E82A2:: @ 81E82A2
applymovement 4, Common_Movement_WalkInPlaceLeft applymovement 4, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
@@ -530,70 +530,70 @@ LittlerootTown_EventScript_1E82F0:: @ 81E82F0
return return
LittlerootTown_EventScript_1E8333:: @ 81E8333 LittlerootTown_EventScript_1E8333:: @ 81E8333
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85D1 applymovement 4, LittlerootTown_Movement_1E85D1
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E8348:: @ 81E8348 LittlerootTown_EventScript_1E8348:: @ 81E8348
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85D8 applymovement 4, LittlerootTown_Movement_1E85D8
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E835D:: @ 81E835D LittlerootTown_EventScript_1E835D:: @ 81E835D
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85DF applymovement 4, LittlerootTown_Movement_1E85DF
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E8372:: @ 81E8372 LittlerootTown_EventScript_1E8372:: @ 81E8372
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85E4 applymovement 4, LittlerootTown_Movement_1E85E4
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E8387:: @ 81E8387 LittlerootTown_EventScript_1E8387:: @ 81E8387
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85EA applymovement 4, LittlerootTown_Movement_1E85EA
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E839C:: @ 81E839C LittlerootTown_EventScript_1E839C:: @ 81E839C
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85ED applymovement 4, LittlerootTown_Movement_1E85ED
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E83B1:: @ 81E83B1 LittlerootTown_EventScript_1E83B1:: @ 81E83B1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85F1 applymovement 4, LittlerootTown_Movement_1E85F1
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E83C6:: @ 81E83C6 LittlerootTown_EventScript_1E83C6:: @ 81E83C6
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85F5 applymovement 4, LittlerootTown_Movement_1E85F5
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E83DB:: @ 81E83DB LittlerootTown_EventScript_1E83DB:: @ 81E83DB
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85F8 applymovement 4, LittlerootTown_Movement_1E85F8
waitmovement 0 waitmovement 0
return return
LittlerootTown_EventScript_1E83F0:: @ 81E83F0 LittlerootTown_EventScript_1E83F0:: @ 81E83F0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 4, LittlerootTown_Movement_1E85FE applymovement 4, LittlerootTown_Movement_1E85FE
waitmovement 0 waitmovement 0
@@ -894,7 +894,7 @@ LittlerootTown_EventScript_1E863D:: @ 81E863D
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
call_if_eq LittlerootTown_EventScript_1E828C call_if_eq LittlerootTown_EventScript_1E828C
call LittlerootTown_EventScript_1E8693 call LittlerootTown_EventScript_1E8693
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
opendoor VAR_0x8009, VAR_0x800A opendoor VAR_0x8009, VAR_0x800A
waitdooranim waitdooranim
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
+3 -3
View File
@@ -94,7 +94,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E
waitmovement 0 waitmovement 0
applymovement 4, Common_Movement_Delay48 applymovement 4, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1F789C
waitmovement 0 waitmovement 0
special GetRivalSonDaughterString special GetRivalSonDaughterString
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3
lockall lockall
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
goto LittlerootTown_BrendansHouse_1F_EventScript_292765 goto LittlerootTown_BrendansHouse_1F_EventScript_292765
end end
@@ -181,7 +181,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F78E2:: @ 81F78E2
end end
LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981 LittlerootTown_BrendansHouse_1F_EventScript_1F7981:: @ 81F7981
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+4 -4
View File
@@ -93,7 +93,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507 LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85C0
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
closemessage closemessage
@@ -105,7 +105,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8507:: @ 81F8507
LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536 LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85D7
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
closemessage closemessage
@@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8536:: @ 81F8536
LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565 LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8 applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85E8
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
closemessage closemessage
@@ -129,7 +129,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8565:: @ 81F8565
LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594
applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD applymovement 1, LittlerootTown_BrendansHouse_2F_Movement_1F85FD
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT msgbox LittlerootTown_BrendansHouse_2F_Text_1F97B4, MSGBOX_DEFAULT
closemessage closemessage
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
+3 -3
View File
@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE
waitmovement 0 waitmovement 0
applymovement 4, Common_Movement_Delay48 applymovement 4, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1F89EC
waitmovement 0 waitmovement 0
special GetRivalSonDaughterString special GetRivalSonDaughterString
@@ -154,7 +154,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A4C:: @ 81F8A4C
lockall lockall
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
setvar VAR_0x8005, 1 setvar VAR_0x8005, 1
applymovement VAR_0x8004, Common_Movement_WalkInPlaceRight applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
goto LittlerootTown_MaysHouse_1F_EventScript_292765 goto LittlerootTown_MaysHouse_1F_EventScript_292765
end end
@@ -218,7 +218,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8A8B:: @ 81F8A8B
end end
LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A LittlerootTown_MaysHouse_1F_EventScript_1F8B2A:: @ 81F8B2A
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+4 -4
View File
@@ -94,7 +94,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473 applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F9473
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
closemessage closemessage
@@ -106,7 +106,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93BA:: @ 81F93BA
LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9 LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F948B
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
closemessage closemessage
@@ -118,7 +118,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F93E9:: @ 81F93E9
LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418 LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F949D
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
closemessage closemessage
@@ -129,7 +129,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9418:: @ 81F9418
LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440
applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD applymovement 1, LittlerootTown_MaysHouse_2F_Movement_1F94AD
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT msgbox LittlerootTown_MaysHouse_2F_Text_1F959C, MSGBOX_DEFAULT
closemessage closemessage
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
+8 -8
View File
@@ -167,8 +167,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
delay 10 delay 10
playse SE_TK_KASYA playse SE_TK_KASYA
delay 20 delay 20
applymovement 3, Common_Movement_WalkInPlaceRight applymovement 3, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
@@ -180,8 +180,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80
delay 20 delay 20
applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58 applymovement 2, LittlerootTown_ProfessorBirchsLab_Movement_1F9F58
waitmovement 0 waitmovement 0
applymovement 3, Common_Movement_WalkInPlaceUp applymovement 3, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB419, MSGBOX_DEFAULT
playfanfare MUS_FANFA4 playfanfare MUS_FANFA4
@@ -286,7 +286,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB:: @ 81F9FBB
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_CYNDAQUIL, 10, 3 showmonpic SPECIES_CYNDAQUIL, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB7F6, MSGBOX_YESNO
@@ -299,7 +299,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF:: @ 81F9FEF
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_TOTODILE, 10, 3 showmonpic SPECIES_TOTODILE, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB869, MSGBOX_YESNO
@@ -312,7 +312,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA023:: @ 81FA023
release release
compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6 compare VAR_DEX_UPGRADE_JOHTO_STARTER_STATE, 6
goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1FA057
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
showmonpic SPECIES_CHIKORITA, 10, 3 showmonpic SPECIES_CHIKORITA, 10, 3
msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO msgbox LittlerootTown_ProfessorBirchsLab_Text_1FB8E0, MSGBOX_YESNO
@@ -529,7 +529,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8
closemessage closemessage
applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0 applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
data/maps/MagmaHideout_4F/scripts.inc
+2 -2
View File
@@ -18,7 +18,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
playfanfare MUS_ME_TAMA playfanfare MUS_ME_TAMA
playse SE_TAMA playse SE_TAMA
special sub_80B0534 special sub_80B0534
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 150 delay 150
removeobject 7 removeobject 7
@@ -50,7 +50,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560
waitmovement 0 waitmovement 0
msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT msgbox MagmaHideout_4F_Text_23AADA, MSGBOX_DEFAULT
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement 6, Common_Movement_FacePlayer applymovement 6, Common_Movement_FacePlayer
data/maps/MauvilleCity/map.json
+1 -1
View File
@@ -162,7 +162,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MauvilleCity_EventScript_2C7F7E", "script": "MauvilleCity_EventScript_RolloutTutor",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/MauvilleCity/scripts.inc
+6 -6
View File
@@ -86,7 +86,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D
MauvilleCity_EventScript_1DF452:: @ 81DF452 MauvilleCity_EventScript_1DF452:: @ 81DF452
lockall lockall
goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690
applymovement 6, Common_Movement_WalkInPlaceRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT
msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DF8B9, MSGBOX_DEFAULT
@@ -118,7 +118,7 @@ MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
applymovement 6, MauvilleCity_Movement_1DF6A8 applymovement 6, MauvilleCity_Movement_1DF6A8
applymovement 7, MauvilleCity_Movement_1DF6E2 applymovement 7, MauvilleCity_Movement_1DF6E2
waitmovement 0 waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE applymovement EVENT_OBJ_ID_PLAYER, MauvilleCity_Movement_1DF6EE
@@ -138,7 +138,7 @@ MauvilleCity_EventScript_1DF53D:: @ 81DF53D
applymovement 6, MauvilleCity_Movement_1DF6AE applymovement 6, MauvilleCity_Movement_1DF6AE
applymovement 7, MauvilleCity_Movement_1DF6E8 applymovement 7, MauvilleCity_Movement_1DF6E8
waitmovement 0 waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement 7, MauvilleCity_Movement_1DF6F7 applymovement 7, MauvilleCity_Movement_1DF6F7
@@ -164,7 +164,7 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
call_if_eq MauvilleCity_EventScript_1DF5F3 call_if_eq MauvilleCity_EventScript_1DF5F3
compare VAR_FACING, DIR_EAST compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF601 call_if_eq MauvilleCity_EventScript_1DF601
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage closemessage
@@ -205,13 +205,13 @@ MauvilleCity_EventScript_1DF628:: @ 81DF628
MauvilleCity_EventScript_1DF63A:: @ 81DF63A MauvilleCity_EventScript_1DF63A:: @ 81DF63A
msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFB6D, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96 trainerbattle_no_intro TRAINER_WALLY_2, MauvilleCity_Text_1DFB96
applymovement 6, Common_Movement_WalkInPlaceRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFBC3, MSGBOX_DEFAULT
applymovement 6, Common_Movement_FacePlayer applymovement 6, Common_Movement_FacePlayer
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFBED, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceRight applymovement 6, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFC8A, MSGBOX_DEFAULT
return return
data/maps/MeteorFalls_1F_1R/scripts.inc
+10 -10
View File
@@ -19,12 +19,12 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceDown
waitmovement 0 waitmovement 0
delay 30 delay 30
applymovement 5, MeteorFalls_1F_1R_Movement_2725B4 applymovement 5, Common_Movement_WalkInPlaceDown
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22BF47, MSGBOX_DEFAULT
closemessage closemessage
applymovement 5, Common_Movement_WalkInPlaceUp applymovement 5, Common_Movement_WalkInPlaceFastestUp
applymovement 6, Common_Movement_WalkInPlaceUp applymovement 6, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 5, Common_Movement_ExclamationMark applymovement 5, Common_Movement_ExclamationMark
@@ -37,9 +37,9 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22BFE4, MSGBOX_DEFAULT
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 5, Common_Movement_WalkInPlaceLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
addobject 7 addobject 7
addobject 8 addobject 8
@@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0 applymovement 8, MeteorFalls_1F_1R_Movement_22BEE0
applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8 applymovement 9, MeteorFalls_1F_1R_Movement_22BEE8
waitmovement 0 waitmovement 0
applymovement 5, Common_Movement_WalkInPlaceLeft applymovement 5, Common_Movement_WalkInPlaceFastestLeft
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22C04E, MSGBOX_DEFAULT
closemessage closemessage
@@ -68,10 +68,10 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F
applymovement 9, MeteorFalls_1F_1R_Movement_22BF18 applymovement 9, MeteorFalls_1F_1R_Movement_22BF18
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22C268, MSGBOX_DEFAULT
applymovement 7, Common_Movement_WalkInPlaceDown applymovement 7, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22C292, MSGBOX_DEFAULT
applymovement 7, Common_Movement_WalkInPlaceLeft applymovement 7, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT msgbox MeteorFalls_1F_1R_Text_22C2FC, MSGBOX_DEFAULT
closemessage closemessage
data/maps/MirageTower_2F/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
MirageTower_2F_MapScripts:: @ 823AD11 MirageTower_2F_MapScripts:: @ 823AD11
map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_2F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_2F_MapScript1_2A8331 map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_MapScript1_23AD21 map_script MAP_SCRIPT_ON_RESUME, MirageTower_2F_SetHoleWarp
.byte 0 .byte 0
MirageTower_2F_MapScript1_23AD21: @ 823AD21 MirageTower_2F_SetHoleWarp: @ 823AD21
setstepcallback 7 setstepcallback 7
setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_1F, 255, 0, 0
end end
data/maps/MirageTower_3F/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
MirageTower_3F_MapScripts:: @ 823AD2C MirageTower_3F_MapScripts:: @ 823AD2C
map_script MAP_SCRIPT_ON_FRAME_TABLE, MirageTower_3F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, MirageTower_3F_MapScript1_2A8331 map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_MapScript1_23AD3C map_script MAP_SCRIPT_ON_RESUME, MirageTower_3F_SetHoleWarp
.byte 0 .byte 0
MirageTower_3F_MapScript1_23AD3C: @ 823AD3C MirageTower_3F_SetHoleWarp: @ 823AD3C
setstepcallback 7 setstepcallback 7
setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0 setholewarp MAP_MIRAGE_TOWER_2F, 255, 0, 0
end end
data/maps/MossdeepCity/map.json
+1 -1
View File
@@ -222,7 +222,7 @@
"movement_range_y": 3, "movement_range_y": 3,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "MossdeepCity_EventScript_2C81EE", "script": "MossdeepCity_EventScript_DynamicPunchTutor",
"flag": "0" "flag": "0"
}, },
{ {
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+4 -4
View File
@@ -82,7 +82,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223024:: @ 8223024
compare VAR_RESULT, 1 compare VAR_RESULT, 1
call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_22305A
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
release release
end end
@@ -106,7 +106,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_223063:: @ 8223063
MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A MossdeepCity_SpaceCenter_1F_EventScript_22307A:: @ 822307A
msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_2234B7, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
release release
end end
@@ -139,14 +139,14 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA
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_223664, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
release release
end end
MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119 MossdeepCity_SpaceCenter_1F_EventScript_223119:: @ 8223119
msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceRight applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
release release
end end
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+9 -9
View File
@@ -57,13 +57,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09
trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461 trainerbattle_no_intro TRAINER_GRUNT_34, MossdeepCity_SpaceCenter_2F_Text_224461
applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85 applymovement 6, MossdeepCity_SpaceCenter_2F_Movement_223E85
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_22446E, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499 trainerbattle_no_intro TRAINER_GRUNT_35, MossdeepCity_SpaceCenter_2F_Text_224499
applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81 applymovement 5, MossdeepCity_SpaceCenter_2F_Movement_223E81
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2244AB, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1 trainerbattle_no_intro TRAINER_GRUNT_36, MossdeepCity_SpaceCenter_2F_Text_2244F1
@@ -238,13 +238,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C goto_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22400C
msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_224854, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
releaseall releaseall
end end
MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
special SavePlayerParty special SavePlayerParty
fadescreen 1 fadescreen 1
@@ -270,19 +270,19 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
switch VAR_RESULT switch VAR_RESULT
case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071 case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
fadescreen 1 fadescreen 1
special sp0C8_whiteout_maybe special SetCB2WhiteOut
waitstate waitstate
MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2248C2, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
applymovement 9, Common_Movement_WalkInPlaceLeft applymovement 9, Common_Movement_WalkInPlaceFastestLeft
applymovement 8, Common_Movement_WalkInPlaceDown applymovement 8, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 60 delay 60
applymovement 9, Common_Movement_WalkInPlaceUp applymovement 9, Common_Movement_WalkInPlaceFastestUp
applymovement 8, Common_Movement_WalkInPlaceRight applymovement 8, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2249DC, MSGBOX_DEFAULT
data/maps/MossdeepCity_StevensHouse/scripts.inc
+1 -1
View File
@@ -28,7 +28,7 @@ MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
lockall lockall
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 1, Common_Movement_ExclamationMark applymovement 1, Common_Movement_ExclamationMark
data/maps/MtChimney/scripts.inc
+1 -1
View File
@@ -60,7 +60,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
call_if_eq MtChimney_EventScript_22EEC7 call_if_eq MtChimney_EventScript_22EEC7
compare VAR_FACING, DIR_NORTH compare VAR_FACING, DIR_NORTH
call_if_eq MtChimney_EventScript_22EED2 call_if_eq MtChimney_EventScript_22EED2
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
closemessage closemessage
data/maps/MtPyre_2F/scripts.inc
+4 -4
View File
@@ -1,10 +1,10 @@
MtPyre_2F_MapScripts:: @ 82310FB MtPyre_2F_MapScripts:: @ 82310FB
map_script MAP_SCRIPT_ON_FRAME_TABLE, MtPyre_2F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, MtPyre_2F_MapScript1_2A8331 map_script MAP_SCRIPT_ON_TRANSITION, CaveHole_FixCrackedGround
map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_MapScript1_23110B map_script MAP_SCRIPT_ON_RESUME, MtPyre_2F_SetHoleWarp
.byte 0 .byte 0
MtPyre_2F_MapScript1_23110B: @ 823110B MtPyre_2F_SetHoleWarp: @ 823110B
setstepcallback 7 setstepcallback 7
setholewarp MAP_MT_PYRE_1F, 255, 0, 0 setholewarp MAP_MT_PYRE_1F, 255, 0, 0
end end
data/maps/MtPyre_Summit/scripts.inc
+7 -7
View File
@@ -34,7 +34,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C
playbgm MUS_AQA_0, 0 playbgm MUS_AQA_0, 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_WalkInPlaceDown applymovement 2, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 50 delay 50
compare VAR_0x8008, 0 compare VAR_0x8008, 0
@@ -86,7 +86,7 @@ MtPyre_Summit_EventScript_2320EC:: @ 82320EC
MtPyre_Summit_EventScript_2320F7:: @ 82320F7 MtPyre_Summit_EventScript_2320F7:: @ 82320F7
applymovement 3, MtPyre_Summit_Movement_23212C applymovement 3, MtPyre_Summit_Movement_23212C
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -98,7 +98,7 @@ MtPyre_Summit_EventScript_23210C:: @ 823210C
MtPyre_Summit_EventScript_232117:: @ 8232117 MtPyre_Summit_EventScript_232117:: @ 8232117
applymovement 3, MtPyre_Summit_Movement_232132 applymovement 3, MtPyre_Summit_Movement_232132
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
@@ -207,7 +207,7 @@ MtPyre_Summit_EventScript_232204:: @ 8232204
end end
MtPyre_Summit_EventScript_232210:: @ 8232210 MtPyre_Summit_EventScript_232210:: @ 8232210
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 60 delay 60
compare VAR_0x8008, 0 compare VAR_0x8008, 0
@@ -292,7 +292,7 @@ MtPyre_Summit_EventScript_23235A:: @ 823235A
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323ED applymovement 8, MtPyre_Summit_Movement_2323ED
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -300,7 +300,7 @@ MtPyre_Summit_EventScript_232376:: @ 8232376
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323F3 applymovement 8, MtPyre_Summit_Movement_2323F3
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -308,7 +308,7 @@ MtPyre_Summit_EventScript_232392:: @ 8232392
applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA applymovement EVENT_OBJ_ID_PLAYER, MtPyre_Summit_Movement_2323EA
applymovement 8, MtPyre_Summit_Movement_2323F8 applymovement 8, MtPyre_Summit_Movement_2323F8
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
data/maps/NavelRock_Harbor/scripts.inc
+1 -1
View File
@@ -9,7 +9,7 @@ NavelRock_Harbor_EventScript_2690BD:: @ 82690BD
goto_if_eq NavelRock_Harbor_EventScript_269102 goto_if_eq NavelRock_Harbor_EventScript_269102
msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT msgbox EventTicket_Text_SailHome, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat 1, MAP_NAVEL_ROCK_HARBOR hideobjectat 1, MAP_NAVEL_ROCK_HARBOR
data/maps/NewMauville_Entrance/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ NewMauville_Entrance_OnTransition: @ 82372FB
NewMauville_Entrance_EventScript_2372FF:: @ 82372FF NewMauville_Entrance_EventScript_2372FF:: @ 82372FF
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT msgbox NewMauville_Entrance_Text_237382, MSGBOX_DEFAULT
checkitem ITEM_BASEMENT_KEY, 1 checkitem ITEM_BASEMENT_KEY, 1
data/maps/OldaleTown/scripts.inc
+3 -3
View File
@@ -227,7 +227,7 @@ OldaleTown_EventScript_1E9086:: @ 81E9086
lockall lockall
applymovement 4, OldaleTown_Movement_1E9170 applymovement 4, OldaleTown_Movement_1E9170
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_1E90E6 goto OldaleTown_EventScript_1E90E6
@@ -237,7 +237,7 @@ OldaleTown_EventScript_1E90A6:: @ 81E90A6
lockall lockall
applymovement 4, OldaleTown_Movement_1E9173 applymovement 4, OldaleTown_Movement_1E9173
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_1E90E6 goto OldaleTown_EventScript_1E90E6
@@ -247,7 +247,7 @@ OldaleTown_EventScript_1E90C6:: @ 81E90C6
lockall lockall
applymovement 4, OldaleTown_Movement_1E9175 applymovement 4, OldaleTown_Movement_1E9175
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
setvar VAR_0x8009, 1 setvar VAR_0x8009, 1
goto OldaleTown_EventScript_1E90E6 goto OldaleTown_EventScript_1E90E6
data/maps/PacifidlogTown_PokemonCenter_1F/map.json
+1 -1
View File
@@ -76,7 +76,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE", "script": "PacifidlogTown_PokemonCenter_1F_EventScript_ExplosionTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/PetalburgCity/scripts.inc
+9 -9
View File
@@ -44,7 +44,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
special StartWallyTutorialBattle special StartWallyTutorialBattle
waitstate waitstate
msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1EC271, MSGBOX_DEFAULT
applymovement 2, Common_Movement_WalkInPlaceLeft, MAP_PETALBURG_CITY applymovement 2, Common_Movement_WalkInPlaceFastestLeft, MAP_PETALBURG_CITY
waitmovement 2, MAP_PETALBURG_CITY waitmovement 2, MAP_PETALBURG_CITY
msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
closemessage closemessage
@@ -290,8 +290,8 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq PetalburgCity_EventScript_1DC5FF call_if_eq PetalburgCity_EventScript_1DC5FF
msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DC91B, MSGBOX_DEFAULT
applymovement 8, Common_Movement_WalkInPlaceRight applymovement 8, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DC93E, MSGBOX_DEFAULT
closemessage closemessage
@@ -304,7 +304,7 @@ PetalburgCity_EventScript_1DC4CA:: @ 81DC4CA
PetalburgCity_EventScript_1DC57F:: @ 81DC57F PetalburgCity_EventScript_1DC57F:: @ 81DC57F
applymovement 8, PetalburgCity_Movement_1DC615 applymovement 8, PetalburgCity_Movement_1DC615
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
@@ -316,14 +316,14 @@ PetalburgCity_EventScript_1DC594:: @ 81DC594
PetalburgCity_EventScript_1DC59F:: @ 81DC59F PetalburgCity_EventScript_1DC59F:: @ 81DC59F
applymovement 8, PetalburgCity_Movement_1DC61D applymovement 8, PetalburgCity_Movement_1DC61D
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4 PetalburgCity_EventScript_1DC5B4:: @ 81DC5B4
applymovement 8, PetalburgCity_Movement_1DC622 applymovement 8, PetalburgCity_Movement_1DC622
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
@@ -549,17 +549,17 @@ PetalburgCity_EventScript_1DC6E9:: @ 81DC6E9
waitmovement 0 waitmovement 0
applymovement 9, PetalburgCity_Movement_1DC7DB applymovement 9, PetalburgCity_Movement_1DC7DB
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
setvar VAR_SCOTT_STATE, 1 setvar VAR_SCOTT_STATE, 1
msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DCB31, MSGBOX_DEFAULT
closemessage closemessage
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DCB82, MSGBOX_DEFAULT
closemessage closemessage
applymovement 9, Common_Movement_WalkInPlaceLeft applymovement 9, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT msgbox PetalburgCity_Text_1DCC09, MSGBOX_DEFAULT
data/maps/PetalburgCity_Gym/scripts.inc
+31 -31
View File
@@ -90,14 +90,14 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4
msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B32, MSGBOX_DEFAULT
msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205B4C, MSGBOX_DEFAULT
closemessage closemessage
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_2049EC applymovement 10, PetalburgCity_Gym_Movement_2049EC
waitmovement 0 waitmovement 0
playse SE_KAIDAN playse SE_KAIDAN
removeobject 10 removeobject 10
setflag FLAG_HIDE_PETALBURG_CITY_WALLY setflag FLAG_HIDE_PETALBURG_CITY_WALLY
delay 30 delay 30
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_205C40, MSGBOX_DEFAULT
setvar VAR_PETALBURG_GYM_STATE, 2 setvar VAR_PETALBURG_GYM_STATE, 2
@@ -228,7 +228,7 @@ PetalburgCity_Gym_EventScript_204AAC:: @ 8204AAC
end end
PetalburgCity_Gym_EventScript_204C31:: @ 8204C31 PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_2050EB applymovement 10, PetalburgCity_Gym_Movement_2050EB
waitmovement 0 waitmovement 0
return return
@@ -236,20 +236,20 @@ PetalburgCity_Gym_EventScript_204C31:: @ 8204C31
PetalburgCity_Gym_EventScript_204C43:: @ 8204C43 PetalburgCity_Gym_EventScript_204C43:: @ 8204C43
applymovement 10, PetalburgCity_Gym_Movement_2050E1 applymovement 10, PetalburgCity_Gym_Movement_2050E1
waitmovement 0 waitmovement 0
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F PetalburgCity_Gym_EventScript_204C5F:: @ 8204C5F
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_2050EB applymovement 10, PetalburgCity_Gym_Movement_2050EB
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204C78:: @ 8204C78 PetalburgCity_Gym_EventScript_204C78:: @ 8204C78
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement 10, PetalburgCity_Gym_Movement_205102 applymovement 10, PetalburgCity_Gym_Movement_205102
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_205111
waitmovement 0 waitmovement 0
@@ -274,45 +274,45 @@ PetalburgCity_Gym_EventScript_204CB5:: @ 8204CB5
return return
PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7 PetalburgCity_Gym_EventScript_204CC7:: @ 8204CC7
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2 PetalburgCity_Gym_EventScript_204CD2:: @ 8204CD2
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4 PetalburgCity_Gym_EventScript_204CE4:: @ 8204CE4
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6 PetalburgCity_Gym_EventScript_204CF6:: @ 8204CF6
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204D08:: @ 8204D08 PetalburgCity_Gym_EventScript_204D08:: @ 8204D08
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204D13:: @ 8204D13 PetalburgCity_Gym_EventScript_204D13:: @ 8204D13
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E PetalburgCity_Gym_EventScript_204D1E:: @ 8204D1E
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204D29:: @ 8204D29 PetalburgCity_Gym_EventScript_204D29:: @ 8204D29
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
@@ -322,7 +322,7 @@ PetalburgCity_Gym_EventScript_204D34:: @ 8204D34
return return
PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F PetalburgCity_Gym_EventScript_204D3F:: @ 8204D3F
applymovement 10, Common_Movement_WalkInPlaceDown applymovement 10, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
@@ -350,7 +350,7 @@ PetalburgCity_Gym_EventScript_204D72:: @ 8204D72
return return
PetalburgCity_Gym_EventScript_204D73:: @ 8204D73 PetalburgCity_Gym_EventScript_204D73:: @ 8204D73
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
@@ -504,47 +504,47 @@ PetalburgCity_Gym_EventScript_204F13:: @ 8204F13
end end
PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC PetalburgCity_Gym_EventScript_204FCC:: @ 8204FCC
applymovement 11, Common_Movement_WalkInPlaceUp applymovement 11, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7 PetalburgCity_Gym_EventScript_204FD7:: @ 8204FD7
applymovement 11, Common_Movement_WalkInPlaceRight applymovement 11, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2 PetalburgCity_Gym_EventScript_204FE2:: @ 8204FE2
applymovement 11, Common_Movement_WalkInPlaceLeft applymovement 11, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_204FED:: @ 8204FED PetalburgCity_Gym_EventScript_204FED:: @ 8204FED
applymovement 11, PetalburgCity_Gym_Movement_2050C3 applymovement 11, PetalburgCity_Gym_Movement_2050C3
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_205009:: @ 8205009 PetalburgCity_Gym_EventScript_205009:: @ 8205009
applymovement 11, PetalburgCity_Gym_Movement_2050CA applymovement 11, PetalburgCity_Gym_Movement_2050CA
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_205025:: @ 8205025 PetalburgCity_Gym_EventScript_205025:: @ 8205025
applymovement 11, PetalburgCity_Gym_Movement_2050D0 applymovement 11, PetalburgCity_Gym_Movement_2050D0
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
PetalburgCity_Gym_EventScript_205041:: @ 8205041 PetalburgCity_Gym_EventScript_205041:: @ 8205041
applymovement 11, PetalburgCity_Gym_Movement_20507E applymovement 11, PetalburgCity_Gym_Movement_20507E
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1 applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Gym_Movement_2050A1
waitmovement 0 waitmovement 0
return return
data/maps/PetalburgWoods/scripts.inc
+5 -5
View File
@@ -15,7 +15,7 @@ PetalburgWoods_EventScript_22DFD7:: @ 822DFD7
closemessage closemessage
applymovement 3, PetalburgWoods_Movement_22E1F6 applymovement 3, PetalburgWoods_Movement_22E1F6
waitmovement 0 waitmovement 0
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT
closemessage closemessage
@@ -41,7 +41,7 @@ PetalburgWoods_EventScript_22E079:: @ 822E079
call PetalburgWoods_EventScript_22E124 call PetalburgWoods_EventScript_22E124
applymovement 4, PetalburgWoods_Movement_22E1D0 applymovement 4, PetalburgWoods_Movement_22E1D0
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E34F, MSGBOX_DEFAULT
closemessage closemessage
@@ -52,14 +52,14 @@ PetalburgWoods_EventScript_22E079:: @ 822E079
closemessage closemessage
applymovement 3, PetalburgWoods_Movement_22E205 applymovement 3, PetalburgWoods_Movement_22E205
waitmovement 0 waitmovement 0
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E428, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, PetalburgWoods_Movement_22E1EA applymovement 4, PetalburgWoods_Movement_22E1EA
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E457, MSGBOX_DEFAULT
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E4A5, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542 trainerbattle_no_intro TRAINER_GRUNT_8, PetalburgWoods_Text_22E542
@@ -85,7 +85,7 @@ PetalburgWoods_EventScript_22E138:: @ 822E138
applymovement 3, PetalburgWoods_Movement_22E1FD applymovement 3, PetalburgWoods_Movement_22E1FD
waitmovement 0 waitmovement 0
removeobject 3 removeobject 3
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT msgbox PetalburgWoods_Text_22E63D, MSGBOX_DEFAULT
giveitem_std ITEM_GREAT_BALL giveitem_std ITEM_GREAT_BALL
data/maps/Route101/scripts.inc
+2 -2
View File
@@ -30,7 +30,7 @@ Route101_EventScript_1EBCDE:: @ 81EBCDE
applymovement 4, Route101_Movement_1EBD96 applymovement 4, Route101_Movement_1EBD96
applymovement 2, Route101_Movement_1EBDC8 applymovement 2, Route101_Movement_1EBDC8
waitmovement 0 waitmovement 0
applymovement 2, Common_Movement_WalkInPlaceRight applymovement 2, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 4, Route101_Movement_1EBDBD applymovement 4, Route101_Movement_1EBDBD
applymovement 2, Route101_Movement_1EBDEF applymovement 2, Route101_Movement_1EBDEF
@@ -223,7 +223,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
fadescreen 1 fadescreen 1
removeobject 4 removeobject 4
setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
special ChooseStarter special ChooseStarter
waitstate waitstate
data/maps/Route104/scripts.inc
+1 -1
View File
@@ -51,7 +51,7 @@ Route104_EventScript_1ECCB3:: @ 81ECCB3
setflag FLAG_HIDE_RUSBORO_CITY_RIVAL setflag FLAG_HIDE_RUSBORO_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 EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 10 delay 10
addobject 34 addobject 34
data/maps/Route110/scripts.inc
+5 -5
View File
@@ -307,7 +307,7 @@ Route110_EventScript_1EF64A:: @ 81EF64A
Route110_EventScript_1EF661:: @ 81EF661 Route110_EventScript_1EF661:: @ 81EF661
lockall lockall
applymovement 21, Common_Movement_WalkInPlaceRight applymovement 21, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
call Route110_EventScript_1EF673 call Route110_EventScript_1EF673
releaseall releaseall
@@ -383,7 +383,7 @@ Route110_EventScript_1EF76E:: @ 81EF76E
call_if_eq Route110_EventScript_1EF7E1 call_if_eq Route110_EventScript_1EF7E1
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
call_if_eq Route110_EventScript_1EF7E6 call_if_eq Route110_EventScript_1EF7E6
applymovement 28, Common_Movement_WalkInPlaceDown applymovement 28, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
applymovement 28, Common_Movement_ExclamationMark applymovement 28, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
@@ -631,13 +631,13 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7
msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT msgbox Route110_Text_1F0AB5, MSGBOX_DEFAULT
closemessage closemessage
delay 20 delay 20
applymovement 36, Common_Movement_WalkInPlaceLeft applymovement 36, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 10 delay 10
applymovement 36, Common_Movement_WalkInPlaceRight applymovement 36, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement 36, Common_Movement_WalkInPlaceDown applymovement 36, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT msgbox Route110_Text_1F0AFF, MSGBOX_DEFAULT
data/maps/Route110_TrickHouseEnd/scripts.inc
+5 -5
View File
@@ -212,22 +212,22 @@ Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
return return
Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015 Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020 Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036 Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -241,7 +241,7 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
applymovement 1, Route110_TrickHouseEnd_Movement_26B08B applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
waitmovement 0 waitmovement 0
playse SE_W153 playse SE_W153
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT
closemessage closemessage
data/maps/Route110_TrickHouseEntrance/scripts.inc
+3 -3
View File
@@ -334,7 +334,7 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
applymovement 1, Common_Movement_Delay48 applymovement 1, Common_Movement_Delay48
waitmovement 0 waitmovement 0
msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
@@ -432,7 +432,7 @@ Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023 Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
@@ -506,7 +506,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0 setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
special DrawWholeMapView special DrawWholeMapView
delay 20 delay 20
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_2725C9 applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7 applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
waitmovement 0 waitmovement 0
data/maps/Route111/scripts.inc
+4 -4
View File
@@ -285,7 +285,7 @@ Route111_EventScript_1F0FC5:: @ 81F0FC5
Route111_EventScript_1F0FE7:: @ 81F0FE7 Route111_EventScript_1F0FE7:: @ 81F0FE7
msgbox Route111_Text_1F1523, MSGBOX_DEFAULT msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542 trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
call Route111_EventScript_1F113C call Route111_EventScript_1F113C
msgbox Route111_Text_1F156F, MSGBOX_DEFAULT msgbox Route111_Text_1F156F, MSGBOX_DEFAULT
@@ -303,7 +303,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
call Route111_EventScript_1F1143 call Route111_EventScript_1F1143
msgbox Route111_Text_1F159D, MSGBOX_DEFAULT msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616 trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
applymovement 2, Common_Movement_WalkInPlaceUp applymovement 2, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
call Route111_EventScript_1F113C call Route111_EventScript_1F113C
msgbox Route111_Text_1F1645, MSGBOX_DEFAULT msgbox Route111_Text_1F1645, MSGBOX_DEFAULT
@@ -321,7 +321,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
call Route111_EventScript_1F1143 call Route111_EventScript_1F1143
msgbox Route111_Text_1F167E, MSGBOX_DEFAULT msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6 trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
applymovement 3, Common_Movement_WalkInPlaceUp applymovement 3, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
call Route111_EventScript_1F113C call Route111_EventScript_1F113C
msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT
@@ -341,7 +341,7 @@ Route111_EventScript_1F0FE7:: @ 81F0FE7
trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756 trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
msgbox Route111_Text_1F1788, MSGBOX_DEFAULT msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
call Route111_EventScript_1F113C call Route111_EventScript_1F113C
applymovement 4, Route111_Movement_1F114A applymovement 4, Route111_Movement_1F114A
data/maps/Route112/scripts.inc
+4 -4
View File
@@ -10,7 +10,7 @@ Route112_OnTransition: @ 81F1DAE
Route112_EventScript_1F1DB7:: @ 81F1DB7 Route112_EventScript_1F1DB7:: @ 81F1DB7
lockall lockall
delay 40 delay 40
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
@@ -18,7 +18,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
applymovement 1, Common_Movement_FaceOriginalDirection applymovement 1, Common_Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
delay 40 delay 40
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
@@ -26,7 +26,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
applymovement 6, Common_Movement_FaceOriginalDirection applymovement 6, Common_Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
delay 40 delay 40
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
@@ -34,7 +34,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
applymovement 1, Common_Movement_FaceOriginalDirection applymovement 1, Common_Movement_FaceOriginalDirection
waitmovement 0 waitmovement 0
delay 40 delay 40
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox Route112_Text_1F2003, MSGBOX_DEFAULT msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
data/maps/Route114_FossilManiacsTunnel/scripts.inc
+2 -2
View File
@@ -23,8 +23,8 @@ Route114_FossilManiacsTunnel_EventScript_22AF53:: @ 822AF53
Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66
lockall lockall
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT msgbox Route114_FossilManiacsTunnel_Text_22B1F7, MSGBOX_DEFAULT
setvar VAR_FOSSIL_MANIAC_STATE, 2 setvar VAR_FOSSIL_MANIAC_STATE, 2
data/maps/Route116/scripts.inc
+2 -2
View File
@@ -151,8 +151,8 @@ Route116_EventScript_1F2D84:: @ 81F2D84
Route116_EventScript_1F2D95:: @ 81F2D95 Route116_EventScript_1F2D95:: @ 81F2D95
lockall lockall
applymovement 11, Common_Movement_WalkInPlaceRight applymovement 11, Common_Movement_WalkInPlaceFastestRight
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox Route116_Text_1F309D, MSGBOX_DEFAULT msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
setvar VAR_ROUTE116_STATE, 2 setvar VAR_ROUTE116_STATE, 2
data/maps/Route119/map.json
+2 -2
View File
@@ -477,7 +477,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_27231C", "script": "Route119_EventScript_Kecleon1",
"flag": "FLAG_HIDE_ROUTE_119_KECLEON_1" "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1"
}, },
{ {
@@ -490,7 +490,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route119_EventScript_272329", "script": "Route119_EventScript_Kecleon2",
"flag": "FLAG_HIDE_ROUTE_119_KECLEON_2" "flag": "FLAG_HIDE_ROUTE_119_KECLEON_2"
}, },
{ {
data/maps/Route119/scripts.inc
+1 -1
View File
@@ -51,7 +51,7 @@ Route119_EventScript_1F4488:: @ 81F4488
call_if_eq Route119_EventScript_1F46C6 call_if_eq Route119_EventScript_1F46C6
compare VAR_TEMP_1, 2 compare VAR_TEMP_1, 2
call_if_eq Route119_EventScript_1F46D1 call_if_eq Route119_EventScript_1F46D1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
compare VAR_TEMP_1, 1 compare VAR_TEMP_1, 1
data/maps/Route120/map.json
+14 -14
View File
@@ -412,8 +412,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_1F57BC", "script": "Route120_EventScript_InvisibleBridgeKecleon",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_1" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_STEVEN", "graphics_id": "EVENT_OBJ_GFX_STEVEN",
@@ -425,7 +425,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_1F5641", "script": "Route120_EventScript_Steven",
"flag": "FLAG_HIDE_ROUTE_120_STEVEN" "flag": "FLAG_HIDE_ROUTE_120_STEVEN"
}, },
{ {
@@ -491,7 +491,7 @@
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "0x0", "script": "0x0",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1", "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -503,8 +503,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722DB", "script": "Route120_EventScript_Kecleon1",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_2" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1", "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -516,8 +516,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722E8", "script": "Route120_EventScript_Kecleon2",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_3" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1", "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -529,8 +529,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_2722F5", "script": "Route120_EventScript_Kecleon3",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_4" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1", "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -542,8 +542,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_27230F", "script": "Route120_EventScript_Kecleon5",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_6" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_KECLEON_1", "graphics_id": "EVENT_OBJ_GFX_KECLEON_1",
@@ -555,8 +555,8 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "Route120_EventScript_272302", "script": "Route120_EventScript_Kecleon4",
"flag": "FLAG_HIDE_ROUTE_120_KECLEON_5" "flag": "FLAG_HIDE_ROUTE_120_KECLEON_4"
}, },
{ {
"graphics_id": "EVENT_OBJ_GFX_GIRL_3", "graphics_id": "EVENT_OBJ_GFX_GIRL_3",
data/maps/Route120/scripts.inc
+62 -63
View File
@@ -1,44 +1,44 @@
Route120_MapScripts:: @ 81F53EC Route120_MapScripts:: @ 81F53EC
map_script MAP_SCRIPT_ON_RESUME, Route120_MapScript1_1F53FC map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume
map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, Route120_OnTransition
map_script MAP_SCRIPT_ON_LOAD, Route120_MapScript1_1F5474 map_script MAP_SCRIPT_ON_LOAD, Route120_OnLoad
.byte 0 .byte 0
Route120_MapScript1_1F53FC: @ 81F53FC Route120_OnResume: @ 81F53FC
call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_1F5406 call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_RemoveKecleonObject
end end
Route120_EventScript_1F5406:: @ 81F5406 Route120_EventScript_RemoveKecleonObject:: @ 81F5406
compare VAR_0x8009, 0 compare VAR_0x8009, 0
call_if_eq Route120_EventScript_1F5449 call_if_eq Route120_EventScript_RemoveBridgeKecleon
compare VAR_0x8009, 1 compare VAR_0x8009, 1
call_if_eq Route120_EventScript_1F5460 call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 2 compare VAR_0x8009, 2
call_if_eq Route120_EventScript_1F5460 call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 3 compare VAR_0x8009, 3
call_if_eq Route120_EventScript_1F5460 call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 4 compare VAR_0x8009, 4
call_if_eq Route120_EventScript_1F5460 call_if_eq Route120_EventScript_RemoveKecleon
compare VAR_0x8009, 5 compare VAR_0x8009, 5
call_if_eq Route120_EventScript_1F5460 call_if_eq Route120_EventScript_RemoveKecleon
return return
Route120_EventScript_1F5449:: @ 81F5449 Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject 30 removeobject 30 @ Invisible Bridge Kecleon
removeobject 36 removeobject 36 @ Visible Bridge Kecleon
return return
Route120_EventScript_1F5460:: @ 81F5460 Route120_EventScript_RemoveKecleon:: @ 81F5460
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_CAUGHT compare VAR_RESULT, B_OUTCOME_CAUGHT
goto_if_ne Common_EventScript_NopReturn goto_if_ne Common_EventScript_NopReturn
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
return return
Route120_MapScript1_1F5474: @ 81F5474 Route120_OnLoad: @ 81F5474
call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490
call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3
call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8
@@ -166,44 +166,44 @@ Route120_EventScript_1F5638:: @ 81F5638
msgbox Route120_Text_2A7183, MSGBOX_DEFAULT msgbox Route120_Text_2A7183, MSGBOX_DEFAULT
return return
Route120_EventScript_1F5641:: @ 81F5641 Route120_EventScript_Steven:: @ 81F5641
lock lock
faceplayer faceplayer
goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672 goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672
msgbox Route120_Text_1F5998, MSGBOX_YESNO msgbox Route120_Text_StevenGreeting, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route120_EventScript_1F5665 goto_if_eq Route120_EventScript_StevenNotReady
goto Route120_EventScript_1F568B goto Route120_EventScript_StevenBattleKecleon
end end
Route120_EventScript_1F5665:: @ 81F5665 Route120_EventScript_StevenNotReady:: @ 81F5665
msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT
setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120 setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120
release release
end end
Route120_EventScript_1F5672:: @ 81F5672 Route120_EventScript_1F5672:: @ 81F5672
msgbox Route120_Text_1F5ADE, MSGBOX_YESNO msgbox Route120_Text_StevenReadyForBattle, MSGBOX_YESNO
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Route120_EventScript_1F5665 goto_if_eq Route120_EventScript_StevenNotReady
goto Route120_EventScript_1F568B goto Route120_EventScript_StevenBattleKecleon
end end
Route120_EventScript_1F568B:: @ 81F568B Route120_EventScript_StevenBattleKecleon:: @ 81F568B
msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT msgbox Route120_Text_StevenShowMeYourPower, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, DIR_NORTH compare VAR_FACING, DIR_NORTH
call_if_eq Route120_EventScript_1F57A3 call_if_eq Route120_EventScript_PlayerApproachKecleonNorth
compare VAR_FACING, DIR_WEST compare VAR_FACING, DIR_WEST
call_if_eq Route120_EventScript_1F57AE call_if_eq Route120_EventScript_PlayerApproachKecleonWest
applymovement 31, Common_Movement_WalkInPlaceLeft applymovement 31, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 20 delay 20
msgbox Route120_Text_1F5B43, MSGBOX_DEFAULT msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT
closemessage closemessage
applymovement 30, Common_Movement_WalkInPlaceRight applymovement 30, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
applymovement 30, Route120_Movement_2723C7 applymovement 30, Movement_KecleonAppears
waitmovement 0 waitmovement 0
waitse waitse
playmoncry SPECIES_KECLEON, 2 playmoncry SPECIES_KECLEON, 2
@@ -216,32 +216,32 @@ Route120_EventScript_1F568B:: @ 81F568B
clearflag FLAG_SYS_CTRL_OBJ_DELETE clearflag FLAG_SYS_CTRL_OBJ_DELETE
specialvar VAR_RESULT, GetBattleOutcome specialvar VAR_RESULT, GetBattleOutcome
compare VAR_RESULT, B_OUTCOME_WON compare VAR_RESULT, B_OUTCOME_WON
goto_if_eq Route120_EventScript_1F571C goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
compare VAR_RESULT, B_OUTCOME_RAN compare VAR_RESULT, B_OUTCOME_RAN
goto_if_eq Route120_EventScript_1F571C goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED compare VAR_RESULT, B_OUTCOME_PLAYER_TELEPORTED
goto_if_eq Route120_EventScript_1F571C goto_if_eq Route120_EventScript_RemoveBridgeKecleonPostBattle
goto Route120_EventScript_1F572C goto Route120_EventScript_StevenGiveDeconScope
end end
Route120_EventScript_1F571C:: @ 81F571C Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
fadescreenswapbuffers 1 fadescreenswapbuffers 1
removeobject 30 removeobject 30 @ Invisible Bridge Kecleon
removeobject 36 removeobject 36 @ Visible Bridge Kecleon
fadescreenswapbuffers 0 fadescreenswapbuffers 0
goto Route120_EventScript_1F572C goto Route120_EventScript_StevenGiveDeconScope
end end
Route120_EventScript_1F572C:: @ 81F572C Route120_EventScript_StevenGiveDeconScope:: @ 81F572C
applymovement 31, Common_Movement_WalkInPlaceDown applymovement 31, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT msgbox Route120_Text_StevenGiveDevonScope, MSGBOX_DEFAULT
giveitem_std ITEM_DEVON_SCOPE giveitem_std ITEM_DEVON_SCOPE
setflag FLAG_RECEIVED_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE
msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT msgbox Route120_Text_StevenGoodbye, MSGBOX_DEFAULT
closemessage closemessage
applymovement 31, Common_Movement_WalkInPlaceDown applymovement 31, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 50 delay 50
setfieldeffectargument 0, 1 setfieldeffectargument 0, 1
@@ -257,23 +257,23 @@ Route120_EventScript_1F572C:: @ 81F572C
release release
end end
Route120_EventScript_1F57A3:: @ 81F57A3 Route120_EventScript_PlayerApproachKecleonNorth:: @ 81F57A3
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
Route120_EventScript_1F57AE:: @ 81F57AE Route120_EventScript_PlayerApproachKecleonWest:: @ 81F57AE
applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_1F57B9 applymovement EVENT_OBJ_ID_PLAYER, Route120_Movement_ApproachKecleonWest
waitmovement 0 waitmovement 0
return return
Route120_Movement_1F57B9: @ 81F57B9 Route120_Movement_ApproachKecleonWest: @ 81F57B9
walk_down walk_down
walk_left walk_left
step_end step_end
Route120_EventScript_1F57BC:: @ 81F57BC Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
msgbox Route120_Text_1F5D00, MSGBOX_NPC msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
end end
Route120_EventScript_1F57C5:: @ 81F57C5 Route120_EventScript_1F57C5:: @ 81F57C5
@@ -383,7 +383,7 @@ Route120_EventScript_1F5981:: @ 81F5981
msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE msgbox Route120_Text_29F002, MSGBOX_AUTOCLOSE
end end
Route120_Text_1F5998: @ 81F5998 Route120_Text_StevenGreeting: @ 81F5998
.string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n" .string "STEVEN: Hm? {PLAYER}{KUN}, hi.\n"
.string "It's been a while.\p" .string "It's been a while.\p"
.string "There's something here that you can't\n" .string "There's something here that you can't\n"
@@ -400,21 +400,21 @@ Route120_Text_1F5AAC: @ 81F5AAC
.string "STEVEN: No?\p" .string "STEVEN: No?\p"
.string "I'll wait here, so you can get ready.$" .string "I'll wait here, so you can get ready.$"
Route120_Text_1F5ADE: @ 81F5ADE Route120_Text_StevenReadyForBattle: @ 81F5ADE
.string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n" .string "STEVEN: {PLAYER}{KUN}, are your POKéMON\n"
.string "ready for battle?$" .string "ready for battle?$"
Route120_Text_1F5B0F: @ 81F5B0F Route120_Text_StevenShowMeYourPower: @ 81F5B0F
.string "STEVEN: {PLAYER}{KUN}, show me your true\n" .string "STEVEN: {PLAYER}{KUN}, show me your true\n"
.string "power as a TRAINER!$" .string "power as a TRAINER!$"
Route120_Text_1F5B43: @ 81F5B43 Route120_Text_StevenUsedDevonScope: @ 81F5B43
.string "STEVEN used the DEVON SCOPE.\p" .string "STEVEN used the DEVON SCOPE.\p"
.string "An invisible POKéMON became completely\n" .string "An invisible POKéMON became completely\n"
.string "visible!\p" .string "visible!\p"
.string "The startled POKéMON attacked!$" .string "The startled POKéMON attacked!$"
Route120_Text_1F5BAF: @ 81F5BAF Route120_Text_StevenGiveDevonScope: @ 81F5BAF
.string "STEVEN: I see…\n" .string "STEVEN: I see…\n"
.string "Your battle style is intriguing.\p" .string "Your battle style is intriguing.\p"
.string "Your POKéMON have obviously grown\n" .string "Your POKéMON have obviously grown\n"
@@ -424,22 +424,21 @@ Route120_Text_1F5BAF: @ 81F5BAF
.string "Who knows, there may be other\n" .string "Who knows, there may be other\n"
.string "concealed POKéMON.$" .string "concealed POKéMON.$"
Route120_Text_1F5C7B: @ 81F5C7B Route120_Text_StevenGoodbye: @ 81F5C7B
.string "STEVEN: {PLAYER}{KUN}.\p" .string "STEVEN: {PLAYER}{KUN}.\p"
.string "I enjoy seeing POKéMON and TRAINERS\n" .string "I enjoy seeing POKéMON and TRAINERS\n"
.string "who strive together.\p" .string "who strive together.\p"
.string "I think you're doing great.\p" .string "I think you're doing great.\p"
.string "Well, let's meet again somewhere.$" .string "Well, let's meet again somewhere.$"
Route119_Text_1F5D00: @ 81F5D00 Kecleon_Text_SomethingUnseeable: @ 81F5D00
Route120_Text_1F5D00: @ 81F5D00
.string "Something unseeable is in the way.$" .string "Something unseeable is in the way.$"
Route119_Text_1F5D23: @ 81F5D23 Kecleon_Text_WantToUseDevonScope: @ 81F5D23
.string "Something unseeable is in the way.\p" .string "Something unseeable is in the way.\p"
.string "Want to use the DEVON SCOPE?$" .string "Want to use the DEVON SCOPE?$"
Route119_Text_1F5D63: @ 81F5D63 Kecleon_Text_UseDevonScopeMonAttacked: @ 81F5D63
.string "{PLAYER} used the DEVON SCOPE.\p" .string "{PLAYER} used the DEVON SCOPE.\p"
.string "An invisible POKéMON became completely\n" .string "An invisible POKéMON became completely\n"
.string "visible!\p" .string "visible!\p"
data/maps/Route121/scripts.inc
+1 -1
View File
@@ -16,7 +16,7 @@ Route121_EventScript_1F5E0F:: @ 81F5E0F
Route121_EventScript_1F5E18:: @ 81F5E18 Route121_EventScript_1F5E18:: @ 81F5E18
lockall lockall
playbgm MUS_AQA_0, 0 playbgm MUS_AQA_0, 0
applymovement 13, Route121_Movement_2725B8 applymovement 13, Common_Movement_WalkInPlaceRight
waitmovement 0 waitmovement 0
msgbox Route121_Text_1F605A, MSGBOX_DEFAULT msgbox Route121_Text_1F605A, MSGBOX_DEFAULT
closemessage closemessage
data/maps/Route121_SafariZoneEntrance/scripts.inc
+1 -1
View File
@@ -46,7 +46,7 @@ Route121_SafariZoneEntrance_EventScript_22BC0E:: @ 822BC0E
Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18 Route121_SafariZoneEntrance_EventScript_22BC18:: @ 822BC18
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
showmoneybox 0, 0, 0 showmoneybox 0, 0, 0
msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO msgbox Route121_SafariZoneEntrance_Text_2A4F74, MSGBOX_YESNO
data/maps/Route128/scripts.inc
+7 -7
View File
@@ -24,18 +24,18 @@ Route128_EventScript_1F6B57:: @ 81F6B57
closemessage closemessage
applymovement 5, Route128_Movement_1F6CAD applymovement 5, Route128_Movement_1F6CAD
waitmovement 0 waitmovement 0
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT msgbox Route128_Text_1F6E5A, MSGBOX_DEFAULT
closemessage closemessage
applymovement 5, Route128_Movement_1F6CBB applymovement 5, Route128_Movement_1F6CBB
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT msgbox Route128_Text_1F6F1E, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, Route128_Movement_1F6C96 applymovement 4, Route128_Movement_1F6C96
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
applymovement 5, Route128_Movement_1F6CA8 applymovement 5, Route128_Movement_1F6CA8
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F704F, MSGBOX_DEFAULT msgbox Route128_Text_1F704F, MSGBOX_DEFAULT
@@ -53,19 +53,19 @@ Route128_EventScript_1F6B57:: @ 81F6B57
addobject 3 addobject 3
applymovement 3, Route128_Movement_1F6C87 applymovement 3, Route128_Movement_1F6C87
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT msgbox Route128_Text_1F70C9, MSGBOX_DEFAULT
closemessage closemessage
applymovement 3, Route128_Movement_1F6C85 applymovement 3, Route128_Movement_1F6C85
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT msgbox Route128_Text_1F70EA, MSGBOX_DEFAULT
applymovement 3, Common_Movement_WalkInPlaceDown applymovement 3, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox Route128_Text_1F721B, MSGBOX_DEFAULT msgbox Route128_Text_1F721B, MSGBOX_DEFAULT
closemessage closemessage
applymovement 3, Common_Movement_WalkInPlaceDown applymovement 3, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 50 delay 50
setfieldeffectargument 0, 1 setfieldeffectargument 0, 1
data/maps/RustboroCity/scripts.inc
+37 -37
View File
@@ -46,14 +46,14 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
waitmovement 0 waitmovement 0
applymovement 15, Common_Movement_Delay48 applymovement 15, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
applymovement 15, RustboroCity_Movement_1E084E applymovement 15, RustboroCity_Movement_1E084E
waitmovement 0 waitmovement 0
msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT msgbox RustboroCity_Text_1E22A5, MSGBOX_DEFAULT
closemessage closemessage
setflag FLAG_HAS_MATCH_CALL setflag FLAG_HAS_MATCH_CALL
applymovement 15, Common_Movement_WalkInPlaceLeft applymovement 15, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
playse SE_TK_KASYA playse SE_TK_KASYA
delay 10 delay 10
@@ -63,7 +63,7 @@ RustboroCity_EventScript_1E0715:: @ 81E0715
delay 10 delay 10
playse SE_TK_KASYA playse SE_TK_KASYA
delay 20 delay 20
applymovement 15, Common_Movement_WalkInPlaceDown applymovement 15, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT msgbox RustboroCity_Text_1E2331, MSGBOX_DEFAULT
closemessage closemessage
@@ -344,7 +344,7 @@ RustboroCity_EventScript_1E0A6E:: @ 81E0A6E
RustboroCity_EventScript_1E0A79:: @ 81E0A79 RustboroCity_EventScript_1E0A79:: @ 81E0A79
applymovement 9, RustboroCity_Movement_1E0AD5 applymovement 9, RustboroCity_Movement_1E0AD5
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
@@ -500,43 +500,43 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E
end end
RustboroCity_EventScript_1E0B6F:: @ 81E0B6F RustboroCity_EventScript_1E0B6F:: @ 81E0B6F
applymovement 9, Common_Movement_WalkInPlaceUp applymovement 9, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0B9B:: @ 81E0B9B RustboroCity_EventScript_1E0B9B:: @ 81E0B9B
applymovement 9, Common_Movement_WalkInPlaceLeft applymovement 9, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AC applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceRight
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0BC7:: @ 81E0BC7 RustboroCity_EventScript_1E0BC7:: @ 81E0BC7
applymovement 9, Common_Movement_WalkInPlaceDown applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
applymovement 9, Common_Movement_WalkInPlaceDown applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
@@ -545,7 +545,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3
waitmovement 0 waitmovement 0
applymovement 9, RustboroCity_Movement_1E0C29 applymovement 9, RustboroCity_Movement_1E0C29
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
@@ -608,43 +608,43 @@ RustboroCity_EventScript_1E0CD3:: @ 81E0CD3
return return
RustboroCity_EventScript_1E0CDC:: @ 81E0CDC RustboroCity_EventScript_1E0CDC:: @ 81E0CDC
applymovement 9, Common_Movement_WalkInPlaceUp applymovement 9, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0D08:: @ 81E0D08 RustboroCity_EventScript_1E0D08:: @ 81E0D08
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, RustboroCity_Movement_2725AE applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceLeft
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0D34:: @ 81E0D34 RustboroCity_EventScript_1E0D34:: @ 81E0D34
applymovement 9, Common_Movement_WalkInPlaceDown applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
waitmovement 0 waitmovement 0
applymovement 9, Common_Movement_Delay48 applymovement 9, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0D60:: @ 81E0D60 RustboroCity_EventScript_1E0D60:: @ 81E0D60
applymovement 9, Common_Movement_WalkInPlaceDown applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
@@ -653,12 +653,12 @@ RustboroCity_EventScript_1E0D60:: @ 81E0D60
waitmovement 0 waitmovement 0
applymovement 9, RustboroCity_Movement_1E0C29 applymovement 9, RustboroCity_Movement_1E0C29
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
return return
RustboroCity_EventScript_1E0D96:: @ 81E0D96 RustboroCity_EventScript_1E0D96:: @ 81E0D96
applymovement 9, Common_Movement_WalkInPlaceLeft applymovement 9, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 9, Common_Movement_ExclamationMark applymovement 9, Common_Movement_ExclamationMark
@@ -694,7 +694,7 @@ RustboroCity_EventScript_1E0DEE:: @ 81E0DEE
RustboroCity_EventScript_1E0DF3:: @ 81E0DF3 RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -703,14 +703,14 @@ RustboroCity_EventScript_1E0DF3:: @ 81E0DF3
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E120E applymovement 14, RustboroCity_Movement_1E120E
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0E33:: @ 81E0E33 RustboroCity_EventScript_1E0E33:: @ 81E0E33
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -719,14 +719,14 @@ RustboroCity_EventScript_1E0E33:: @ 81E0E33
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E1215 applymovement 14, RustboroCity_Movement_1E1215
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0E73:: @ 81E0E73 RustboroCity_EventScript_1E0E73:: @ 81E0E73
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -735,14 +735,14 @@ RustboroCity_EventScript_1E0E73:: @ 81E0E73
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E121B applymovement 14, RustboroCity_Movement_1E121B
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0EB3:: @ 81E0EB3 RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -751,14 +751,14 @@ RustboroCity_EventScript_1E0EB3:: @ 81E0EB3
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E1220 applymovement 14, RustboroCity_Movement_1E1220
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0EF3:: @ 81E0EF3 RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -767,14 +767,14 @@ RustboroCity_EventScript_1E0EF3:: @ 81E0EF3
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E1224 applymovement 14, RustboroCity_Movement_1E1224
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0F33:: @ 81E0F33 RustboroCity_EventScript_1E0F33:: @ 81E0F33
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -783,14 +783,14 @@ RustboroCity_EventScript_1E0F33:: @ 81E0F33
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E1227 applymovement 14, RustboroCity_Movement_1E1227
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0F73:: @ 81E0F73 RustboroCity_EventScript_1E0F73:: @ 81E0F73
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -799,14 +799,14 @@ RustboroCity_EventScript_1E0F73:: @ 81E0F73
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E122B applymovement 14, RustboroCity_Movement_1E122B
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
RustboroCity_EventScript_1E0FB3:: @ 81E0FB3 RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
lockall lockall
call RustboroCity_EventScript_1E0DD1 call RustboroCity_EventScript_1E0DD1
applymovement 14, Common_Movement_WalkInPlaceDown applymovement 14, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
playse SE_PIN playse SE_PIN
applymovement 14, Common_Movement_ExclamationMark applymovement 14, Common_Movement_ExclamationMark
@@ -815,7 +815,7 @@ RustboroCity_EventScript_1E0FB3:: @ 81E0FB3
waitmovement 0 waitmovement 0
applymovement 14, RustboroCity_Movement_1E1230 applymovement 14, RustboroCity_Movement_1E1230
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
goto RustboroCity_EventScript_1E0FF3 goto RustboroCity_EventScript_1E0FF3
data/maps/RustboroCity_PokemonSchool/scripts.inc
+2 -2
View File
@@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if_eq Common_EventScript_ShowBagIsFull goto_if_eq Common_EventScript_ShowBagIsFull
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
setflag FLAG_RECEIVED_QUICK_CLAW setflag FLAG_RECEIVED_QUICK_CLAW
release release
@@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_213FF0:: @ 8213FF0
RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB
msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT msgbox RustboroCity_PokemonSchool_Text_2144C8, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceDown applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
release release
end end
data/maps/RusturfTunnel/scripts.inc
+4 -4
View File
@@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0 waitmovement 0
applymovement 10, Common_Movement_WalkInPlaceDown applymovement 10, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
@@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045 applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0 waitmovement 0
applymovement 10, Common_Movement_WalkInPlaceDown applymovement 10, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
RusturfTunnel_EventScript_22CFA7:: @ 822CFA7 RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
data/maps/SSTidalCorridor/scripts.inc
+1 -1
View File
@@ -201,7 +201,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
lockall lockall
applymovement 5, SSTidalCorridor_Movement_23C26D applymovement 5, SSTidalCorridor_Movement_23C26D
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
closemessage closemessage
data/maps/SeafloorCavern_Entrance/scripts.inc
+5 -5
View File
@@ -29,7 +29,7 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
copyobjectxytoperm 1 copyobjectxytoperm 1
msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT msgbox SeafloorCavern_Entrance_Text_234544, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
@@ -43,23 +43,23 @@ SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
call_if_eq SeafloorCavern_Entrance_EventScript_234539 call_if_eq SeafloorCavern_Entrance_EventScript_234539
msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT msgbox SeafloorCavern_Entrance_Text_2346C8, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
releaseall releaseall
end end
SeafloorCavern_Entrance_EventScript_234523:: @ 8234523 SeafloorCavern_Entrance_EventScript_234523:: @ 8234523
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E SeafloorCavern_Entrance_EventScript_23452E:: @ 823452E
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
SeafloorCavern_Entrance_EventScript_234539:: @ 8234539 SeafloorCavern_Entrance_EventScript_234539:: @ 8234539
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
data/maps/SeafloorCavern_Room9/scripts.inc
+9 -9
View File
@@ -7,7 +7,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setvar VAR_0x8005, 3 setvar VAR_0x8005, 3
setvar VAR_0x8006, 4 setvar VAR_0x8006, 4
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C applymovement EVENT_OBJ_ID_PLAYER, SeafloorCavern_Room9_Movement_23505C
waitmovement 0 waitmovement 0
@@ -15,12 +15,12 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_23505F, MSGBOX_DEFAULT
closemessage closemessage
addobject VAR_0x8004 addobject VAR_0x8004
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A applymovement VAR_0x8004, SeafloorCavern_Room9_Movement_23502A
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_23507C, MSGBOX_DEFAULT
applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2350A6, MSGBOX_DEFAULT
applymovement VAR_0x8004, Common_Movement_FacePlayer applymovement VAR_0x8004, Common_Movement_FacePlayer
@@ -30,7 +30,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2351E5, MSGBOX_DEFAULT
setweather WEATHER_NONE setweather WEATHER_NONE
doweather doweather
special sub_80B05B4 special Script_FadeOutMapMusic
waitstate waitstate
msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_235279, MSGBOX_DEFAULT
special WaitWeather special WaitWeather
@@ -47,8 +47,8 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
playfanfare MUS_ME_TAMA playfanfare MUS_ME_TAMA
playse SE_TAMA playse SE_TAMA
special sub_80B0534 special sub_80B0534
applymovement VAR_0x8004, Common_Movement_WalkInPlaceUp applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 150 delay 150
removeobject 7 removeobject 7
@@ -82,7 +82,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
setvar VAR_0x8007, 5 setvar VAR_0x8007, 5
msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2352A7, MSGBOX_DEFAULT
playse SE_PC_LOGIN playse SE_PC_LOGIN
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2352F6, MSGBOX_DEFAULT
closemessage closemessage
@@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
closemessage closemessage
playse SE_PC_OFF playse SE_PC_OFF
delay 20 delay 20
applymovement VAR_0x8004, Common_Movement_WalkInPlaceDown applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_23546F, MSGBOX_DEFAULT
closemessage closemessage
@@ -103,7 +103,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057 applymovement VAR_0x8006, SeafloorCavern_Room9_Movement_235057
applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E applymovement VAR_0x8005, SeafloorCavern_Room9_Movement_23504E
waitmovement 0 waitmovement 0
applymovement VAR_0x8004, Common_Movement_WalkInPlaceLeft applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT msgbox SeafloorCavern_Room9_Text_2354F0, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
data/maps/SkyPillar_2F/scripts.inc
+4 -4
View File
@@ -1,20 +1,20 @@
SkyPillar_2F_MapScripts:: @ 823962B SkyPillar_2F_MapScripts:: @ 823962B
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_2F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_2F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_MapScript1_239650 map_script MAP_SCRIPT_ON_RESUME, SkyPillar_2F_SetHoleWarp
.byte 0 .byte 0
SkyPillar_2F_OnTransition: @ 823963B SkyPillar_2F_OnTransition: @ 823963B
compare VAR_SKY_PILLAR_STATE, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_2F_EventScript_CleanFloor call_if_lt SkyPillar_2F_EventScript_CleanFloor
copyvar VAR_ICE_STEP_COUNT, 0x1 copyvar VAR_ICE_STEP_COUNT, 1
end end
SkyPillar_2F_EventScript_CleanFloor:: @ 823964C SkyPillar_2F_EventScript_CleanFloor:: @ 823964C
setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN
return return
SkyPillar_2F_MapScript1_239650: @ 8239650 SkyPillar_2F_SetHoleWarp: @ 8239650
setstepcallback 7 setstepcallback 7
setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0
end end
data/maps/SkyPillar_4F/scripts.inc
+4 -4
View File
@@ -1,20 +1,20 @@
SkyPillar_4F_MapScripts:: @ 8239671 SkyPillar_4F_MapScripts:: @ 8239671
map_script MAP_SCRIPT_ON_FRAME_TABLE, SkyPillar_4F_MapScript2_2A8327 map_script MAP_SCRIPT_ON_FRAME_TABLE, CaveHole_CheckFallDownHole
map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition map_script MAP_SCRIPT_ON_TRANSITION, SkyPillar_4F_OnTransition
map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_MapScript1_239696 map_script MAP_SCRIPT_ON_RESUME, SkyPillar_4F_SetHoleWarp
.byte 0 .byte 0
SkyPillar_4F_OnTransition: @ 8239681 SkyPillar_4F_OnTransition: @ 8239681
compare VAR_SKY_PILLAR_STATE, 2 compare VAR_SKY_PILLAR_STATE, 2
call_if_lt SkyPillar_4F_EventScript_CleanFloor call_if_lt SkyPillar_4F_EventScript_CleanFloor
copyvar VAR_ICE_STEP_COUNT, 0x1 copyvar VAR_ICE_STEP_COUNT, 1
end end
SkyPillar_4F_EventScript_CleanFloor:: @ 8239692 SkyPillar_4F_EventScript_CleanFloor:: @ 8239692
setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN
return return
SkyPillar_4F_MapScript1_239696: @ 8239696 SkyPillar_4F_SetHoleWarp: @ 8239696
setstepcallback 7 setstepcallback 7
setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0
end end
data/maps/SkyPillar_Outside/scripts.inc
+4 -4
View File
@@ -36,7 +36,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
lockall lockall
applymovement 1, SkyPillar_Outside_Movement_2393D3 applymovement 1, SkyPillar_Outside_Movement_2393D3
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_239416, MSGBOX_DEFAULT
closemessage closemessage
@@ -60,13 +60,13 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
special ShakeCamera special ShakeCamera
waitstate waitstate
delay 20 delay 20
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 10 delay 10
applymovement 1, Common_Movement_WalkInPlaceRight applymovement 1, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 20 delay 20
applymovement 1, Common_Movement_WalkInPlaceDown applymovement 1, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 30 delay 30
msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT msgbox SkyPillar_Outside_Text_23950C, MSGBOX_DEFAULT
data/maps/SlateportCity/scripts.inc
+10 -10
View File
@@ -61,11 +61,11 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
waitmovement 0 waitmovement 0
msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT
closemessage closemessage
applymovement 35, Common_Movement_WalkInPlaceLeft applymovement 35, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
delay 60 delay 60
msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT
applymovement 35, Common_Movement_WalkInPlaceRight applymovement 35, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT
closemessage closemessage
@@ -563,10 +563,10 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT
msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT
closemessage closemessage
applymovement 10, Common_Movement_WalkInPlaceRight applymovement 10, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 10 delay 10
applymovement 9, Common_Movement_WalkInPlaceDown applymovement 9, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
delay 25 delay 25
applymovement 11, SlateportCity_Movement_1DD33C applymovement 11, SlateportCity_Movement_1DD33C
@@ -577,18 +577,18 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
removeobject 10 removeobject 10
removeobject 9 removeobject 9
msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT
applymovement 11, Common_Movement_WalkInPlaceUp applymovement 11, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT
playbgm MUS_AQA_0, 0 playbgm MUS_AQA_0, 0
msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT
applymovement 6, Common_Movement_WalkInPlaceLeft applymovement 6, Common_Movement_WalkInPlaceFastestLeft
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
applymovement 7, SlateportCity_Movement_1DD309 applymovement 7, SlateportCity_Movement_1DD309
applymovement 3, SlateportCity_Movement_272596 applymovement 3, Common_Movement_QuestionMark
applymovement 2, SlateportCity_Movement_1DD311 applymovement 2, SlateportCity_Movement_1DD311
waitmovement 0 waitmovement 0
applymovement 11, Common_Movement_WalkInPlaceDown applymovement 11, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT
playse SE_PIN playse SE_PIN
@@ -596,7 +596,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
waitmovement 0 waitmovement 0
applymovement 11, Common_Movement_Delay48 applymovement 11, Common_Movement_Delay48
waitmovement 0 waitmovement 0
applymovement 11, Common_Movement_WalkInPlaceUp applymovement 11, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT
msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT
data/maps/SlateportCity_BattleTentCorridor/scripts.inc
+1 -1
View File
@@ -44,7 +44,7 @@ SlateportCity_BattleTentCorridor_EventScript_208E65:: @ 8208E65
SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4 SlateportCity_BattleTentCorridor_EventScript_208EB4:: @ 8208EB4
msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT msgbox SlateportCity_BattleTentCorridor_Text_25AB96, MSGBOX_DEFAULT
closemessage closemessage
applymovement 1, Common_Movement_WalkInPlaceUp applymovement 1, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
opendoor 2, 1 opendoor 2, 1
waitdooranim waitdooranim
data/maps/SlateportCity_Harbor/scripts.inc
+7 -7
View File
@@ -48,10 +48,10 @@ SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
end end
SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
applymovement 7, Common_Movement_WalkInPlaceDown applymovement 7, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
applymovement 6, Common_Movement_WalkInPlaceDown applymovement 6, Common_Movement_WalkInPlaceFastestDown
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT
closemessage closemessage
@@ -85,21 +85,21 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89 SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
applymovement 4, SlateportCity_Harbor_Movement_20CAE0 applymovement 4, SlateportCity_Harbor_Movement_20CAE0
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
waitmovement 0 waitmovement 0
return return
SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
applymovement 4, SlateportCity_Harbor_Movement_20CAE6 applymovement 4, SlateportCity_Harbor_Movement_20CAE6
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
applymovement 4, SlateportCity_Harbor_Movement_20CAEB applymovement 4, SlateportCity_Harbor_Movement_20CAEB
waitmovement 0 waitmovement 0
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
return return
@@ -226,7 +226,7 @@ SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9 SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT
closemessage closemessage
applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceUp applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+2 -2
View File
@@ -7,14 +7,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AD96:: @ 820AD96
SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F SlateportCity_OceanicMuseum_1F_EventScript_20AD9F:: @ 820AD9F
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
end end
SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0 SlateportCity_OceanicMuseum_1F_EventScript_20ADB0:: @ 820ADB0
lockall lockall
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1 goto SlateportCity_OceanicMuseum_1F_EventScript_20ADC1
end end
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+5 -5
View File
@@ -43,8 +43,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66 trainerbattle_no_intro TRAINER_GRUNT_15, SlateportCity_OceanicMuseum_2F_Text_20BF66
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCEF
waitmovement 0 waitmovement 0
applymovement 3, Common_Movement_WalkInPlaceDown applymovement 3, Common_Movement_WalkInPlaceFastestDown
applymovement 4, Common_Movement_WalkInPlaceUp applymovement 4, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BF7A, MSGBOX_DEFAULT
closemessage closemessage
@@ -68,7 +68,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
fadescreen 0 fadescreen 0
delay 30 delay 30
setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS setflag FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceRight applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20C2BE, MSGBOX_DEFAULT
setvar VAR_0x8004, ITEM_DEVON_GOODS setvar VAR_0x8004, ITEM_DEVON_GOODS
@@ -96,12 +96,12 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BC8C:: @ 820BC8C
return return
SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92 SlateportCity_OceanicMuseum_2F_EventScript_20BC92:: @ 820BC92
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceLeft applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D SlateportCity_OceanicMuseum_2F_EventScript_20BC9D:: @ 820BC9D
applymovement 1, Common_Movement_WalkInPlaceLeft applymovement 1, Common_Movement_WalkInPlaceFastestLeft
waitmovement 0 waitmovement 0
return return
data/maps/SlateportCity_PokemonFanClub/map.json
+1 -1
View File
@@ -128,7 +128,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SlateportCity_PokemonFanClub_EventScript_2C7F16", "script": "SlateportCity_PokemonFanClub_EventScript_SwaggerTutor",
"flag": "0" "flag": "0"
} }
], ],
data/maps/SootopolisCity/scripts.inc
+4 -4
View File
@@ -219,8 +219,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special Script_DoRayquazaScene special Script_DoRayquazaScene
waitstate waitstate
applymovement 10, Common_Movement_WalkInPlaceLeft applymovement 10, Common_Movement_WalkInPlaceFastestLeft
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 60 delay 60
waitse waitse
@@ -319,8 +319,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
special Script_DoRayquazaScene special Script_DoRayquazaScene
waitstate waitstate
applymovement 10, Common_Movement_WalkInPlaceLeft applymovement 10, Common_Movement_WalkInPlaceFastestLeft
applymovement 9, Common_Movement_WalkInPlaceRight applymovement 9, Common_Movement_WalkInPlaceFastestRight
waitmovement 0 waitmovement 0
delay 60 delay 60
waitse waitse
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+1 -1
View File
@@ -37,7 +37,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21 applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
waitmovement 0 waitmovement 0
copyobjectxytoperm 1 copyobjectxytoperm 1
applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceUp applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
waitmovement 0 waitmovement 0
compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1 compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
data/maps/SootopolisCity_PokemonCenter_1F/map.json
+1 -1
View File
@@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "SootopolisCity_PokemonCenter_1F_EventScript_2C8256", "script": "SootopolisCity_PokemonCenter_1F_EventScript_DoubleEdgeTutor",
"flag": "0" "flag": "0"
} }
], ],

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