diff options
33 files changed, 126 insertions, 124 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 1da2a016f..3877d6183 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -2,6 +2,7 @@ #include "constants/battle_frontier.h" #include "constants/battle_setup.h" #include "constants/event_objects.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" #include "constants/flags.h" #include "constants/items.h" diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc index d92c6cbf4..7dbeee042 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc @@ -968,7 +968,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919 compare VAR_TEMP_D, 0 goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E setobjectxyperm 6, 2, 0 - setobjectmovementtype 6, 10 + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT return BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index 82a3b8469..899df4d2c 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -28,7 +28,7 @@ LavaridgeTown_EventScript_1EA518:: @ 81EA518 LavaridgeTown_EventScript_1EA529:: @ 81EA529 setobjectxyperm 8, 11, 9 setobjectxyperm 7, 9, 8 - setobjectmovementtype 7, 7 + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 06ea54a98..bf48225ec 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -38,22 +38,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 checktrainerflag TRAINER_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 checktrainerflag TRAINER_GERALD goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 checktrainerflag TRAINER_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E checktrainerflag TRAINER_DANIELLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B - setobjectmovementtype 5, 63 + setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B return diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 222f36810..a8a6eaa54 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -37,22 +37,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 - setobjectmovementtype 2, 63 + setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 checktrainerflag TRAINER_JACE goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 - setobjectmovementtype 1, 63 + setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 checktrainerflag TRAINER_JEFF goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 - setobjectmovementtype 3, 63 + setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 checktrainerflag TRAINER_ELI goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 - setobjectmovementtype 4, 63 + setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 return diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index b7067f451..5d9161cb4 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -56,17 +56,17 @@ LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F compare VAR_0x4050, 0 goto_if_eq LittlerootTown_EventScript_1E7E86 setobjectxyperm 1, 10, 1 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_EventScript_1E7E86:: @ 81E7E86 setobjectxyperm 1, 7, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return LittlerootTown_EventScript_1E7E92:: @ 81E7E92 clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN checkplayergender compare VAR_RESULT, MALE call_if_eq LittlerootTown_EventScript_1E7EB1 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 8fa7adbca..42cfe308b 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 setobjectxyperm 1, 8, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 setobjectxyperm 1, 4, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE setobjectxyperm 1, 9, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 8bd4b43b9..ea00693a8 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 setobjectxyperm 1, 0, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 25ebc1bbd..36bda7e03 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -36,17 +36,17 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 setobjectxyperm 1, 2, 4 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E setobjectxyperm 1, 1, 8 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index ffc4a6519..353437ad4 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -27,7 +27,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6 compare VAR_0x40D3, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 setobjectxyperm 1, 8, 2 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 1f65beda3..ee7e1730b 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -19,7 +19,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD specialvar VAR_RESULT, HasAllHoennMons compare VAR_RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end @@ -33,7 +33,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 setmaplayoutindex 432 - setobjectmovementtype 3, 3 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 91eda813c..e875be96f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -10,14 +10,14 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 setobjectxyperm 3, 1, 9 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 5, 0, 8 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 4, 1, 6 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 4 - setobjectmovementtype 1, 10 - setobjectmovementtype 2, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT compare VAR_0x409E, 1 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA compare VAR_0x409E, 2 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index 163f7045f..0602c9dad 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -13,11 +13,11 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 - setobjectmovementtype 3, 10 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT setobjectxyperm 2, 1, 3 - setobjectmovementtype 2, 10 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT return MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F @@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT removeobject 3 setobjectxyperm 3, 5, 6 - setobjectmovementtype 3, 2 + setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND addobject 3 fadescreen 0 end diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index d2bd91694..51f1ac16e 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -19,7 +19,7 @@ MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 7 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP return MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc index 8e52438c9..6c389e2ad 100644 --- a/data/maps/MtChimney_CableCarStation/scripts.inc +++ b/data/maps/MtChimney_CableCarStation/scripts.inc @@ -10,7 +10,7 @@ MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 setobjectxyperm 1, 5, 4 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D @@ -24,7 +24,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index c8a598da9..7431cbf2a 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -16,12 +16,12 @@ OldaleTown_EventScript_1E8ECC:: @ 81E8ECC OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 setobjectxyperm 3, 1, 11 - setobjectmovementtype 3, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT return OldaleTown_EventScript_1E8EDE:: @ 81E8EDE setobjectxyperm 2, 13, 14 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return OldaleTown_EventScript_1E8EEA:: @ 81E8EEA diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index ba1afc428..17ed47206 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -15,9 +15,9 @@ Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 setobjectxyperm 1, 9, 3 - setobjectmovementtype 1, 50 + setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT setobjectxyperm 2, 9, 6 - setobjectmovementtype 2, 51 + setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN return Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 0455ebb1f..7c98cc603 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -484,8 +484,8 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC call_if_eq Route110_EventScript_1EF998 compare VAR_0x8008, 3 call_if_eq Route110_EventScript_1EF9A0 - setobjectmovementtype 28, 10 - setobjectmovementtype 29, 10 + setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT + setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT removeobject 28 addobject 29 delay 45 diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc index 037d7ca05..a430a497e 100644 --- a/data/maps/Route112_CableCarStation/scripts.inc +++ b/data/maps/Route112_CableCarStation/scripts.inc @@ -11,7 +11,7 @@ Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9 Route112_CableCarStation_EventScript_22AADD:: @ 822AADD setobjectxyperm 1, 7, 4 - setobjectmovementtype 1, 9 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT return Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 @@ -25,7 +25,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3 waitmovement 0 setvar VAR_0x40A3, 0 setobjectxyperm 1, 6, 7 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN releaseall end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index b98fd3321..96d591d2d 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -9,7 +9,7 @@ Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33 Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D setobjectxyperm 1, 6, 5 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index 8dada27e8..ae0fea259 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -9,7 +9,7 @@ Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 setobjectxyperm 5, 0, 5 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index e7d2cb03d..bbee65df8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -12,17 +12,17 @@ Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24 Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 setobjectxyperm 5, 1, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 setobjectxyperm 5, 4, 6 - setobjectmovementtype 5, 10 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT return Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C setobjectxyperm 5, 2, 2 - setobjectmovementtype 5, 7 + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP return Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 5a601678d..cd864e1dc 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -57,7 +57,7 @@ Route120_EventScript_1F54A3:: @ 81F54A3 return Route120_EventScript_1F54C8:: @ 81F54C8 - setobjectmovementtype 36, 10 + setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT return Route120_MapScript1_1F54CD: @ 81F54CD diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 7c1e14118..8ffbf8373 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -245,7 +245,7 @@ RustboroCity_EventScript_1E094E:: @ 81E094E RustboroCity_EventScript_1E095A:: @ 81E095A lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 0 goto RustboroCity_EventScript_1E09CD end @@ -253,7 +253,7 @@ RustboroCity_EventScript_1E095A:: @ 81E095A RustboroCity_EventScript_1E0971:: @ 81E0971 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 1 goto RustboroCity_EventScript_1E09CD end @@ -261,7 +261,7 @@ RustboroCity_EventScript_1E0971:: @ 81E0971 RustboroCity_EventScript_1E0988:: @ 81E0988 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 2 goto RustboroCity_EventScript_1E09CD end @@ -269,7 +269,7 @@ RustboroCity_EventScript_1E0988:: @ 81E0988 RustboroCity_EventScript_1E099F:: @ 81E099F lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 3 goto RustboroCity_EventScript_1E09CD end @@ -277,7 +277,7 @@ RustboroCity_EventScript_1E099F:: @ 81E099F RustboroCity_EventScript_1E09B6:: @ 81E09B6 lockall setobjectxyperm 9, 14, 21 - setobjectmovementtype 9, 10 + setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT setvar VAR_0x8004, 4 goto RustboroCity_EventScript_1E09CD end diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index 157947c2d..a7a84335b 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 setobjectxyperm 2, 14, 2 - setobjectmovementtype 2, 8 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN return RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index da78ccb4b..9d5fbe58b 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -11,7 +11,7 @@ RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 setobjectxyperm 2, 3, 2 - setobjectmovementtype 2, 9 + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index c0bc2e4c1..c091991a3 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -24,7 +24,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 SkyPillar_Top_EventScript_2396FD:: @ 82396FD setmaplayoutindex 438 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return SkyPillar_Top_EventScript_239705:: @ 8239705 diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index 7b19c84b8..2e7859fba 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -26,13 +26,13 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99 setobjectxyperm 8, 28, 16 setobjectxyperm 1, 29, 16 setobjectxyperm 2, 31, 14 - setobjectmovementtype 11, 8 - setobjectmovementtype 7, 18 - setobjectmovementtype 3, 16 - setobjectmovementtype 6, 7 - setobjectmovementtype 8, 7 - setobjectmovementtype 1, 7 - setobjectmovementtype 2, 9 + setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN + setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT + setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT return SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 @@ -41,12 +41,12 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 compare VAR_0x8004, 30 goto_if_eq SlateportCity_EventScript_1DCD06 setobjectxyperm 35, 23, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_EventScript_1DCD06:: @ 81DCD06 setobjectxyperm 35, 22, 27 - setobjectmovementtype 35, 10 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT return SlateportCity_MapScript2_1DCD12: @ 81DCD12 @@ -82,7 +82,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitmovement 0 removeobject 35 setobjectxyperm 35, 10, 12 - setobjectmovementtype 35, 8 + setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN clearflag FLAG_SPECIAL_FLAG_0x4000 setvar VAR_0x40D2, 2 addvar VAR_0x40D1, 1 diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index 2f71a2dc9..24e139edf 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -17,7 +17,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 savebgm MUS_AQA_0 setobjectxyperm 4, 12, 13 - setobjectmovementtype 4, 9 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS return @@ -78,7 +78,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE moveobjectoffscreen 4 - setobjectmovementtype 4, 10 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index da5caab3f..a116aeb56 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -70,10 +70,10 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785 setobjectxyperm 5, 46, 32 setobjectxyperm 4, 48, 41 setobjectxyperm 8, 45, 43 - setobjectmovementtype 3, 7 - setobjectmovementtype 5, 9 - setobjectmovementtype 4, 9 - setobjectmovementtype 8, 9 + setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP + setobjectmovementtype 5, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT + setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT return SootopolisCity_EventScript_1E57B2:: @ 81E57B2 @@ -150,17 +150,17 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871 SootopolisCity_EventScript_1E58AF:: @ 81E58AF setobjectxyperm 18, 31, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58BB:: @ 81E58BB setobjectxyperm 18, 32, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58C7:: @ 81E58C7 setobjectxyperm 18, 30, 33 - setobjectmovementtype 18, 8 + setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN return SootopolisCity_EventScript_1E58D3:: @ 81E58D3 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 18b573fbd..0493cb05f 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -15,13 +15,13 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 - setobjectmovementtype 1, 8 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN setmaplayoutindex 441 return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 setobjectxyperm 1, 2, 2 - setobjectmovementtype 1, 10 + setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT return SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 20f36868e..2d1c63027 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -11,12 +11,12 @@ VictoryRoad_1F_MapScript1_235D80: @ 8235D80 VictoryRoad_1F_EventScript_235D97:: @ 8235D97 setobjectxyperm 4, 2, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 setobjectxyperm 4, 3, 24 - setobjectmovementtype 4, 8 + setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN return VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF diff --git a/src/trainer_see.c b/src/trainer_see.c index 3846eca46..bc5d9cbc3 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -1,5 +1,4 @@ #include "global.h" -#include "constants/battle_setup.h" #include "battle_setup.h" #include "event_data.h" #include "event_object_movement.h" @@ -14,6 +13,8 @@ #include "trainer_hill.h" #include "util.h" #include "battle_pyramid.h" +#include "constants/battle_setup.h" +#include "constants/event_object_movement_constants.h" #include "constants/field_effects.h" extern void sub_809BE48(u16 npcId); @@ -33,17 +34,17 @@ static u8 GetTrainerApproachDistanceWest(struct EventObject *trainerObj, s16 ran static u8 GetTrainerApproachDistanceEast(struct EventObject *trainerObj, s16 range, s16 x, s16 y); static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj); -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj); static void SpriteCB_TrainerIcons(struct Sprite *sprite); @@ -73,25 +74,25 @@ static u8 (*const sDirectionalApproachDistanceFuncs[])(struct EventObject *train static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { sub_80B4178, - sub_80B417C, - sub_80B41C0, - sub_80B4200, - sub_80B425C, - sub_80B4318, - sub_80B435C, - sub_80B4390, - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC + TrainerExclamationMark, + WaitTrainerExclamationMark, + TrainerMoveToPlayer, + PlayerFaceApproachingTrainer, + WaitPlayerFaceApproachingTrainer, + RevealDisguisedTrainer, + WaitRevealDisguisedTrainer, + RevealHiddenTrainer, + PopOutOfAshHiddenTrainer, + JumpInPlaceHiddenTrainer, + WaitRevealHiddenTrainer, }; static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = { - sub_80B43AC, - sub_80B43E0, - sub_80B4438, - sub_80B44AC, + RevealHiddenTrainer, + PopOutOfAshHiddenTrainer, + JumpInPlaceHiddenTrainer, + WaitRevealHiddenTrainer, }; static const struct OamData sOamData_Icons = @@ -433,7 +434,7 @@ static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) { u8 direction; @@ -445,7 +446,7 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *train return TRUE; } -static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON)) { @@ -454,17 +455,17 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *train else { task->tFuncId++; - if (trainerObj->movementType == 57 || trainerObj->movementType == 58) + if (trainerObj->movementType == MOVEMENT_TYPE_TREE_DISGUISE || trainerObj->movementType == MOVEMENT_TYPE_MOUNTAIN_DISGUISE) task->tFuncId = 6; - if (trainerObj->movementType == 63) + if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN) task->tFuncId = 8; return TRUE; } } -static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { - if (!(EventObjectIsMovementOverridden(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj)) + if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { if (task->tTrainerRange) { @@ -473,14 +474,14 @@ static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *train } else { - EventObjectSetHeldMovement(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } } return FALSE; } -static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct EventObject *playerObj; @@ -501,7 +502,7 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId]; @@ -511,18 +512,18 @@ static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, 0x59); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER); task->tFuncId++; } return FALSE; } -static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (EventObjectClearHeldMovementIfFinished(trainerObj)) task->tFuncId = 3; @@ -530,18 +531,18 @@ static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!EventObjectIsMovementOverridden(trainerObj) || EventObjectClearHeldMovementIfFinished(trainerObj)) { - EventObjectSetHeldMovement(trainerObj, 0x3E); + EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER); task->tFuncId++; } return FALSE; } -static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (EventObjectCheckHeldMovementStatus(trainerObj)) { @@ -555,7 +556,7 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { struct Sprite *sprite; @@ -574,7 +575,7 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *train return FALSE; } -static bool8 sub_80B44AC(u8 taskId, struct Task *task, struct EventObject *trainerObj) +static bool8 WaitRevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj) { if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) task->tFuncId = 3; |