ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Condense fallthrough scripts

Browse Source
This commit is contained in:
GriffinR 2019-10-15 18:03:07 -04:00 committed by huderlem
parent 348bb002a8
commit 60a592a2c3
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,32 +127,26 @@ DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768
checktrainerflag TRAINER_TAKAO checktrainerflag TRAINER_TAKAO
goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B
checktrainerflag TRAINER_JOCELYN checktrainerflag TRAINER_JOCELYN
goto_if_lt DewfordTown_Gym_EventScript_CheckLaura goto_if_lt DewfordTown_Gym_EventScript_CheckLaura
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789 DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789
checktrainerflag TRAINER_LAURA checktrainerflag TRAINER_LAURA
goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797 DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797
checktrainerflag TRAINER_BRENDEN checktrainerflag TRAINER_BRENDEN
goto_if_lt DewfordTown_Gym_EventScript_CheckCristian goto_if_lt DewfordTown_Gym_EventScript_CheckCristian
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5 DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5
checktrainerflag TRAINER_CRISTIAN checktrainerflag TRAINER_CRISTIAN
goto_if_lt DewfordTown_Gym_EventScript_CheckLilith goto_if_lt DewfordTown_Gym_EventScript_CheckLilith
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3 DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3
checktrainerflag TRAINER_LILITH checktrainerflag TRAINER_LILITH
goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers
addvar VAR_0x8000, 1 addvar VAR_0x8000, 1
DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1 DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1
return return

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

@ -17,22 +17,18 @@ LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705
checktrainerflag TRAINER_COLE checktrainerflag TRAINER_COLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar
setvar VAR_TEMP_B, 1 setvar VAR_TEMP_B, 1
LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C
checktrainerflag TRAINER_GERALD checktrainerflag TRAINER_GERALD
goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar
setvar VAR_TEMP_C, 1 setvar VAR_TEMP_C, 1
LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A
checktrainerflag TRAINER_AXLE checktrainerflag TRAINER_AXLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar
setvar VAR_TEMP_D, 1 setvar VAR_TEMP_D, 1
LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748 LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748
checktrainerflag TRAINER_DANIELLE checktrainerflag TRAINER_DANIELLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars
setvar VAR_TEMP_E, 1 setvar VAR_TEMP_E, 1
LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756 LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756
return return
@ -40,22 +36,18 @@ LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757
checktrainerflag TRAINER_COLE checktrainerflag TRAINER_COLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald
setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764 LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764
checktrainerflag TRAINER_GERALD checktrainerflag TRAINER_GERALD
goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle
setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771 LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771
checktrainerflag TRAINER_AXLE checktrainerflag TRAINER_AXLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle
setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E
checktrainerflag TRAINER_DANIELLE checktrainerflag TRAINER_DANIELLE
goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers
setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN
LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B
return return

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

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