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

Use VAR_FACING constants

Browse Source
This commit is contained in:
GriffinR
2019-10-07 00:14:10 -04:00
committed by huderlem
parent 4494b5d4cb
commit 7ba11b7a1b
38 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+2 -2
View File
@@ -1314,9 +1314,9 @@ BirthIsland_Harbor_EventScript_272250:: @ 8272250
FarawayIsland_Entrance_EventScript_272250:: @ 8272250 FarawayIsland_Entrance_EventScript_272250:: @ 8272250
NavelRock_Harbor_EventScript_272250:: @ 8272250 NavelRock_Harbor_EventScript_272250:: @ 8272250
SouthernIsland_Exterior_EventScript_272250:: @ 8272250 SouthernIsland_Exterior_EventScript_272250:: @ 8272250
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_242A21 call_if_eq BattleFrontier_OutsideWest_EventScript_242A21
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C call_if_eq BattleFrontier_OutsideWest_EventScript_242A2C
delay 30 delay 30
hideobjectat 255, MAP_PETALBURG_CITY hideobjectat 255, MAP_PETALBURG_CITY
data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc
+2 -2
View File
@@ -190,9 +190,9 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36
waitmessage waitmessage
waitbuttonpress waitbuttonpress
closemessage closemessage
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4 call_if_ne BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FD4
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER
data/maps/BattleFrontier_OutsideWest/scripts.inc
+8 -8
View File
@@ -144,13 +144,13 @@ BattleFrontier_OutsideWest_EventScript_23D57F:: @ 823D57F
lock lock
faceplayer faceplayer
delay 20 delay 20
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5 call_if_eq BattleFrontier_OutsideWest_EventScript_23D5C5
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA call_if_eq BattleFrontier_OutsideWest_EventScript_23D5BA
msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT msgbox BattleFrontier_OutsideWest_Text_23DC36, MSGBOX_DEFAULT
release release
@@ -169,13 +169,13 @@ BattleFrontier_OutsideWest_EventScript_23D5C6:: @ 823D5C6
faceplayer faceplayer
message BattleFrontier_OutsideWest_Text_23DCB0 message BattleFrontier_OutsideWest_Text_23DCB0
waitmessage waitmessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD call_if_eq BattleFrontier_OutsideWest_EventScript_23D5FD
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_OutsideWest_EventScript_23D608 call_if_eq BattleFrontier_OutsideWest_EventScript_23D608
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D613 call_if_eq BattleFrontier_OutsideWest_EventScript_23D613
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E call_if_eq BattleFrontier_OutsideWest_EventScript_23D61E
waitbuttonpress waitbuttonpress
release release
data/maps/BattleFrontier_ScottsHouse/scripts.inc
+4 -4
View File
@@ -172,13 +172,13 @@ BattleFrontier_ScottsHouse_EventScript_263943:: @ 8263943
msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263A3F, MSGBOX_DEFAULT
closemessage closemessage
delay 30 delay 30
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A13
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E call_if_eq BattleFrontier_ScottsHouse_EventScript_263A1E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A29
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34 call_if_eq BattleFrontier_ScottsHouse_EventScript_263A34
msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT msgbox BattleFrontier_ScottsHouse_Text_263B29, MSGBOX_DEFAULT
applymovement 1, Common_Movement_FacePlayer applymovement 1, Common_Movement_FacePlayer
data/maps/DewfordTown_Hall/scripts.inc
+4 -4
View File
@@ -198,7 +198,7 @@ DewfordTown_Hall_EventScript_1FD73A:: @ 81FD73A
end end
DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B DewfordTown_Hall_EventScript_1FD75B:: @ 81FD75B
compare VAR_FACING, 4 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_WalkInPlaceRight
waitmovement 0 waitmovement 0
@@ -217,9 +217,9 @@ DewfordTown_Hall_EventScript_1FD772:: @ 81FD772
end end
DewfordTown_Hall_EventScript_1FD793:: @ 81FD793 DewfordTown_Hall_EventScript_1FD793:: @ 81FD793
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq DewfordTown_Hall_EventScript_1FD7AA call_if_eq DewfordTown_Hall_EventScript_1FD7AA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq DewfordTown_Hall_EventScript_1FD7B5 call_if_eq DewfordTown_Hall_EventScript_1FD7B5
return return
@@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_1FD7B5:: @ 81FD7B5
return return
DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0
compare VAR_FACING, 3 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_WalkInPlaceLeft
waitmovement 0 waitmovement 0
data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -34,11 +34,11 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79
faceplayer faceplayer
msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT msgbox EverGrandeCity_PokemonCenter_1F_Text_229BF1, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AB6
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_MET_SCOTT_IN_EVERGRANDE
data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+2 -2
View File
@@ -30,8 +30,8 @@ FallarborTown_PokemonCenter_1F_EventScript_200C01:: @ 8200C01
msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT msgbox FallarborTown_PokemonCenter_1F_Text_200C6B, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, FallarborTown_PokemonCenter_1F_EventScript_200C28 case DIR_NORTH, FallarborTown_PokemonCenter_1F_EventScript_200C28
case 3, FallarborTown_PokemonCenter_1F_EventScript_200C38 case DIR_WEST, FallarborTown_PokemonCenter_1F_EventScript_200C38
end end
FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28 FallarborTown_PokemonCenter_1F_EventScript_200C28:: @ 8200C28
data/maps/FarawayIsland_Interior/scripts.inc
+4 -4
View File
@@ -125,13 +125,13 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2
message FarawayIsland_Interior_Text_Mew message FarawayIsland_Interior_Text_Mew
waitse waitse
playmoncry SPECIES_MEW, 2 playmoncry SPECIES_MEW, 2
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq FarawayIsland_Interior_EventScript_267EAF call_if_eq FarawayIsland_Interior_EventScript_267EAF
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq FarawayIsland_Interior_EventScript_267EBA call_if_eq FarawayIsland_Interior_EventScript_267EBA
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq FarawayIsland_Interior_EventScript_267EC5 call_if_eq FarawayIsland_Interior_EventScript_267EC5
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq FarawayIsland_Interior_EventScript_267ED0 call_if_eq FarawayIsland_Interior_EventScript_267ED0
special sub_81D4BEC special sub_81D4BEC
delay 40 delay 40
data/maps/GraniteCave_StevensRoom/scripts.inc
+4 -4
View File
@@ -23,13 +23,13 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B
setflag FLAG_REGISTERED_STEVEN_POKENAV setflag FLAG_REGISTERED_STEVEN_POKENAV
msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D call_if_eq GraniteCave_StevensRoom_EventScript_22DD0D
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A call_if_eq GraniteCave_StevensRoom_EventScript_22DD2A
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq GraniteCave_StevensRoom_EventScript_22DD18 call_if_eq GraniteCave_StevensRoom_EventScript_22DD18
playse SE_KAIDAN playse SE_KAIDAN
removeobject 1 removeobject 1
data/maps/LilycoveCity_LilycoveMuseum_1F/scripts.inc
+3 -3
View File
@@ -40,9 +40,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D1E:: @ 8218D1E
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
switch VAR_FACING switch VAR_FACING
case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A case DIR_NORTH, LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A
case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F case DIR_WEST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D6F
case 4, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84 case DIR_EAST, LilycoveCity_LilycoveMuseum_1F_EventScript_218D84
end end
LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A LilycoveCity_LilycoveMuseum_1F_EventScript_218D5A:: @ 8218D5A
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
+4 -4
View File
@@ -73,13 +73,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8497:: @ 81F8497
waitmovement 0 waitmovement 0
delay 10 delay 10
playbgm MUS_BOY_SUP, 1 playbgm MUS_BOY_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8507
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8536
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8565
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F8594
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
+4 -4
View File
@@ -74,13 +74,13 @@ LittlerootTown_MaysHouse_2F_EventScript_1F934A:: @ 81F934A
waitmovement 0 waitmovement 0
delay 10 delay 10
playbgm MUS_GIRL_SUP, 1 playbgm MUS_GIRL_SUP, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93BA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F93E9
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9418
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440 call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1F9440
setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_RIVAL_STATE, 3
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
data/maps/MauvilleCity/scripts.inc
+6 -6
View File
@@ -109,8 +109,8 @@ MauvilleCity_EventScript_1DF4AD:: @ 81DF4AD
goto_if_eq MauvilleCity_EventScript_1DF683 goto_if_eq MauvilleCity_EventScript_1DF683
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, MauvilleCity_EventScript_1DF4E0 case DIR_NORTH, MauvilleCity_EventScript_1DF4E0
case 4, MauvilleCity_EventScript_1DF53D case DIR_EAST, MauvilleCity_EventScript_1DF53D
end end
MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0 MauvilleCity_EventScript_1DF4E0:: @ 81DF4E0
@@ -160,18 +160,18 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593
setflag FLAG_DEFEATED_WALLY_MAUVILLE setflag FLAG_DEFEATED_WALLY_MAUVILLE
setvar VAR_WALLY_CALL_STEP_COUNTER, 0 setvar VAR_WALLY_CALL_STEP_COUNTER, 0
setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF5F3 call_if_eq MauvilleCity_EventScript_1DF5F3
compare VAR_FACING, 4 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_WalkInPlaceDown
waitmovement 0 waitmovement 0
msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT msgbox MauvilleCity_Text_1DFED5, MSGBOX_DEFAULT
closemessage closemessage
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MauvilleCity_EventScript_1DF616 call_if_eq MauvilleCity_EventScript_1DF616
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MauvilleCity_EventScript_1DF628 call_if_eq MauvilleCity_EventScript_1DF628
removeobject 11 removeobject 11
releaseall releaseall
data/maps/MossdeepCity/scripts.inc
+2 -2
View File
@@ -255,9 +255,9 @@ MossdeepCity_EventScript_1E4C85:: @ 81E4C85
faceplayer faceplayer
msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MossdeepCity_EventScript_1E4CB0 call_if_eq MossdeepCity_EventScript_1E4CB0
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MossdeepCity_EventScript_1E4CC2 call_if_eq MossdeepCity_EventScript_1E4CC2
addvar VAR_SCOTT_STATE, 1 addvar VAR_SCOTT_STATE, 1
removeobject 16 removeobject 16
data/maps/MossdeepCity_House2/scripts.inc
+2 -2
View File
@@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
closemessage closemessage
setflag FLAG_WINGULL_DELIVERED_MAIL setflag FLAG_WINGULL_DELIVERED_MAIL
clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MossdeepCity_House2_EventScript_222124 call_if_eq MossdeepCity_House2_EventScript_222124
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq MossdeepCity_House2_EventScript_22212F call_if_eq MossdeepCity_House2_EventScript_22212F
removeobject 3 removeobject 3
release release
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+2 -2
View File
@@ -238,8 +238,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F
setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F
copyobjectxytoperm 9 copyobjectxytoperm 9
switch VAR_FACING switch VAR_FACING
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223278
case 3, MossdeepCity_SpaceCenter_1F_EventScript_223289 case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_223289
applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2 applymovement 9, MossdeepCity_SpaceCenter_1F_Movement_2232A2
waitmovement 0 waitmovement 0
setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2 setvar VAR_MOSSDEEP_SPACE_CENTER_STATE_1, 2
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
+3 -3
View File
@@ -194,7 +194,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A
delay 30 delay 30
playse SE_KOUKA_L playse SE_KOUKA_L
switch VAR_FACING switch VAR_FACING
case 1, MossdeepCity_SpaceCenter_2F_EventScript_223FBA case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_223FBA
applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6 applymovement 4, MossdeepCity_SpaceCenter_2F_Movement_223FC6
waitmovement 0 waitmovement 0
releaseall releaseall
@@ -326,8 +326,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131 MossdeepCity_SpaceCenter_2F_EventScript_224131:: @ 8224131
switch VAR_FACING switch VAR_FACING
case 1, MossdeepCity_SpaceCenter_2F_EventScript_22414D case DIR_SOUTH, MossdeepCity_SpaceCenter_2F_EventScript_22414D
case 3, MossdeepCity_SpaceCenter_2F_EventScript_224152 case DIR_WEST, MossdeepCity_SpaceCenter_2F_EventScript_224152
return return
MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D MossdeepCity_SpaceCenter_2F_EventScript_22414D:: @ 822414D
data/maps/MtChimney/scripts.inc
+4 -4
View File
@@ -56,17 +56,17 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B
fadescreen 0 fadescreen 0
setobjectxyperm 1, 10, 12 setobjectxyperm 1, 10, 12
addobject 1 addobject 1
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MtChimney_EventScript_22EEC7 call_if_eq MtChimney_EventScript_22EEC7
compare VAR_FACING, 2 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_WalkInPlaceLeft
waitmovement 0 waitmovement 0
msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT msgbox MtChimney_Text_22FC3D, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq MtChimney_EventScript_22EEDD call_if_eq MtChimney_EventScript_22EEDD
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq MtChimney_EventScript_22EEE8 call_if_eq MtChimney_EventScript_22EEE8
removeobject 1 removeobject 1
setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA
data/maps/OldaleTown/scripts.inc
+4 -4
View File
@@ -42,9 +42,9 @@ OldaleTown_EventScript_1E8EFC:: @ 81E8EFC
msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT msgbox OldaleTown_Text_1E91C0, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, OldaleTown_EventScript_1E8F47 case DIR_SOUTH, OldaleTown_EventScript_1E8F47
case 2, OldaleTown_EventScript_1E8F5E case DIR_NORTH, OldaleTown_EventScript_1E8F5E
case 4, OldaleTown_EventScript_1E8F75 case DIR_EAST, OldaleTown_EventScript_1E8F75
end end
OldaleTown_EventScript_1E8F47:: @ 81E8F47 OldaleTown_EventScript_1E8F47:: @ 81E8F47
@@ -286,7 +286,7 @@ OldaleTown_EventScript_1E911A:: @ 81E911A
end end
OldaleTown_EventScript_1E9148:: @ 81E9148 OldaleTown_EventScript_1E9148:: @ 81E9148
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
goto_if_ne OldaleTown_EventScript_1E915E goto_if_ne OldaleTown_EventScript_1E915E
applymovement 4, OldaleTown_Movement_1E9177 applymovement 4, OldaleTown_Movement_1E9177
waitmovement 0 waitmovement 0
data/maps/PetalburgCity_Gym/scripts.inc
+7 -7
View File
@@ -125,10 +125,10 @@ PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1
msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT msgbox PetalburgCity_Gym_Text_2057A2, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, PetalburgCity_Gym_EventScript_204A80 case DIR_SOUTH, PetalburgCity_Gym_EventScript_204A80
case 2, PetalburgCity_Gym_EventScript_204A8B case DIR_NORTH, PetalburgCity_Gym_EventScript_204A8B
case 3, PetalburgCity_Gym_EventScript_204A96 case DIR_WEST, PetalburgCity_Gym_EventScript_204A96
case 4, PetalburgCity_Gym_EventScript_204AA1 case DIR_EAST, PetalburgCity_Gym_EventScript_204AA1
end end
PetalburgCity_Gym_EventScript_204A80:: @ 8204A80 PetalburgCity_Gym_EventScript_204A80:: @ 8204A80
@@ -436,9 +436,9 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B
delay 10 delay 10
addobject 11 addobject 11
switch VAR_FACING switch VAR_FACING
case 2, PetalburgCity_Gym_EventScript_204EF5 case DIR_NORTH, PetalburgCity_Gym_EventScript_204EF5
case 3, PetalburgCity_Gym_EventScript_204F09 case DIR_WEST, PetalburgCity_Gym_EventScript_204F09
case 4, PetalburgCity_Gym_EventScript_204EFF case DIR_EAST, PetalburgCity_Gym_EventScript_204EFF
end end
PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2
data/maps/Route103/scripts.inc
+4 -4
View File
@@ -103,10 +103,10 @@ Route103_EventScript_1EC4FC:: @ 81EC4FC
Route103_EventScript_1EC50A:: @ 81EC50A Route103_EventScript_1EC50A:: @ 81EC50A
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 1, Route103_EventScript_1EC585 case DIR_SOUTH, Route103_EventScript_1EC585
case 2, Route103_EventScript_1EC53D case DIR_NORTH, Route103_EventScript_1EC53D
case 3, Route103_EventScript_1EC561 case DIR_WEST, Route103_EventScript_1EC561
case 4, Route103_EventScript_1EC561 case DIR_EAST, Route103_EventScript_1EC561
end end
Route103_EventScript_1EC53D:: @ 81EC53D Route103_EventScript_1EC53D:: @ 81EC53D
data/maps/Route109/scripts.inc
+3 -3
View File
@@ -9,9 +9,9 @@ Route109_EventScript_1EE760:: @ 81EE760
waitmovement 0 waitmovement 0
removeobject 2 removeobject 2
switch VAR_FACING switch VAR_FACING
case 1, Route109_EventScript_1EE7A5 case DIR_SOUTH, Route109_EventScript_1EE7A5
case 3, Route109_EventScript_1EE7C5 case DIR_WEST, Route109_EventScript_1EE7C5
case 4, Route109_EventScript_1EE7B5 case DIR_EAST, Route109_EventScript_1EE7B5
end end
Route109_EventScript_1EE7A5:: @ 81EE7A5 Route109_EventScript_1EE7A5:: @ 81EE7A5
data/maps/Route110_TrickHouseEnd/scripts.inc
+4 -4
View File
@@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28 Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route110_TrickHouseEnd_EventScript_26B015 call_if_eq Route110_TrickHouseEnd_EventScript_26B015
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route110_TrickHouseEnd_EventScript_26B020 call_if_eq Route110_TrickHouseEnd_EventScript_26B020
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route110_TrickHouseEnd_EventScript_26B02B call_if_eq Route110_TrickHouseEnd_EventScript_26B02B
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route110_TrickHouseEnd_EventScript_26B036 call_if_eq Route110_TrickHouseEnd_EventScript_26B036
delay 30 delay 30
msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
data/maps/Route116/scripts.inc
+8 -8
View File
@@ -63,13 +63,13 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB
goto_if_eq Route116_EventScript_1F2D39 goto_if_eq Route116_EventScript_1F2D39
msgbox Route116_Text_1F3521, MSGBOX_DEFAULT msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2D15 call_if_eq Route116_EventScript_1F2D15
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2D20 call_if_eq Route116_EventScript_1F2D20
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
@@ -196,13 +196,13 @@ Route116_EventScript_1F2E1B:: @ 81F2E1B
Route116_EventScript_1F2E2A:: @ 81F2E2A Route116_EventScript_1F2E2A:: @ 81F2E2A
delay 20 delay 20
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route116_EventScript_1F2E5E call_if_eq Route116_EventScript_1F2E5E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route116_EventScript_1F2E69 call_if_eq Route116_EventScript_1F2E69
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
release release
data/maps/Route120/scripts.inc
+2 -2
View File
@@ -192,9 +192,9 @@ Route120_EventScript_1F5672:: @ 81F5672
Route120_EventScript_1F568B:: @ 81F568B Route120_EventScript_1F568B:: @ 81F568B
msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT msgbox Route120_Text_1F5B0F, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route120_EventScript_1F57A3 call_if_eq Route120_EventScript_1F57A3
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route120_EventScript_1F57AE call_if_eq Route120_EventScript_1F57AE
applymovement 31, Common_Movement_WalkInPlaceLeft applymovement 31, Common_Movement_WalkInPlaceLeft
waitmovement 0 waitmovement 0
data/maps/RustboroCity_PokemonSchool/scripts.inc
+2 -2
View File
@@ -78,9 +78,9 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95
lock lock
faceplayer faceplayer
goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0 call_if_eq RustboroCity_PokemonSchool_EventScript_213FF0
msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT msgbox RustboroCity_PokemonSchool_Text_214433, MSGBOX_DEFAULT
giveitem_std ITEM_QUICK_CLAW giveitem_std ITEM_QUICK_CLAW
data/maps/SafariZone_South/scripts.inc
+2 -2
View File
@@ -69,8 +69,8 @@ SafariZone_South_EventScript_23D31A:: @ 823D31A
msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT msgbox SafariZone_South_Text_2A5248, MSGBOX_DEFAULT
closemessage closemessage
switch VAR_FACING switch VAR_FACING
case 2, SafariZone_South_EventScript_23D33F case DIR_NORTH, SafariZone_South_EventScript_23D33F
case 4, SafariZone_South_EventScript_23D359 case DIR_EAST, SafariZone_South_EventScript_23D359
end end
SafariZone_South_EventScript_23D33F:: @ 823D33F SafariZone_South_EventScript_23D33F:: @ 823D33F
data/maps/SeafloorCavern_Entrance/scripts.inc
+6 -6
View File
@@ -18,11 +18,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
applymovement 1, Common_Movement_Delay48 applymovement 1, Common_Movement_Delay48
waitmovement 0 waitmovement 0
delay 20 delay 20
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523 call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SeafloorCavern_Entrance_EventScript_234539 call_if_eq SeafloorCavern_Entrance_EventScript_234539
delay 30 delay 30
setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1 setvar VAR_HAS_TALKED_TO_SEAFLOOR_CAVERN_ENTRANCE_GRUNT, 1
@@ -35,11 +35,11 @@ SeafloorCavern_Entrance_EventScript_234485:: @ 8234485
end end
SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED SeafloorCavern_Entrance_EventScript_2344ED:: @ 82344ED
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SeafloorCavern_Entrance_EventScript_23452E call_if_eq SeafloorCavern_Entrance_EventScript_23452E
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SeafloorCavern_Entrance_EventScript_234523 call_if_eq SeafloorCavern_Entrance_EventScript_234523
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
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
data/maps/SlateportCity_Harbor/scripts.inc
+2 -2
View File
@@ -230,9 +230,9 @@ SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
waitmovement 0 waitmovement 0
delay 30 delay 30
hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SlateportCity_Harbor_EventScript_20CC42 call_if_eq SlateportCity_Harbor_EventScript_20CC42
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_Harbor_EventScript_20CC37 call_if_eq SlateportCity_Harbor_EventScript_20CC37
delay 30 delay 30
hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+4 -4
View File
@@ -165,13 +165,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8
setflag FLAG_RECEIVED_TM46 setflag FLAG_RECEIVED_TM46
msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF6C
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF83
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AF93
end end
data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc
+5 -5
View File
@@ -16,21 +16,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00
applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_20BCE8
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCF5
waitmovement 0 waitmovement 0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC92
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE40, MSGBOX_DEFAULT
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_20BC9D
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE69, MSGBOX_DEFAULT
msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BE93, MSGBOX_DEFAULT
closemessage closemessage
applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_20BCE2
waitmovement 0 waitmovement 0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCA8
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BCB3
trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2 trainerbattle_no_intro TRAINER_GRUNT_14, SlateportCity_OceanicMuseum_2F_Text_20BEE2
msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT msgbox SlateportCity_OceanicMuseum_2F_Text_20BEFA, MSGBOX_DEFAULT
data/maps/SootopolisCity/scripts.inc
+5 -5
View File
@@ -959,9 +959,9 @@ SootopolisCity_EventScript_1E61C2:: @ 81E61C2
SootopolisCity_EventScript_1E61CC:: @ 81E61CC SootopolisCity_EventScript_1E61CC:: @ 81E61CC
msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_1E6243 call_if_eq SootopolisCity_EventScript_1E6243
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_1E6255 call_if_eq SootopolisCity_EventScript_1E6255
msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT
closemessage closemessage
@@ -1354,11 +1354,11 @@ SootopolisCity_EventScript_1E646F:: @ 81E646F
setflag FLAG_RECEIVED_HM07 setflag FLAG_RECEIVED_HM07
msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_1E64B2 call_if_eq SootopolisCity_EventScript_1E64B2
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SootopolisCity_EventScript_1E64B2 call_if_eq SootopolisCity_EventScript_1E64B2
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_1E64C5 call_if_eq SootopolisCity_EventScript_1E64C5
release release
end end
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+3 -3
View File
@@ -109,11 +109,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
special ReducePlayerPartyToSelectedMons special ReducePlayerPartyToSelectedMons
msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22 call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1 warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
waitstate waitstate
data/scripts/apprentice.inc
+7 -7
View File
@@ -74,7 +74,7 @@ Script_Apprentice_FirstMeetingNag:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -117,7 +117,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B69D3:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -163,7 +163,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6B09:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -187,7 +187,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6BD4:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -235,7 +235,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6C77:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -261,7 +261,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6D5C:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
@@ -283,7 +283,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4:
release release
releaseall releaseall
switch VAR_FACING switch VAR_FACING
case 2, Script_Apprentice_LeaveGoRight case DIR_NORTH, Script_Apprentice_LeaveGoRight
goto Script_Apprentice_Leave goto Script_Apprentice_Leave
end end
data/scripts/gabby_and_ty.inc
+6 -6
View File
@@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36
Route111_EventScript_28CF56:: @ 828CF56 Route111_EventScript_28CF56:: @ 828CF56
special GabbyAndTyBeforeInterview special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_28CF94 call_if_eq Route111_EventScript_28CF94
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route111_EventScript_28CF9F call_if_eq Route111_EventScript_28CF9F
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_28CFB1 call_if_eq Route111_EventScript_28CFB1
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
msgbox Route111_Text_28B042, MSGBOX_YESNO msgbox Route111_Text_28B042, MSGBOX_YESNO
@@ -247,11 +247,11 @@ Route118_EventScript_28CFC3:: @ 828CFC3
Route120_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3
special GabbyAndTyBeforeInterview special GabbyAndTyBeforeInterview
special GabbyAndTySetScriptVarsToEventObjectLocalIds special GabbyAndTySetScriptVarsToEventObjectLocalIds
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_28CF94 call_if_eq Route111_EventScript_28CF94
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if_eq Route111_EventScript_28CF9F call_if_eq Route111_EventScript_28CF9F
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_28CFB1 call_if_eq Route111_EventScript_28CFB1
goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
specialvar VAR_RESULT, GabbyAndTyGetLastQuote specialvar VAR_RESULT, GabbyAndTyGetLastQuote
data/scripts/secret_power_tm.inc
+3 -3
View File
@@ -51,11 +51,11 @@ Route111_EventScript_27661E:: @ 827661E
closemessage closemessage
setflag FLAG_RECEIVED_SECRET_POWER setflag FLAG_RECEIVED_SECRET_POWER
clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if_eq Route111_EventScript_27666A call_if_eq Route111_EventScript_27666A
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if_eq Route111_EventScript_27666A call_if_eq Route111_EventScript_27666A
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if_eq Route111_EventScript_276675 call_if_eq Route111_EventScript_276675
removeobject VAR_LAST_TALKED removeobject VAR_LAST_TALKED
release release
src/overworld.c
+1 -1
View File
@@ -2742,7 +2742,7 @@ static bool32 PlayerIsAtSouthExit(struct TradeRoomPlayer *player)
return FALSE; return FALSE;
else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C)) else if (!MetatileBehavior_IsSouthArrowWarp(player->field_C))
return FALSE; return FALSE;
else if (player->facing != 1) else if (player->facing != DIR_SOUTH)
return FALSE; return FALSE;
else else
return TRUE; return TRUE;