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

Port some macro/script fixes from pokefirered

Browse Source
This commit is contained in:
GriffinR
2020-01-11 12:02:58 -05:00
parent 8b1595ebc3
commit f2e7b1507e
107 changed files with 528 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,39 +13,31 @@ LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F
setvar VAR_TEMP_8, 0
setvar VAR_TEMP_9, 0
setvar VAR_TEMP_A, 0
checktrainerflag TRAINER_KEEGAN
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar
setvar VAR_TEMP_7, 1
LavaridgeTown_Gym_B1F_EventScript_SetJaceTempVar:: @ 81FF8B1
checktrainerflag TRAINER_JACE
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar
setvar VAR_TEMP_8, 1
LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF
checktrainerflag TRAINER_JEFF
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar
setvar VAR_TEMP_9, 1
LavaridgeTown_Gym_B1F_EventScript_SetEliTempVar:: @ 81FF8CD
checktrainerflag TRAINER_ELI
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars
setvar VAR_TEMP_A, 1
LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB
return
LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC
checktrainerflag TRAINER_KEEGAN
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
goto_if_defeated TRAINER_KEEGAN, LavaridgeTown_Gym_B1F_EventScript_CheckHideJace
setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideJace:: @ 81FF8E9
checktrainerflag TRAINER_JACE
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
goto_if_defeated TRAINER_JACE, LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff
setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6
checktrainerflag TRAINER_JEFF
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
goto_if_defeated TRAINER_JEFF, LavaridgeTown_Gym_B1F_EventScript_CheckHideEli
setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_CheckHideEli:: @ 81FF903
checktrainerflag TRAINER_ELI
goto_if_eq LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
goto_if_defeated TRAINER_ELI, LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers
setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910
return