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

Document trainer approach funcs, and use movement type constants in scripts

Browse Source
This commit is contained in:
Marcus Huderle
2019-01-20 10:11:45 -06:00
committed by huderlem
parent e81838dba3
commit 36a1825bbe
33 changed files with 126 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/event_scripts.s
View File

@@ -2,6 +2,7 @@
#include "constants/battle_frontier.h" #include "constants/battle_frontier.h"
#include "constants/battle_setup.h" #include "constants/battle_setup.h"
#include "constants/event_objects.h" #include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
#include "constants/flags.h" #include "constants/flags.h"
#include "constants/items.h" #include "constants/items.h"

2
data/maps/BattleFrontier_BattleDomeBattleRoom/scripts.inc
View File

@@ -968,7 +968,7 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C919:: @ 824C919
compare VAR_TEMP_D, 0 compare VAR_TEMP_D, 0
goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E goto_if_eq BattleFrontier_BattleDomeBattleRoom_EventScript_27374E
setobjectxyperm 6, 2, 0 setobjectxyperm 6, 2, 0
setobjectmovementtype 6, 10 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_RIGHT
return return
BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938

2
data/maps/LavaridgeTown/scripts.inc
View File

@@ -28,7 +28,7 @@ LavaridgeTown_EventScript_1EA518:: @ 81EA518
LavaridgeTown_EventScript_1EA529:: @ 81EA529 LavaridgeTown_EventScript_1EA529:: @ 81EA529
setobjectxyperm 8, 11, 9 setobjectxyperm 8, 11, 9
setobjectxyperm 7, 9, 8 setobjectxyperm 7, 9, 8
setobjectmovementtype 7, 7 setobjectmovementtype 7, MOVEMENT_TYPE_FACE_UP
clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 clearflag FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1
return return

8
data/maps/LavaridgeTown_Gym_1F/scripts.inc
View File

@@ -38,22 +38,22 @@ LavaridgeTown_Gym_1F_EventScript_1FE756:: @ 81FE756
LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757 LavaridgeTown_Gym_1F_EventScript_1FE757:: @ 81FE757
checktrainerflag TRAINER_COLE checktrainerflag TRAINER_COLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE764
setobjectmovementtype 2, 63 setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764 LavaridgeTown_Gym_1F_EventScript_1FE764:: @ 81FE764
checktrainerflag TRAINER_GERALD checktrainerflag TRAINER_GERALD
goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE771
setobjectmovementtype 3, 63 setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771 LavaridgeTown_Gym_1F_EventScript_1FE771:: @ 81FE771
checktrainerflag TRAINER_AXLE checktrainerflag TRAINER_AXLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE77E
setobjectmovementtype 4, 63 setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E LavaridgeTown_Gym_1F_EventScript_1FE77E:: @ 81FE77E
checktrainerflag TRAINER_DANIELLE checktrainerflag TRAINER_DANIELLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE78B
setobjectmovementtype 5, 63 setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B LavaridgeTown_Gym_1F_EventScript_1FE78B:: @ 81FE78B
return return

8
data/maps/LavaridgeTown_Gym_B1F/scripts.inc
View File

@@ -37,22 +37,22 @@ LavaridgeTown_Gym_B1F_EventScript_1FF8DB:: @ 81FF8DB
LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC LavaridgeTown_Gym_B1F_EventScript_1FF8DC:: @ 81FF8DC
checktrainerflag TRAINER_KEEGAN checktrainerflag TRAINER_KEEGAN
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9 goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8E9
setobjectmovementtype 2, 63 setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9 LavaridgeTown_Gym_B1F_EventScript_1FF8E9:: @ 81FF8E9
checktrainerflag TRAINER_JACE checktrainerflag TRAINER_JACE
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6 goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF8F6
setobjectmovementtype 1, 63 setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6 LavaridgeTown_Gym_B1F_EventScript_1FF8F6:: @ 81FF8F6
checktrainerflag TRAINER_JEFF checktrainerflag TRAINER_JEFF
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903 goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF903
setobjectmovementtype 3, 63 setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903 LavaridgeTown_Gym_B1F_EventScript_1FF903:: @ 81FF903
checktrainerflag TRAINER_ELI checktrainerflag TRAINER_ELI
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910 goto_if_eq LavaridgeTown_Gym_B1F_EventScript_1FF910
setobjectmovementtype 4, 63 setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910 LavaridgeTown_Gym_B1F_EventScript_1FF910:: @ 81FF910
return return

6
data/maps/LittlerootTown/scripts.inc
View File

@@ -56,17 +56,17 @@ LittlerootTown_EventScript_1E7E6F:: @ 81E7E6F
compare VAR_0x4050, 0 compare VAR_0x4050, 0
goto_if_eq LittlerootTown_EventScript_1E7E86 goto_if_eq LittlerootTown_EventScript_1E7E86
setobjectxyperm 1, 10, 1 setobjectxyperm 1, 10, 1
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_EventScript_1E7E86:: @ 81E7E86 LittlerootTown_EventScript_1E7E86:: @ 81E7E86
setobjectxyperm 1, 7, 2 setobjectxyperm 1, 7, 2
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
return return
LittlerootTown_EventScript_1E7E92:: @ 81E7E92 LittlerootTown_EventScript_1E7E92:: @ 81E7E92
clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE clearflag FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE
setobjectmovementtype 4, 8 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
call_if_eq LittlerootTown_EventScript_1E7EB1 call_if_eq LittlerootTown_EventScript_1E7EB1

6
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
View File

@@ -36,17 +36,17 @@ LittlerootTown_BrendansHouse_1F_MapScript1_1F77A4: @ 81F77A4
LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6 LittlerootTown_BrendansHouse_1F_EventScript_1F77C6:: @ 81F77C6
setobjectxyperm 1, 8, 4 setobjectxyperm 1, 8, 4
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2 LittlerootTown_BrendansHouse_1F_EventScript_1F77D2:: @ 81F77D2
setobjectxyperm 1, 4, 5 setobjectxyperm 1, 4, 5
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE LittlerootTown_BrendansHouse_1F_EventScript_1F77DE:: @ 81F77DE
setobjectxyperm 1, 9, 8 setobjectxyperm 1, 9, 8
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA LittlerootTown_BrendansHouse_1F_MapScript2_1F77EA: @ 81F77EA

2
data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc
View File

@@ -27,7 +27,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8433:: @ 81F8433
compare VAR_0x40D3, 2 compare VAR_0x40D3, 2
goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F9309
setobjectxyperm 1, 0, 2 setobjectxyperm 1, 0, 2
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456 LittlerootTown_BrendansHouse_2F_EventScript_1F8456:: @ 81F8456

6
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
View File

@@ -36,17 +36,17 @@ LittlerootTown_MaysHouse_1F_MapScript1_1F88F4: @ 81F88F4
LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916 LittlerootTown_MaysHouse_1F_EventScript_1F8916:: @ 81F8916
setobjectxyperm 1, 2, 4 setobjectxyperm 1, 2, 4
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922 LittlerootTown_MaysHouse_1F_EventScript_1F8922:: @ 81F8922
setobjectxyperm 1, 6, 5 setobjectxyperm 1, 6, 5
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E LittlerootTown_MaysHouse_1F_EventScript_1F892E:: @ 81F892E
setobjectxyperm 1, 1, 8 setobjectxyperm 1, 1, 8
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A LittlerootTown_MaysHouse_1F_MapScript2_1F893A: @ 81F893A

2
data/maps/LittlerootTown_MaysHouse_2F/scripts.inc
View File

@@ -27,7 +27,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F92E6:: @ 81F92E6
compare VAR_0x40D3, 2 compare VAR_0x40D3, 2
goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309
setobjectxyperm 1, 8, 2 setobjectxyperm 1, 8, 2
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309 LittlerootTown_BrendansHouse_2F_EventScript_1F9309:: @ 81F9309

4
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

@@ -19,7 +19,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CCD:: @ 81F9CCD
specialvar VAR_RESULT, HasAllHoennMons specialvar VAR_RESULT, HasAllHoennMons
compare VAR_RESULT, 1 compare VAR_RESULT, 1
goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9
setobjectmovementtype 3, 3 setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
setobjectxyperm 3, 5, 10 setobjectxyperm 3, 5, 10
end end
@@ -33,7 +33,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3
LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7
setmaplayoutindex 432 setmaplayoutindex 432
setobjectmovementtype 3, 3 setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN
setobjectxyperm 3, 5, 10 setobjectxyperm 3, 5, 10
end end

10
data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
View File

@@ -10,14 +10,14 @@ MossdeepCity_SpaceCenter_1F_MapScript1_222F4C: @ 8222F4C
MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58 MossdeepCity_SpaceCenter_1F_EventScript_222F58:: @ 8222F58
setobjectxyperm 3, 1, 9 setobjectxyperm 3, 1, 9
setobjectmovementtype 3, 10 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm 5, 0, 8 setobjectxyperm 5, 0, 8
setobjectmovementtype 5, 10 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm 4, 1, 6 setobjectxyperm 4, 1, 6
setobjectmovementtype 4, 10 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm 1, 3, 4 setobjectxyperm 1, 3, 4
setobjectmovementtype 1, 10 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
setobjectmovementtype 2, 10 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
compare VAR_0x409E, 1 compare VAR_0x409E, 1
goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_222FAA
compare VAR_0x409E, 2 compare VAR_0x409E, 2

8
data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc
View File

@@ -13,11 +13,11 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63
MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A
clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER
setobjectxyperm 3, 5, 3 setobjectxyperm 3, 5, 3
setobjectmovementtype 3, 10 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm 1, 3, 2 setobjectxyperm 1, 3, 2
setobjectmovementtype 1, 10 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
setobjectxyperm 2, 1, 3 setobjectxyperm 2, 1, 3
setobjectmovementtype 2, 10 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_RIGHT
return return
MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F MossdeepCity_SpaceCenter_2F_EventScript_223D9F:: @ 8223D9F
@@ -319,7 +319,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071
setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
removeobject 3 removeobject 3
setobjectxyperm 3, 5, 6 setobjectxyperm 3, 5, 6
setobjectmovementtype 3, 2 setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_AROUND
addobject 3 addobject 3
fadescreen 0 fadescreen 0
end end

2
data/maps/MossdeepCity_StevensHouse/scripts.inc
View File

@@ -19,7 +19,7 @@ MossdeepCity_StevensHouse_MapScript1_2227A8: @ 82227A8
MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4 MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
setobjectxyperm 1, 6, 5 setobjectxyperm 1, 6, 5
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
return return
MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0 MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0

4
data/maps/MtChimney_CableCarStation/scripts.inc
View File

@@ -10,7 +10,7 @@ MtChimney_CableCarStation_MapScript1_22AC05: @ 822AC05
MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11 MtChimney_CableCarStation_EventScript_22AC11:: @ 822AC11
setobjectxyperm 1, 5, 4 setobjectxyperm 1, 5, 4
setobjectmovementtype 1, 10 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
return return
MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D MtChimney_CableCarStation_MapScript2_22AC1D: @ 822AC1D
@@ -24,7 +24,7 @@ MtChimney_CableCarStation_EventScript_22AC27:: @ 822AC27
waitmovement 0 waitmovement 0
setvar VAR_0x40A3, 0 setvar VAR_0x40A3, 0
setobjectxyperm 1, 6, 7 setobjectxyperm 1, 6, 7
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
releaseall releaseall
end end

4
data/maps/OldaleTown/scripts.inc
View File

@@ -16,12 +16,12 @@ OldaleTown_EventScript_1E8ECC:: @ 81E8ECC
OldaleTown_EventScript_1E8ED2:: @ 81E8ED2 OldaleTown_EventScript_1E8ED2:: @ 81E8ED2
setobjectxyperm 3, 1, 11 setobjectxyperm 3, 1, 11
setobjectmovementtype 3, 9 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_LEFT
return return
OldaleTown_EventScript_1E8EDE:: @ 81E8EDE OldaleTown_EventScript_1E8EDE:: @ 81E8EDE
setobjectxyperm 2, 13, 14 setobjectxyperm 2, 13, 14
setobjectmovementtype 2, 8 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
return return
OldaleTown_EventScript_1E8EEA:: @ 81E8EEA OldaleTown_EventScript_1E8EEA:: @ 81E8EEA

4
data/maps/Route104_MrBrineysHouse/scripts.inc
View File

@@ -15,9 +15,9 @@ Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C
Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50
setobjectxyperm 1, 9, 3 setobjectxyperm 1, 9, 3
setobjectmovementtype 1, 50 setobjectmovementtype 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT
setobjectxyperm 2, 9, 6 setobjectxyperm 2, 9, 6
setobjectmovementtype 2, 51 setobjectmovementtype 2, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN
return return
Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67

4
data/maps/Route110/scripts.inc
View File

@@ -484,8 +484,8 @@ Route110_EventScript_1EF8EC:: @ 81EF8EC
call_if_eq Route110_EventScript_1EF998 call_if_eq Route110_EventScript_1EF998
compare VAR_0x8008, 3 compare VAR_0x8008, 3
call_if_eq Route110_EventScript_1EF9A0 call_if_eq Route110_EventScript_1EF9A0
setobjectmovementtype 28, 10 setobjectmovementtype 28, MOVEMENT_TYPE_FACE_RIGHT
setobjectmovementtype 29, 10 setobjectmovementtype 29, MOVEMENT_TYPE_FACE_RIGHT
removeobject 28 removeobject 28
addobject 29 addobject 29
delay 45 delay 45

4
data/maps/Route112_CableCarStation/scripts.inc
View File

@@ -11,7 +11,7 @@ Route112_CableCarStation_MapScript1_22AAC9: @ 822AAC9
Route112_CableCarStation_EventScript_22AADD:: @ 822AADD Route112_CableCarStation_EventScript_22AADD:: @ 822AADD
setobjectxyperm 1, 7, 4 setobjectxyperm 1, 7, 4
setobjectmovementtype 1, 9 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_LEFT
return return
Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9 Route112_CableCarStation_MapScript2_22AAE9: @ 822AAE9
@@ -25,7 +25,7 @@ Route112_CableCarStation_EventScript_22AAF3:: @ 822AAF3
waitmovement 0 waitmovement 0
setvar VAR_0x40A3, 0 setvar VAR_0x40A3, 0
setobjectxyperm 1, 6, 7 setobjectxyperm 1, 6, 7
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
releaseall releaseall
end end

2
data/maps/Route114_FossilManiacsTunnel/scripts.inc
View File

@@ -9,7 +9,7 @@ Route114_FossilManiacsTunnel_MapScript1_22AF33: @ 822AF33
Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D Route114_FossilManiacsTunnel_EventScript_22AF3D:: @ 822AF3D
setobjectxyperm 1, 6, 5 setobjectxyperm 1, 6, 5
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
return return
Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49 Route114_FossilManiacsTunnel_MapScript1_22AF49: @ 822AF49

2
data/maps/Route119_WeatherInstitute_1F/scripts.inc
View File

@@ -9,7 +9,7 @@ Route119_WeatherInstitute_1F_MapScript1_26FA8C: @ 826FA8C
Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98 Route119_WeatherInstitute_1F_EventScript_26FA98:: @ 826FA98
setobjectxyperm 5, 0, 5 setobjectxyperm 5, 0, 5
setobjectmovementtype 5, 10 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
return return
Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4 Route119_WeatherInstitute_1F_EventScript_26FAA4:: @ 826FAA4

6
data/maps/Route119_WeatherInstitute_2F/scripts.inc
View File

@@ -12,17 +12,17 @@ Route119_WeatherInstitute_2F_MapScript1_26FF24: @ 826FF24
Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44 Route119_WeatherInstitute_2F_EventScript_26FF44:: @ 826FF44
setobjectxyperm 5, 1, 6 setobjectxyperm 5, 1, 6
setobjectmovementtype 5, 10 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
return return
Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50 Route119_WeatherInstitute_2F_EventScript_26FF50:: @ 826FF50
setobjectxyperm 5, 4, 6 setobjectxyperm 5, 4, 6
setobjectmovementtype 5, 10 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_RIGHT
return return
Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C Route119_WeatherInstitute_2F_EventScript_26FF5C:: @ 826FF5C
setobjectxyperm 5, 2, 2 setobjectxyperm 5, 2, 2
setobjectmovementtype 5, 7 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_UP
return return
Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68 Route119_WeatherInstitute_2F_EventScript_26FF68:: @ 826FF68

2
data/maps/Route120/scripts.inc
View File

@@ -57,7 +57,7 @@ Route120_EventScript_1F54A3:: @ 81F54A3
return return
Route120_EventScript_1F54C8:: @ 81F54C8 Route120_EventScript_1F54C8:: @ 81F54C8
setobjectmovementtype 36, 10 setobjectmovementtype 36, MOVEMENT_TYPE_FACE_RIGHT
return return
Route120_MapScript1_1F54CD: @ 81F54CD Route120_MapScript1_1F54CD: @ 81F54CD

10
data/maps/RustboroCity/scripts.inc
View File

@@ -245,7 +245,7 @@ RustboroCity_EventScript_1E094E:: @ 81E094E
RustboroCity_EventScript_1E095A:: @ 81E095A RustboroCity_EventScript_1E095A:: @ 81E095A
lockall lockall
setobjectxyperm 9, 14, 21 setobjectxyperm 9, 14, 21
setobjectmovementtype 9, 10 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 0 setvar VAR_0x8004, 0
goto RustboroCity_EventScript_1E09CD goto RustboroCity_EventScript_1E09CD
end end
@@ -253,7 +253,7 @@ RustboroCity_EventScript_1E095A:: @ 81E095A
RustboroCity_EventScript_1E0971:: @ 81E0971 RustboroCity_EventScript_1E0971:: @ 81E0971
lockall lockall
setobjectxyperm 9, 14, 21 setobjectxyperm 9, 14, 21
setobjectmovementtype 9, 10 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 1 setvar VAR_0x8004, 1
goto RustboroCity_EventScript_1E09CD goto RustboroCity_EventScript_1E09CD
end end
@@ -261,7 +261,7 @@ RustboroCity_EventScript_1E0971:: @ 81E0971
RustboroCity_EventScript_1E0988:: @ 81E0988 RustboroCity_EventScript_1E0988:: @ 81E0988
lockall lockall
setobjectxyperm 9, 14, 21 setobjectxyperm 9, 14, 21
setobjectmovementtype 9, 10 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 2 setvar VAR_0x8004, 2
goto RustboroCity_EventScript_1E09CD goto RustboroCity_EventScript_1E09CD
end end
@@ -269,7 +269,7 @@ RustboroCity_EventScript_1E0988:: @ 81E0988
RustboroCity_EventScript_1E099F:: @ 81E099F RustboroCity_EventScript_1E099F:: @ 81E099F
lockall lockall
setobjectxyperm 9, 14, 21 setobjectxyperm 9, 14, 21
setobjectmovementtype 9, 10 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 3 setvar VAR_0x8004, 3
goto RustboroCity_EventScript_1E09CD goto RustboroCity_EventScript_1E09CD
end end
@@ -277,7 +277,7 @@ RustboroCity_EventScript_1E099F:: @ 81E099F
RustboroCity_EventScript_1E09B6:: @ 81E09B6 RustboroCity_EventScript_1E09B6:: @ 81E09B6
lockall lockall
setobjectxyperm 9, 14, 21 setobjectxyperm 9, 14, 21
setobjectmovementtype 9, 10 setobjectmovementtype 9, MOVEMENT_TYPE_FACE_RIGHT
setvar VAR_0x8004, 4 setvar VAR_0x8004, 4
goto RustboroCity_EventScript_1E09CD goto RustboroCity_EventScript_1E09CD
end end

2
data/maps/RustboroCity_DevonCorp_1F/scripts.inc
View File

@@ -8,7 +8,7 @@ RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B
RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255
setobjectxyperm 2, 14, 2 setobjectxyperm 2, 14, 2
setobjectmovementtype 2, 8 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_DOWN
return return
RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261

2
data/maps/RustboroCity_DevonCorp_3F/scripts.inc
View File

@@ -11,7 +11,7 @@ RustboroCity_DevonCorp_3F_MapScript1_21243D: @ 821243D
RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449 RustboroCity_DevonCorp_3F_EventScript_212449:: @ 8212449
setobjectxyperm 2, 3, 2 setobjectxyperm 2, 3, 2
setobjectmovementtype 2, 9 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
return return
RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455 RustboroCity_DevonCorp_3F_MapScript2_212455: @ 8212455

2
data/maps/SkyPillar_Top/scripts.inc
View File

@@ -24,7 +24,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6
SkyPillar_Top_EventScript_2396FD:: @ 82396FD SkyPillar_Top_EventScript_2396FD:: @ 82396FD
setmaplayoutindex 438 setmaplayoutindex 438
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
return return
SkyPillar_Top_EventScript_239705:: @ 8239705 SkyPillar_Top_EventScript_239705:: @ 8239705

20
data/maps/SlateportCity/scripts.inc
View File

@@ -26,13 +26,13 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
setobjectxyperm 8, 28, 16 setobjectxyperm 8, 28, 16
setobjectxyperm 1, 29, 16 setobjectxyperm 1, 29, 16
setobjectxyperm 2, 31, 14 setobjectxyperm 2, 31, 14
setobjectmovementtype 11, 8 setobjectmovementtype 11, MOVEMENT_TYPE_FACE_DOWN
setobjectmovementtype 7, 18 setobjectmovementtype 7, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT
setobjectmovementtype 3, 16 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT
setobjectmovementtype 6, 7 setobjectmovementtype 6, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 8, 7 setobjectmovementtype 8, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 1, 7 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 2, 9 setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
return return
SlateportCity_EventScript_1DCCE7:: @ 81DCCE7 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
@@ -41,12 +41,12 @@ SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
compare VAR_0x8004, 30 compare VAR_0x8004, 30
goto_if_eq SlateportCity_EventScript_1DCD06 goto_if_eq SlateportCity_EventScript_1DCD06
setobjectxyperm 35, 23, 27 setobjectxyperm 35, 23, 27
setobjectmovementtype 35, 10 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
return return
SlateportCity_EventScript_1DCD06:: @ 81DCD06 SlateportCity_EventScript_1DCD06:: @ 81DCD06
setobjectxyperm 35, 22, 27 setobjectxyperm 35, 22, 27
setobjectmovementtype 35, 10 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
return return
SlateportCity_MapScript2_1DCD12: @ 81DCD12 SlateportCity_MapScript2_1DCD12: @ 81DCD12
@@ -82,7 +82,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
waitmovement 0 waitmovement 0
removeobject 35 removeobject 35
setobjectxyperm 35, 10, 12 setobjectxyperm 35, 10, 12
setobjectmovementtype 35, 8 setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
clearflag FLAG_SPECIAL_FLAG_0x4000 clearflag FLAG_SPECIAL_FLAG_0x4000
setvar VAR_0x40D2, 2 setvar VAR_0x40D2, 2
addvar VAR_0x40D1, 1 addvar VAR_0x40D1, 1

4
data/maps/SlateportCity_Harbor/scripts.inc
View File

@@ -17,7 +17,7 @@ SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9 SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
savebgm MUS_AQA_0 savebgm MUS_AQA_0
setobjectxyperm 4, 12, 13 setobjectxyperm 4, 12, 13
setobjectmovementtype 4, 9 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
return 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_1_BLOCKING_ENTRANCE
setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
moveobjectoffscreen 4 moveobjectoffscreen 4
setobjectmovementtype 4, 10 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_RIGHT
releaseall releaseall
end end

14
data/maps/SootopolisCity/scripts.inc
View File

@@ -70,10 +70,10 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
setobjectxyperm 5, 46, 32 setobjectxyperm 5, 46, 32
setobjectxyperm 4, 48, 41 setobjectxyperm 4, 48, 41
setobjectxyperm 8, 45, 43 setobjectxyperm 8, 45, 43
setobjectmovementtype 3, 7 setobjectmovementtype 3, MOVEMENT_TYPE_FACE_UP
setobjectmovementtype 5, 9 setobjectmovementtype 5, MOVEMENT_TYPE_FACE_LEFT
setobjectmovementtype 4, 9 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
setobjectmovementtype 8, 9 setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT
return return
SootopolisCity_EventScript_1E57B2:: @ 81E57B2 SootopolisCity_EventScript_1E57B2:: @ 81E57B2
@@ -150,17 +150,17 @@ SootopolisCity_EventScript_1E5871:: @ 81E5871
SootopolisCity_EventScript_1E58AF:: @ 81E58AF SootopolisCity_EventScript_1E58AF:: @ 81E58AF
setobjectxyperm 18, 31, 33 setobjectxyperm 18, 31, 33
setobjectmovementtype 18, 8 setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
return return
SootopolisCity_EventScript_1E58BB:: @ 81E58BB SootopolisCity_EventScript_1E58BB:: @ 81E58BB
setobjectxyperm 18, 32, 33 setobjectxyperm 18, 32, 33
setobjectmovementtype 18, 8 setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
return return
SootopolisCity_EventScript_1E58C7:: @ 81E58C7 SootopolisCity_EventScript_1E58C7:: @ 81E58C7
setobjectxyperm 18, 30, 33 setobjectxyperm 18, 30, 33
setobjectmovementtype 18, 8 setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
return return
SootopolisCity_EventScript_1E58D3:: @ 81E58D3 SootopolisCity_EventScript_1E58D3:: @ 81E58D3

4
data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
View File

@@ -15,13 +15,13 @@ SootopolisCity_MysteryEventsHouse_1F_MapScript1_22795E: @ 822795E
SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
setvar VAR_TEMP_1, 1 setvar VAR_TEMP_1, 1
setobjectxyperm 1, 3, 2 setobjectxyperm 1, 3, 2
setobjectmovementtype 1, 8 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
setmaplayoutindex 441 setmaplayoutindex 441
return return
SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
setobjectxyperm 1, 2, 2 setobjectxyperm 1, 2, 2
setobjectmovementtype 1, 10 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
return return
SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D

4
data/maps/VictoryRoad_1F/scripts.inc
View File

@@ -11,12 +11,12 @@ VictoryRoad_1F_MapScript1_235D80: @ 8235D80
VictoryRoad_1F_EventScript_235D97:: @ 8235D97 VictoryRoad_1F_EventScript_235D97:: @ 8235D97
setobjectxyperm 4, 2, 24 setobjectxyperm 4, 2, 24
setobjectmovementtype 4, 8 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
return return
VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3 VictoryRoad_1F_EventScript_235DA3:: @ 8235DA3
setobjectxyperm 4, 3, 24 setobjectxyperm 4, 3, 24
setobjectmovementtype 4, 8 setobjectmovementtype 4, MOVEMENT_TYPE_FACE_DOWN
return return
VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF VictoryRoad_1F_EventScript_235DAF:: @ 8235DAF

89
src/trainer_see.c
View File

@@ -1,5 +1,4 @@
#include "global.h" #include "global.h"
#include "constants/battle_setup.h"
#include "battle_setup.h" #include "battle_setup.h"
#include "event_data.h" #include "event_data.h"
#include "event_object_movement.h" #include "event_object_movement.h"
@@ -14,6 +13,8 @@
#include "trainer_hill.h" #include "trainer_hill.h"
#include "util.h" #include "util.h"
#include "battle_pyramid.h" #include "battle_pyramid.h"
#include "constants/battle_setup.h"
#include "constants/event_object_movement_constants.h"
#include "constants/field_effects.h" #include "constants/field_effects.h"
extern void sub_809BE48(u16 npcId); 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 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_80B4178(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 TrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitTrainerExclamationMark(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 TrainerMoveToPlayer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 PlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitPlayerFaceApproachingTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B435C(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 RevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 WaitRevealDisguisedTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B43AC(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 RevealHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 PopOutOfAshHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *trainerObj); static bool8 JumpInPlaceHiddenTrainer(u8 taskId, struct Task *task, struct EventObject *trainerObj);
static bool8 sub_80B44AC(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); 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) = static bool8 (*const sTrainerSeeFuncList[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
{ {
sub_80B4178, sub_80B4178,
sub_80B417C, TrainerExclamationMark,
sub_80B41C0, WaitTrainerExclamationMark,
sub_80B4200, TrainerMoveToPlayer,
sub_80B425C, PlayerFaceApproachingTrainer,
sub_80B4318, WaitPlayerFaceApproachingTrainer,
sub_80B435C, RevealDisguisedTrainer,
sub_80B4390, WaitRevealDisguisedTrainer,
sub_80B43AC, RevealHiddenTrainer,
sub_80B43E0, PopOutOfAshHiddenTrainer,
sub_80B4438, JumpInPlaceHiddenTrainer,
sub_80B44AC WaitRevealHiddenTrainer,
}; };
static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) = static bool8 (*const sTrainerSeeFuncList2[])(u8 taskId, struct Task *task, struct EventObject *trainerObj) =
{ {
sub_80B43AC, RevealHiddenTrainer,
sub_80B43E0, PopOutOfAshHiddenTrainer,
sub_80B4438, JumpInPlaceHiddenTrainer,
sub_80B44AC, WaitRevealHiddenTrainer,
}; };
static const struct OamData sOamData_Icons = static const struct OamData sOamData_Icons =
@@ -433,7 +434,7 @@ static bool8 sub_80B4178(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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; u8 direction;
@@ -445,7 +446,7 @@ static bool8 sub_80B417C(u8 taskId, struct Task *task, struct EventObject *train
return TRUE; 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)) if (FieldEffectActiveListContains(FLDEFF_EXCLAMATION_MARK_ICON))
{ {
@@ -454,17 +455,17 @@ static bool8 sub_80B41C0(u8 taskId, struct Task *task, struct EventObject *train
else else
{ {
task->tFuncId++; 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; task->tFuncId = 6;
if (trainerObj->movementType == 63) if (trainerObj->movementType == MOVEMENT_TYPE_HIDDEN)
task->tFuncId = 8; task->tFuncId = 8;
return TRUE; 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) if (task->tTrainerRange)
{ {
@@ -473,14 +474,14 @@ static bool8 sub_80B4200(u8 taskId, struct Task *task, struct EventObject *train
} }
else else
{ {
EventObjectSetHeldMovement(trainerObj, 0x3E); EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->tFuncId++; task->tFuncId++;
} }
} }
return FALSE; 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; struct EventObject *playerObj;
@@ -501,7 +502,7 @@ static bool8 sub_80B425C(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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]; struct EventObject *playerObj = &gEventObjects[gPlayerAvatar.eventObjectId];
@@ -511,18 +512,18 @@ static bool8 sub_80B4318(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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) if (!EventObjectIsMovementOverridden(trainerObj)
|| EventObjectClearHeldMovementIfFinished(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj))
{ {
EventObjectSetHeldMovement(trainerObj, 0x59); EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_REVEAL_TRAINER);
task->tFuncId++; task->tFuncId++;
} }
return FALSE; 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)) if (EventObjectClearHeldMovementIfFinished(trainerObj))
task->tFuncId = 3; task->tFuncId = 3;
@@ -530,18 +531,18 @@ static bool8 sub_80B4390(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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) if (!EventObjectIsMovementOverridden(trainerObj)
|| EventObjectClearHeldMovementIfFinished(trainerObj)) || EventObjectClearHeldMovementIfFinished(trainerObj))
{ {
EventObjectSetHeldMovement(trainerObj, 0x3E); EventObjectSetHeldMovement(trainerObj, MOVEMENT_ACTION_FACE_PLAYER);
task->tFuncId++; task->tFuncId++;
} }
return FALSE; 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)) if (EventObjectCheckHeldMovementStatus(trainerObj))
{ {
@@ -555,7 +556,7 @@ static bool8 sub_80B43E0(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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; struct Sprite *sprite;
@@ -574,7 +575,7 @@ static bool8 sub_80B4438(u8 taskId, struct Task *task, struct EventObject *train
return FALSE; 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)) if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
task->tFuncId = 3; task->tFuncId = 3;