dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use dir constants

Browse Source
This commit is contained in:
GriffinR
2020-01-09 13:25:10 -05:00
parent c39d295386
commit a40c63fe48
28 changed files with 128 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/CeladonCity_GameCorner/scripts.inc
+2 -2
View File
@@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5
EventScript_16CB10:: @ 816CB10 EventScript_16CB10:: @ 816CB10
msgbox gUnknown_8196E9B msgbox gUnknown_8196E9B
closemessage closemessage
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16CB34 call_if eq, EventScript_16CB34
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if ne, EventScript_16CB3F call_if ne, EventScript_16CB3F
removeobject 11 removeobject 11
release release
data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A
setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_SPECIAL_FLAG_0x4001
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
delay 20 delay 20
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16E96F call_if eq, EventScript_16E96F
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16E981 call_if eq, EventScript_16E981
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16E993 call_if eq, EventScript_16E993
removeobject 7 removeobject 7
setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1
data/maps/FiveIsland_ResortGorgeous/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF
.2byte 0 .2byte 0
EventScript_1687F9:: @ 81687F9 EventScript_1687F9:: @ 81687F9
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE
data/maps/FiveIsland_ResortGorgeous_House/scripts.inc
+4 -4
View File
@@ -52,13 +52,13 @@ EventScript_171F34:: @ 8171F34
textcolor 0 textcolor 0
msgbox gUnknown_81A4566 msgbox gUnknown_81A4566
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_171FCD call_if eq, EventScript_171FCD
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_171FE9 call_if eq, EventScript_171FE9
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_171FFE call_if eq, EventScript_171FFE
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_17201A call_if eq, EventScript_17201A
moveobjectoffscreen 2 moveobjectoffscreen 2
msgbox gUnknown_81A458E msgbox gUnknown_81A458E
data/maps/FiveIsland_RocketWarehouse/scripts.inc
+1 -1
View File
@@ -112,7 +112,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087
EventScript_1640A2:: @ 81640A2 EventScript_1640A2:: @ 81640A2
getplayerxy VAR_0x8004, VAR_0x8005 getplayerxy VAR_0x8004, VAR_0x8005
specialvar VAR_RESULT, GetPlayerFacingDirection specialvar VAR_RESULT, GetPlayerFacingDirection
compare VAR_RESULT, 2 compare VAR_RESULT, DIR_NORTH
call_if eq, EventScript_16412E call_if eq, EventScript_16412E
msgbox gUnknown_817B7AE msgbox gUnknown_817B7AE
closemessage closemessage
data/maps/OneIsland_Harbor/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: @ 8171383
.2byte 0 .2byte 0
EventScript_17138D:: @ 817138D EventScript_17138D:: @ 817138D
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
OneIsland_Harbor_OnFrame:: @ 8171392 OneIsland_Harbor_OnFrame:: @ 8171392
data/maps/PalletTown/scripts.inc
+2 -2
View File
@@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C
waitmovement 0 waitmovement 0
msgbox gUnknown_81B1C9F msgbox gUnknown_81B1C9F
closemessage closemessage
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1657D7 call_if eq, EventScript_1657D7
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if ne, EventScript_1657E2 call_if ne, EventScript_1657E2
moveobjectoffscreen 1 moveobjectoffscreen 1
setflag FLAG_TEMP_2 setflag FLAG_TEMP_2
data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A
PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
lockall lockall
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
goto_if eq, EventScript_168C78 goto_if eq, EventScript_168C78
msgbox gUnknown_818D4F9 msgbox gUnknown_818D4F9
releaseall releaseall
data/maps/PalletTown_PlayersHouse_2F/scripts.inc
+1 -1
View File
@@ -17,7 +17,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE
.2byte 0 .2byte 0
EventScript_168CC8:: @ 8168CC8 EventScript_168CC8:: @ 8168CC8
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1 setvar VAR_MAP_SCENE_PALLET_TOWN_PLAYERS_HOUSE_2F, 1
end end
data/maps/PalletTown_ProfessorOaksLab/scripts.inc
+48 -48
View File
@@ -40,7 +40,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1
.2byte 0 .2byte 0
EventScript_168FEB:: @ 8168FEB EventScript_168FEB:: @ 8168FEB
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0
@@ -50,7 +50,7 @@ PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0
EventScript_169002:: @ 8169002 EventScript_169002:: @ 8169002
lockall lockall
setvar VAR_FACING, 2 setvar VAR_FACING, DIR_NORTH
textcolor 0 textcolor 0
applymovement 4, Movement_1692B0 applymovement 4, Movement_1692B0
waitmovement 0 waitmovement 0
@@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002
EventScript_169035:: @ 8169035 EventScript_169035:: @ 8169035
msgbox gUnknown_818EE60 msgbox gUnknown_818EE60
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169174 call_if eq, EventScript_169174
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1691BB call_if eq, EventScript_1691BB
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169194 call_if eq, EventScript_169194
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169194 call_if eq, EventScript_169194
msgbox gUnknown_818EF59 msgbox gUnknown_818EF59
fadedefaultbgm fadedefaultbgm
msgbox gUnknown_818F004 msgbox gUnknown_818F004
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1691DB call_if eq, EventScript_1691DB
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1691E6 call_if eq, EventScript_1691E6
textcolor 3 textcolor 3
msgbox gUnknown_818F062 msgbox gUnknown_818F062
closemessage closemessage
call EventScript_1A6675 call EventScript_1A6675
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1691F1 call_if eq, EventScript_1691F1
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1691FC call_if eq, EventScript_1691FC
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169215 call_if eq, EventScript_169215
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169227 call_if eq, EventScript_169227
addobject 9 addobject 9
addobject 10 addobject 10
@@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035
removeobject 9 removeobject 9
removeobject 10 removeobject 10
delay 30 delay 30
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169845 call_if eq, EventScript_169845
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169850 call_if eq, EventScript_169850
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16985B call_if eq, EventScript_16985B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16986D call_if eq, EventScript_16986D
textcolor 3 textcolor 3
playfanfare MUS_FAN5 playfanfare MUS_FAN5
@@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035
msgbox gUnknown_818F1DB msgbox gUnknown_818F1DB
closemessage closemessage
playbgm MUS_RIVAL2, 0 playbgm MUS_RIVAL2, 0
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B69 call_if eq, EventScript_169B69
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
removeobject 8 removeobject 8
fadedefaultbgm fadedefaultbgm
@@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E
playbgm MUS_RIVAL1, 0 playbgm MUS_RIVAL1, 0
msgbox gUnknown_818DE8D msgbox gUnknown_818DE8D
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169A82 call_if eq, EventScript_169A82
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169AC1 call_if eq, EventScript_169AC1
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169A9E call_if eq, EventScript_169A9E
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169A9E call_if eq, EventScript_169A9E
fadedefaultbgm fadedefaultbgm
msgbox gUnknown_818DE99 msgbox gUnknown_818DE99
@@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E
waitmovement 0 waitmovement 0
applymovement 4, Movement_Delay48 applymovement 4, Movement_Delay48
waitmovement 0 waitmovement 0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169ADD call_if eq, EventScript_169ADD
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B14 call_if eq, EventScript_169B14
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169AF5 call_if eq, EventScript_169AF5
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B86 call_if eq, EventScript_169B86
msgbox gUnknown_818E508 msgbox gUnknown_818E508
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169882 call_if eq, EventScript_169882
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16988D call_if eq, EventScript_16988D
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1698A6 call_if eq, EventScript_1698A6
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1698B8 call_if eq, EventScript_1698B8
msgbox gUnknown_818E536 msgbox gUnknown_818E536
closemessage closemessage
@@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E
delay 10 delay 10
removeobject 10 removeobject 10
delay 25 delay 25
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169845 call_if eq, EventScript_169845
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169850 call_if eq, EventScript_169850
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16985B call_if eq, EventScript_16985B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16986D call_if eq, EventScript_16986D
delay 10 delay 10
textcolor 3 textcolor 3
@@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E
famechecker FAMECHECKER_OAK, 1 famechecker FAMECHECKER_OAK, 1
msgbox gUnknown_818E784 msgbox gUnknown_818E784
msgbox gUnknown_818DEC8 msgbox gUnknown_818DEC8
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B33 call_if eq, EventScript_169B33
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B45 call_if eq, EventScript_169B45
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B57 call_if eq, EventScript_169B57
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B57 call_if eq, EventScript_169B57
msgbox gUnknown_818DEF3 msgbox gUnknown_818DEF3
closemessage closemessage
playbgm MUS_RIVAL2, 0 playbgm MUS_RIVAL2, 0
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169B69 call_if eq, EventScript_169B69
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169B7B call_if eq, EventScript_169B7B
removeobject 8 removeobject 8
fadedefaultbgm fadedefaultbgm
@@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913
delay 40 delay 40
message Text_1A7291 message Text_1A7291
waitmessage waitmessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_169964 call_if eq, EventScript_169964
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16996F call_if eq, EventScript_16996F
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16997A call_if eq, EventScript_16997A
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_169985 call_if eq, EventScript_169985
applymovement 4, Movement_FacePlayer applymovement 4, Movement_FacePlayer
waitmovement 0 waitmovement 0
data/maps/PewterCity/scripts.inc
+5 -5
View File
@@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D
msgbox gUnknown_817E67E msgbox gUnknown_817E67E
closemessage closemessage
playbgm MUS_ANNAI, 0 playbgm MUS_ANNAI, 0
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_165BD3 call_if eq, EventScript_165BD3
msgbox gUnknown_817E6C7 msgbox gUnknown_817E6C7
closemessage closemessage
@@ -1038,13 +1038,13 @@ PewterCity_EventScript_16607E:: @ 816607E
closemessage closemessage
delay 10 delay 10
playbgm MUS_ANNAI, 0 playbgm MUS_ANNAI, 0
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1660EE call_if eq, EventScript_1660EE
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_166100 call_if eq, EventScript_166100
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_166112 call_if eq, EventScript_166112
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_166124 call_if eq, EventScript_166124
msgbox gUnknown_817E5AC msgbox gUnknown_817E5AC
closemessage closemessage
data/maps/PewterCity_Museum_1F/scripts.inc
+3 -3
View File
@@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A
PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B
lock lock
faceplayer faceplayer
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
goto_if eq, EventScript_16A348 goto_if eq, EventScript_16A348
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
goto_if eq, EventScript_16A348 goto_if eq, EventScript_16A348
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
goto_if eq, EventScript_16A348 goto_if eq, EventScript_16A348
msgbox gUnknown_8190539 msgbox gUnknown_8190539
release release
data/maps/PokemonLeague_AgathasRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_AgathasRoom_OnWarp:: @ 8162851
.2byte 0 .2byte 0
EventScript_16285B:: @ 816285B EventScript_16285B:: @ 816285B
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 PokemonLeague_AgathasRoom_OnFrame:: @ 8162860
data/maps/PokemonLeague_BrunosRoom/scripts.inc
+9 -9
View File
@@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6
.2byte 0 .2byte 0
EventScript_1626D0:: @ 81626D0 EventScript_1626D0:: @ 81626D0
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5
@@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E
EventScript_162779:: @ 8162779 EventScript_162779:: @ 8162779
msgbox gUnknown_8178420 msgbox gUnknown_8178420
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1627FA call_if eq, EventScript_1627FA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1627EF call_if eq, EventScript_1627EF
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_162805 call_if eq, EventScript_162805
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_162805 call_if eq, EventScript_162805
release release
end end
@@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0
call EventScript_1A7506 call EventScript_1A7506
msgbox gUnknown_8178420 msgbox gUnknown_8178420
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1627FA call_if eq, EventScript_1627FA
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1627EF call_if eq, EventScript_1627EF
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_162805 call_if eq, EventScript_162805
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_162805 call_if eq, EventScript_162805
release release
end end
data/maps/PokemonLeague_ChampionsRoom/scripts.inc
+1 -1
View File
@@ -45,7 +45,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D
.2byte 0 .2byte 0
EventScript_162B67:: @ 8162B67 EventScript_162B67:: @ 8162B67
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C
data/maps/PokemonLeague_HallOfFame/scripts.inc
+1 -1
View File
@@ -8,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: @ 8162D57
.2byte 0 .2byte 0
EventScript_162D61:: @ 8162D61 EventScript_162D61:: @ 8162D61
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 PokemonLeague_HallOfFame_OnFrame:: @ 8162D66
data/maps/PokemonLeague_LancesRoom/scripts.inc
+1 -1
View File
@@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp:: @ 816296E
.2byte 0 .2byte 0
EventScript_162978:: @ 8162978 EventScript_162978:: @ 8162978
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_LancesRoom_OnFrame:: @ 816297D PokemonLeague_LancesRoom_OnFrame:: @ 816297D
data/maps/PokemonLeague_LoreleisRoom/scripts.inc
+1 -1
View File
@@ -35,7 +35,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6
.2byte 0 .2byte 0
EventScript_1625C0:: @ 81625C0 EventScript_1625C0:: @ 81625C0
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5
data/maps/Route25_SeaCottage/scripts.inc
+4 -4
View File
@@ -50,13 +50,13 @@ EventScript_17059C:: @ 817059C
msgbox gUnknown_819FFD3 msgbox gUnknown_819FFD3
closemessage closemessage
delay 10 delay 10
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_17062A call_if eq, EventScript_17062A
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_170635 call_if eq, EventScript_170635
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_170635 call_if eq, EventScript_170635
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_170635 call_if eq, EventScript_170635
opendoor 10, 3 opendoor 10, 3
waitdooranim waitdooranim
data/maps/SeafoamIslands_B4F/scripts.inc
+1 -1
View File
@@ -69,7 +69,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7
.2byte 0 .2byte 0
EventScript_1630F1:: @ 81630F1 EventScript_1630F1:: @ 81630F1
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
special Special_ForcePlayerToStartSurfing special Special_ForcePlayerToStartSurfing
end end
data/maps/SevenIsland_House_Room1/scripts.inc
+3 -3
View File
@@ -108,11 +108,11 @@ EventScript_170987:: @ 8170987
special ReducePlayerPartyToThree special ReducePlayerPartyToThree
msgbox gUnknown_81A07C4 msgbox gUnknown_81A07C4
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_170A2D call_if eq, EventScript_170A2D
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_170A3F call_if eq, EventScript_170A3F
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_170A51 call_if eq, EventScript_170A51
warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1
waitstate waitstate
data/maps/SevenIsland_SevaultCanyon_House/scripts.inc
+1 -1
View File
@@ -20,7 +20,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183
msgbox gUnknown_81A4DD8 msgbox gUnknown_81A4DD8
closemessage closemessage
call EventScript_1A6675 call EventScript_1A6675
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if ne, EventScript_172206 call_if ne, EventScript_172206
delay 30 delay 30
playbgm MUS_P_SCHOOL, 0 playbgm MUS_P_SCHOOL, 0
data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc
+20 -20
View File
@@ -16,13 +16,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
applymovement 2, Movement_16440F applymovement 2, Movement_16440F
waitmovement 0 waitmovement 0
playse SE_W070 playse SE_W070
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_16430F call_if eq, EventScript_16430F
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_16430F call_if eq, EventScript_16430F
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16431A call_if eq, EventScript_16431A
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_16431A call_if eq, EventScript_16431A
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
setvar VAR_0x8005, 0 setvar VAR_0x8005, 0
@@ -30,43 +30,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5
setvar VAR_0x8007, 3 setvar VAR_0x8007, 3
special Special_ShakeScreen special Special_ShakeScreen
delay 60 delay 60
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_164325 call_if eq, EventScript_164325
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_164330 call_if eq, EventScript_164330
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16433B call_if eq, EventScript_16433B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_164346 call_if eq, EventScript_164346
textcolor 0 textcolor 0
msgbox gUnknown_817BD97 msgbox gUnknown_817BD97
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_164351 call_if eq, EventScript_164351
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_164366 call_if eq, EventScript_164366
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_16437B call_if eq, EventScript_16437B
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_164390 call_if eq, EventScript_164390
removeobject 1 removeobject 1
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1642F9 call_if eq, EventScript_1642F9
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1642F9 call_if eq, EventScript_1642F9
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_164304 call_if eq, EventScript_164304
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_164304 call_if eq, EventScript_164304
msgbox gUnknown_817BDD4 msgbox gUnknown_817BDD4
closemessage closemessage
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1643A5 call_if eq, EventScript_1643A5
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1643B7 call_if eq, EventScript_1643B7
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1643C9 call_if eq, EventScript_1643C9
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1643DB call_if eq, EventScript_1643DB
playse SE_KAIDAN playse SE_KAIDAN
delay 35 delay 35
data/maps/TwoIsland_JoyfulGameCorner/scripts.inc
+1 -1
View File
@@ -23,7 +23,7 @@ TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404
.2byte 0 .2byte 0
EventScript_171416:: @ 8171416 EventScript_171416:: @ 8171416
turnobject OBJ_EVENT_ID_PLAYER, 2 turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH
end end
TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B
data/scripts/cable_club.inc
+1 -1
View File
@@ -38,7 +38,7 @@ CableClub_OnWarp:: @ 81BB1ED
EventScript_CheckTurnAttendant:: @ 81BB227 EventScript_CheckTurnAttendant:: @ 81BB227
compare VAR_0x8007, 0 compare VAR_0x8007, 0
goto_if eq, EventScript_CheckTurnAttendantEnd goto_if eq, EventScript_CheckTurnAttendantEnd
turnobject VAR_0x8007, 3 turnobject VAR_0x8007, DIR_WEST
EventScript_CheckTurnAttendantEnd: EventScript_CheckTurnAttendantEnd:
end end
data/scripts/move_tutors.inc
+4 -4
View File
@@ -478,13 +478,13 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC
compare VAR_RESULT, 0 compare VAR_RESULT, 0
goto_if eq, EventScript_1C4F26 goto_if eq, EventScript_1C4F26
copyvar VAR_0x8009, VAR_0x8005 copyvar VAR_0x8009, VAR_0x8005
compare VAR_FACING, 2 compare VAR_FACING, DIR_NORTH
call_if eq, EventScript_1C4EF0 call_if eq, EventScript_1C4EF0
compare VAR_FACING, 1 compare VAR_FACING, DIR_SOUTH
call_if eq, EventScript_1C4EFB call_if eq, EventScript_1C4EFB
compare VAR_FACING, 4 compare VAR_FACING, DIR_EAST
call_if eq, EventScript_1C4F06 call_if eq, EventScript_1C4F06
compare VAR_FACING, 3 compare VAR_FACING, DIR_WEST
call_if eq, EventScript_1C4F11 call_if eq, EventScript_1C4F11
msgbox Text_1A4751, MSGBOX_YESNO msgbox Text_1A4751, MSGBOX_YESNO
compare VAR_RESULT, NO compare VAR_RESULT, NO
include/constants/global.h
+7 -1
View File
@@ -58,6 +58,12 @@
#define NUM_BAG_POCKETS 5 #define NUM_BAG_POCKETS 5
#define PARTY_SIZE 6 #define PARTY_SIZE 6
#define MULTI_PARTY_SIZE PARTY_SIZE / 2 #define MULTI_PARTY_SIZE (PARTY_SIZE / 2)
#define DIR_NONE 0
#define DIR_SOUTH 1
#define DIR_NORTH 2
#define DIR_WEST 3
#define DIR_EAST 4
#endif //GUARD_CONSTANTS_GLOBAL_H #endif //GUARD_CONSTANTS_GLOBAL_H
include/global.fieldmap.h
-9
View File
@@ -267,15 +267,6 @@ enum
ACRO_BIKE_STATE6, ACRO_BIKE_STATE6,
}; };
enum
{
DIR_NONE,
DIR_SOUTH,
DIR_NORTH,
DIR_WEST,
DIR_EAST,
};
enum enum
{ {
COLLISION_LEDGE_JUMP = 6 COLLISION_LEDGE_JUMP = 6