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

Rename 'hidden' Trainers/obj events to 'buried'

Browse Source
This commit is contained in:
SphericalIce
2021-02-14 19:25:23 +00:00
parent 78925916f3
commit 70ff6c3b84
9 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ LavaridgeTown_Gym_1F_MapScripts:: @ 81FE6F4
LavaridgeTown_Gym_1F_OnTransition: @ 81FE6FA
call LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars
call LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers
call LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers
end
@ Unclear where/if these temp vars are getting checked
@@ -33,19 +33,19 @@ LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
return
LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757
goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
setobjectmovementtype LOCALID_COLE, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764
goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
setobjectmovementtype LOCALID_GERALD, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771
goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
setobjectmovementtype LOCALID_AXLE, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E
goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
setobjectmovementtype LOCALID_DANIELLE, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
LavaridgeTown_Gym_1F_EventScript_CheckBuryTrainers:: @ 81FE757
goto_if_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_CheckBuryGerald
setobjectmovementtype LOCALID_COLE, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_1F_EventScript_CheckBuryGerald:: @ 81FE764
goto_if_defeated TRAINER_GERALD, LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle
setobjectmovementtype LOCALID_GERALD, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_1F_EventScript_CheckBuryAxle:: @ 81FE771
goto_if_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_CheckBuryDanielle
setobjectmovementtype LOCALID_AXLE, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_1F_EventScript_CheckBuryDanielle:: @ 81FE77E
goto_if_defeated TRAINER_DANIELLE, LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers
setobjectmovementtype LOCALID_DANIELLE, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_1F_EventScript_EndCheckBuryTrainers:: @ 81FE78B
return
LavaridgeTown_Gym_1F_EventScript_Flannery:: @ 81FE78C

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

@@ -9,7 +9,7 @@ LavaridgeTown_Gym_B1F_MapScripts:: @ 81FF87E
LavaridgeTown_Gym_B1F_OnTransition: @ 81FF884
call LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars
call LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers
call LavaridgeTown_Gym_B1F_EventScript_CheckBuryTrainers
end
@ Unclear where/if these temp vars are getting checked
@@ -32,18 +32,18 @@ LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
return
LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC
goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
setobjectmovementtype LOCALID_KEEGAN, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9
goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
setobjectmovementtype LOCALID_JACE, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6
goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
setobjectmovementtype LOCALID_JEFF, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903
goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
setobjectmovementtype LOCALID_ELI, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910
LavaridgeTown_Gym_B1F_EventScript_CheckBuryTrainers:: @ 81FF8DC
goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckBuryJace
setobjectmovementtype LOCALID_KEEGAN, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_B1F_EventScript_CheckBuryJace:: @ 81FF8E9
goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckBuryJeff
setobjectmovementtype LOCALID_JACE, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_B1F_EventScript_CheckBuryJeff:: @ 81FF8F6
goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckBuryEli
setobjectmovementtype LOCALID_JEFF, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_B1F_EventScript_CheckBuryEli:: @ 81FF903
goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckBuryTrainers
setobjectmovementtype LOCALID_ELI, MOVEMENT_TYPE_BURIED
LavaridgeTown_Gym_B1F_EventScript_EndCheckBuryTrainers:: @ 81FF910
return

4
data/maps/Route113/map.json
View File

@@ -126,7 +126,7 @@
"x": 29,
"y": 6,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_HIDDEN",
"movement_type": "MOVEMENT_TYPE_BURIED",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_BURIED",
@@ -139,7 +139,7 @@
"x": 71,
"y": 2,
"elevation": 3,
"movement_type": "MOVEMENT_TYPE_HIDDEN",
"movement_type": "MOVEMENT_TYPE_BURIED",
"movement_range_x": 0,
"movement_range_y": 0,
"trainer_type": "TRAINER_TYPE_BURIED",