diff options
28 files changed, 128 insertions, 131 deletions
diff --git a/data/maps/CeladonCity_GameCorner/scripts.inc b/data/maps/CeladonCity_GameCorner/scripts.inc index aa2740e3c..d107b3330 100644 --- a/data/maps/CeladonCity_GameCorner/scripts.inc +++ b/data/maps/CeladonCity_GameCorner/scripts.inc @@ -434,9 +434,9 @@ CeladonCity_GameCorner_EventScript_16CAF5:: @ 816CAF5 EventScript_16CB10:: @ 816CB10 msgbox gUnknown_8196E9B closemessage - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16CB34 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if ne, EventScript_16CB3F removeobject 11 release diff --git a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc index def1c9e63..ba6ab7d60 100644 --- a/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc +++ b/data/maps/CinnabarIsland_PokemonCenter_1F/scripts.inc @@ -39,11 +39,11 @@ CinnabarIsland_PokemonCenter_1F_EventScript_16E90A:: @ 816E90A setflag FLAG_SPECIAL_FLAG_0x4001 setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL delay 20 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16E96F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16E981 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16E993 removeobject 7 setvar VAR_MAP_SCENE_CINNABAR_ISLAND_2, 1 diff --git a/data/maps/FiveIsland_ResortGorgeous/scripts.inc b/data/maps/FiveIsland_ResortGorgeous/scripts.inc index c60348e8b..4a8b01c27 100644 --- a/data/maps/FiveIsland_ResortGorgeous/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous/scripts.inc @@ -8,7 +8,7 @@ FiveIsland_ResortGorgeous_OnWarp:: @ 81687EF .2byte 0 EventScript_1687F9:: @ 81687F9 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end FiveIsland_ResortGorgeous_OnFrame:: @ 81687FE diff --git a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc index bc4807028..87b7cda7b 100644 --- a/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc +++ b/data/maps/FiveIsland_ResortGorgeous_House/scripts.inc @@ -52,13 +52,13 @@ EventScript_171F34:: @ 8171F34 textcolor 0 msgbox gUnknown_81A4566 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_171FCD - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_171FE9 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_171FFE - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_17201A moveobjectoffscreen 2 msgbox gUnknown_81A458E diff --git a/data/maps/FiveIsland_RocketWarehouse/scripts.inc b/data/maps/FiveIsland_RocketWarehouse/scripts.inc index 7ef19e499..0050e2f93 100644 --- a/data/maps/FiveIsland_RocketWarehouse/scripts.inc +++ b/data/maps/FiveIsland_RocketWarehouse/scripts.inc @@ -112,7 +112,7 @@ FiveIsland_RocketWarehouse_EventScript_164087:: @ 8164087 EventScript_1640A2:: @ 81640A2 getplayerxy VAR_0x8004, VAR_0x8005 specialvar VAR_RESULT, GetPlayerFacingDirection - compare VAR_RESULT, 2 + compare VAR_RESULT, DIR_NORTH call_if eq, EventScript_16412E msgbox gUnknown_817B7AE closemessage diff --git a/data/maps/OneIsland_Harbor/scripts.inc b/data/maps/OneIsland_Harbor/scripts.inc index fb6e9286e..3fb0928db 100644 --- a/data/maps/OneIsland_Harbor/scripts.inc +++ b/data/maps/OneIsland_Harbor/scripts.inc @@ -8,7 +8,7 @@ OneIsland_Harbor_OnWarp:: @ 8171383 .2byte 0 EventScript_17138D:: @ 817138D - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end OneIsland_Harbor_OnFrame:: @ 8171392 diff --git a/data/maps/PalletTown/scripts.inc b/data/maps/PalletTown/scripts.inc index 50681f724..4feb30355 100644 --- a/data/maps/PalletTown/scripts.inc +++ b/data/maps/PalletTown/scripts.inc @@ -392,9 +392,9 @@ PalletTown_EventScript_16575C:: @ 816575C waitmovement 0 msgbox gUnknown_81B1C9F closemessage - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1657D7 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if ne, EventScript_1657E2 moveobjectoffscreen 1 setflag FLAG_TEMP_2 diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 538ef9234..999cd7dbb 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -35,7 +35,7 @@ EventScript_168C4A:: @ 8168C4A PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH goto_if eq, EventScript_168C78 msgbox gUnknown_818D4F9 releaseall diff --git a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc index c51fdcd61..acd6e8c77 100644 --- a/data/maps/PalletTown_PlayersHouse_2F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_2F/scripts.inc @@ -17,7 +17,7 @@ PalletTown_PlayersHouse_2F_OnWarp:: @ 8168CBE .2byte 0 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 end diff --git a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc index 70fd7304f..a4988a1c2 100644 --- a/data/maps/PalletTown_ProfessorOaksLab/scripts.inc +++ b/data/maps/PalletTown_ProfessorOaksLab/scripts.inc @@ -40,7 +40,7 @@ PalletTown_ProfessorOaksLab_OnWarp:: @ 8168FE1 .2byte 0 EventScript_168FEB:: @ 8168FEB - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 @@ -50,7 +50,7 @@ PalletTown_ProfessorOaksLab_OnFrame:: @ 8168FF0 EventScript_169002:: @ 8169002 lockall - setvar VAR_FACING, 2 + setvar VAR_FACING, DIR_NORTH textcolor 0 applymovement 4, Movement_1692B0 waitmovement 0 @@ -66,32 +66,32 @@ EventScript_169002:: @ 8169002 EventScript_169035:: @ 8169035 msgbox gUnknown_818EE60 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169174 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1691BB - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169194 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169194 msgbox gUnknown_818EF59 fadedefaultbgm msgbox gUnknown_818F004 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1691DB - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1691E6 textcolor 3 msgbox gUnknown_818F062 closemessage call EventScript_1A6675 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1691F1 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1691FC - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169215 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169227 addobject 9 addobject 10 @@ -101,13 +101,13 @@ EventScript_169035:: @ 8169035 removeobject 9 removeobject 10 delay 30 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169845 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169850 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16985B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16986D textcolor 3 playfanfare MUS_FAN5 @@ -120,13 +120,13 @@ EventScript_169035:: @ 8169035 msgbox gUnknown_818F1DB closemessage playbgm MUS_RIVAL2, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B69 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B7B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B7B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -645,13 +645,13 @@ EventScript_16961E:: @ 816961E playbgm MUS_RIVAL1, 0 msgbox gUnknown_818DE8D closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169A82 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169AC1 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169A9E - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169A9E fadedefaultbgm msgbox gUnknown_818DE99 @@ -662,23 +662,23 @@ EventScript_16961E:: @ 816961E waitmovement 0 applymovement 4, Movement_Delay48 waitmovement 0 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169ADD - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B14 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169AF5 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B86 msgbox gUnknown_818E508 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169882 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16988D - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1698A6 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1698B8 msgbox gUnknown_818E536 closemessage @@ -691,13 +691,13 @@ EventScript_16961E:: @ 816961E delay 10 removeobject 10 delay 25 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169845 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169850 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16985B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16986D delay 10 textcolor 3 @@ -716,24 +716,24 @@ EventScript_16961E:: @ 816961E famechecker FAMECHECKER_OAK, 1 msgbox gUnknown_818E784 msgbox gUnknown_818DEC8 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B33 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B45 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B57 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B57 msgbox gUnknown_818DEF3 closemessage playbgm MUS_RIVAL2, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169B69 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_169B7B - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_169B7B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169B7B removeobject 8 fadedefaultbgm @@ -856,13 +856,13 @@ EventScript_169913:: @ 8169913 delay 40 message Text_1A7291 waitmessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_169964 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16996F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16997A - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_169985 applymovement 4, Movement_FacePlayer waitmovement 0 diff --git a/data/maps/PewterCity/scripts.inc b/data/maps/PewterCity/scripts.inc index 5e2d42c18..7b5d4c2fe 100644 --- a/data/maps/PewterCity/scripts.inc +++ b/data/maps/PewterCity/scripts.inc @@ -13,7 +13,7 @@ PewterCity_EventScript_165B9D:: @ 8165B9D msgbox gUnknown_817E67E closemessage playbgm MUS_ANNAI, 0 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_165BD3 msgbox gUnknown_817E6C7 closemessage @@ -1038,13 +1038,13 @@ PewterCity_EventScript_16607E:: @ 816607E closemessage delay 10 playbgm MUS_ANNAI, 0 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1660EE - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_166100 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_166112 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_166124 msgbox gUnknown_817E5AC closemessage diff --git a/data/maps/PewterCity_Museum_1F/scripts.inc b/data/maps/PewterCity_Museum_1F/scripts.inc index 7dc341fb6..8c9e56390 100644 --- a/data/maps/PewterCity_Museum_1F/scripts.inc +++ b/data/maps/PewterCity_Museum_1F/scripts.inc @@ -4,11 +4,11 @@ PewterCity_Museum_1F_MapScripts:: @ 816A31A PewterCity_Museum_1F_EventScript_16A31B:: @ 816A31B lock faceplayer - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST goto_if eq, EventScript_16A348 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH goto_if eq, EventScript_16A348 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH goto_if eq, EventScript_16A348 msgbox gUnknown_8190539 release diff --git a/data/maps/PokemonLeague_AgathasRoom/scripts.inc b/data/maps/PokemonLeague_AgathasRoom/scripts.inc index 721396149..dcb002b5d 100644 --- a/data/maps/PokemonLeague_AgathasRoom/scripts.inc +++ b/data/maps/PokemonLeague_AgathasRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_AgathasRoom_OnWarp:: @ 8162851 .2byte 0 EventScript_16285B:: @ 816285B - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_AgathasRoom_OnFrame:: @ 8162860 diff --git a/data/maps/PokemonLeague_BrunosRoom/scripts.inc b/data/maps/PokemonLeague_BrunosRoom/scripts.inc index c31000e50..0eeb407c9 100644 --- a/data/maps/PokemonLeague_BrunosRoom/scripts.inc +++ b/data/maps/PokemonLeague_BrunosRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_BrunosRoom_OnWarp:: @ 81626C6 .2byte 0 EventScript_1626D0:: @ 81626D0 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_BrunosRoom_OnFrame:: @ 81626D5 @@ -87,13 +87,13 @@ EventScript_16276E:: @ 816276E EventScript_162779:: @ 8162779 msgbox gUnknown_8178420 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1627FA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1627EF - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_162805 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_162805 release end @@ -103,13 +103,13 @@ EventScript_1627B0:: @ 81627B0 call EventScript_1A7506 msgbox gUnknown_8178420 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1627FA - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1627EF - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_162805 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_162805 release end diff --git a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc index 567053a90..63c370711 100644 --- a/data/maps/PokemonLeague_ChampionsRoom/scripts.inc +++ b/data/maps/PokemonLeague_ChampionsRoom/scripts.inc @@ -45,7 +45,7 @@ PokemonLeague_ChampionsRoom_OnWarp:: @ 8162B5D .2byte 0 EventScript_162B67:: @ 8162B67 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_ChampionsRoom_OnFrame:: @ 8162B6C diff --git a/data/maps/PokemonLeague_HallOfFame/scripts.inc b/data/maps/PokemonLeague_HallOfFame/scripts.inc index abc93f6c3..960b8cbb1 100644 --- a/data/maps/PokemonLeague_HallOfFame/scripts.inc +++ b/data/maps/PokemonLeague_HallOfFame/scripts.inc @@ -8,7 +8,7 @@ PokemonLeague_HallOfFame_OnWarp:: @ 8162D57 .2byte 0 EventScript_162D61:: @ 8162D61 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_HallOfFame_OnFrame:: @ 8162D66 diff --git a/data/maps/PokemonLeague_LancesRoom/scripts.inc b/data/maps/PokemonLeague_LancesRoom/scripts.inc index 6bed6e4c3..257875ea2 100644 --- a/data/maps/PokemonLeague_LancesRoom/scripts.inc +++ b/data/maps/PokemonLeague_LancesRoom/scripts.inc @@ -30,7 +30,7 @@ PokemonLeague_LancesRoom_OnWarp:: @ 816296E .2byte 0 EventScript_162978:: @ 8162978 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LancesRoom_OnFrame:: @ 816297D diff --git a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc index 3475b0f97..27550f51f 100644 --- a/data/maps/PokemonLeague_LoreleisRoom/scripts.inc +++ b/data/maps/PokemonLeague_LoreleisRoom/scripts.inc @@ -35,7 +35,7 @@ PokemonLeague_LoreleisRoom_OnWarp:: @ 81625B6 .2byte 0 EventScript_1625C0:: @ 81625C0 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end PokemonLeague_LoreleisRoom_OnFrame:: @ 81625C5 diff --git a/data/maps/Route25_SeaCottage/scripts.inc b/data/maps/Route25_SeaCottage/scripts.inc index 6bcfb08cc..3b41eac68 100644 --- a/data/maps/Route25_SeaCottage/scripts.inc +++ b/data/maps/Route25_SeaCottage/scripts.inc @@ -50,13 +50,13 @@ EventScript_17059C:: @ 817059C msgbox gUnknown_819FFD3 closemessage delay 10 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_17062A - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_170635 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_170635 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_170635 opendoor 10, 3 waitdooranim diff --git a/data/maps/SeafoamIslands_B4F/scripts.inc b/data/maps/SeafoamIslands_B4F/scripts.inc index 25bd70e68..70b33cf35 100644 --- a/data/maps/SeafoamIslands_B4F/scripts.inc +++ b/data/maps/SeafoamIslands_B4F/scripts.inc @@ -69,7 +69,7 @@ SeafoamIslands_B4F_OnWarp:: @ 81630E7 .2byte 0 EventScript_1630F1:: @ 81630F1 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH special Special_ForcePlayerToStartSurfing end diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 2778ae66d..fd358401f 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -108,11 +108,11 @@ EventScript_170987:: @ 8170987 special ReducePlayerPartyToThree msgbox gUnknown_81A07C4 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_170A2D - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_170A3F - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_170A51 warp MAP_SEVEN_ISLAND_HOUSE_ROOM2, 255, 3, 1 waitstate diff --git a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc index 5685358cd..63ce3fb65 100644 --- a/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc +++ b/data/maps/SevenIsland_SevaultCanyon_House/scripts.inc @@ -20,7 +20,7 @@ SevenIsland_SevaultCanyon_House_EventScript_172183:: @ 8172183 msgbox gUnknown_81A4DD8 closemessage call EventScript_1A6675 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if ne, EventScript_172206 delay 30 playbgm MUS_P_SCHOOL, 0 diff --git a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc index 41bd9f235..4c7b28205 100644 --- a/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc +++ b/data/maps/SixIsland_DottedHole_SapphireRoom/scripts.inc @@ -16,13 +16,13 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 applymovement 2, Movement_16440F waitmovement 0 playse SE_W070 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_16430F - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_16430F - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16431A - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_16431A setvar VAR_0x8004, 3 setvar VAR_0x8005, 0 @@ -30,43 +30,43 @@ SixIsland_DottedHole_SapphireRoom_EventScript_1641B5:: @ 81641B5 setvar VAR_0x8007, 3 special Special_ShakeScreen delay 60 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_164325 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_164330 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16433B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164346 textcolor 0 msgbox gUnknown_817BD97 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_164351 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_164366 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_16437B - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164390 removeobject 1 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1642F9 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1642F9 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_164304 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_164304 msgbox gUnknown_817BDD4 closemessage - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1643A5 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1643B7 - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1643C9 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1643DB playse SE_KAIDAN delay 35 diff --git a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc index 07577f92b..6ad841ea4 100644 --- a/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc +++ b/data/maps/TwoIsland_JoyfulGameCorner/scripts.inc @@ -23,7 +23,7 @@ TwoIsland_JoyfulGameCorner_OnWarp:: @ 8171404 .2byte 0 EventScript_171416:: @ 8171416 - turnobject OBJ_EVENT_ID_PLAYER, 2 + turnobject OBJ_EVENT_ID_PLAYER, DIR_NORTH end TwoIsland_JoyfulGameCorner_OnFrame:: @ 817141B diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 53869703e..e702b9a13 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -38,7 +38,7 @@ CableClub_OnWarp:: @ 81BB1ED EventScript_CheckTurnAttendant:: @ 81BB227 compare VAR_0x8007, 0 goto_if eq, EventScript_CheckTurnAttendantEnd - turnobject VAR_0x8007, 3 + turnobject VAR_0x8007, DIR_WEST EventScript_CheckTurnAttendantEnd: end diff --git a/data/scripts/move_tutors.inc b/data/scripts/move_tutors.inc index d25a694be..211c2a935 100644 --- a/data/scripts/move_tutors.inc +++ b/data/scripts/move_tutors.inc @@ -478,13 +478,13 @@ TwoIsland_CapeBrink_House_EventScript_1C4DEC:: @ 81C4DEC compare VAR_RESULT, 0 goto_if eq, EventScript_1C4F26 copyvar VAR_0x8009, VAR_0x8005 - compare VAR_FACING, 2 + compare VAR_FACING, DIR_NORTH call_if eq, EventScript_1C4EF0 - compare VAR_FACING, 1 + compare VAR_FACING, DIR_SOUTH call_if eq, EventScript_1C4EFB - compare VAR_FACING, 4 + compare VAR_FACING, DIR_EAST call_if eq, EventScript_1C4F06 - compare VAR_FACING, 3 + compare VAR_FACING, DIR_WEST call_if eq, EventScript_1C4F11 msgbox Text_1A4751, MSGBOX_YESNO compare VAR_RESULT, NO diff --git a/include/constants/global.h b/include/constants/global.h index 4a4c83c62..c11945ed8 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -58,6 +58,12 @@ #define NUM_BAG_POCKETS 5 #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 diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h index e567c6d5f..4402d5042 100644 --- a/include/global.fieldmap.h +++ b/include/global.fieldmap.h @@ -269,15 +269,6 @@ enum enum { - DIR_NONE, - DIR_SOUTH, - DIR_NORTH, - DIR_WEST, - DIR_EAST, -}; - -enum -{ COLLISION_LEDGE_JUMP = 6 }; |