From 60a592a2c32d07d47c892204659a8576017584d1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 15 Oct 2019 18:03:07 -0400 Subject: [PATCH] Condense fallthrough scripts --- data/maps/DewfordTown_Gym/scripts.inc | 6 ------ data/maps/LavaridgeTown_Gym_1F/scripts.inc | 8 -------- data/maps/LavaridgeTown_Gym_B1F/scripts.inc | 8 -------- 3 files changed, 22 deletions(-) diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index a1938eb14..2641db5dc 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -127,32 +127,26 @@ DewfordTown_Gym_EventScript_CountTrainersDefeated:: @ 81FC768 checktrainerflag TRAINER_TAKAO goto_if_lt DewfordTown_Gym_EventScript_CheckJocelyn addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_CheckJocelyn:: @ 81FC77B checktrainerflag TRAINER_JOCELYN goto_if_lt DewfordTown_Gym_EventScript_CheckLaura addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_CheckLaura:: @ 81FC789 checktrainerflag TRAINER_LAURA goto_if_lt DewfordTown_Gym_EventScript_CheckBrenden addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_CheckBrenden:: @ 81FC797 checktrainerflag TRAINER_BRENDEN goto_if_lt DewfordTown_Gym_EventScript_CheckCristian addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_CheckCristian:: @ 81FC7A5 checktrainerflag TRAINER_CRISTIAN goto_if_lt DewfordTown_Gym_EventScript_CheckLilith addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_CheckLilith:: @ 81FC7B3 checktrainerflag TRAINER_LILITH goto_if_lt DewfordTown_Gym_EventScript_StopCountingTrainers addvar VAR_0x8000, 1 - DewfordTown_Gym_EventScript_StopCountingTrainers:: @ 81FC7C1 return diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index a5fa56f0d..a5dcabf30 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -17,22 +17,18 @@ LavaridgeTown_Gym_1F_EventScript_SetTrainerTempVars:: @ 81FE705 checktrainerflag TRAINER_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar setvar VAR_TEMP_B, 1 - LavaridgeTown_Gym_1F_EventScript_SetGeraldTempVar:: @ 81FE72C checktrainerflag TRAINER_GERALD goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar setvar VAR_TEMP_C, 1 - LavaridgeTown_Gym_1F_EventScript_SetAxleTempVar:: @ 81FE73A checktrainerflag TRAINER_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar setvar VAR_TEMP_D, 1 - LavaridgeTown_Gym_1F_EventScript_SetDanielleTempVar:: @ 81FE748 checktrainerflag TRAINER_DANIELLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars setvar VAR_TEMP_E, 1 - LavaridgeTown_Gym_1F_EventScript_EndSetTrainerTempVars:: @ 81FE756 return @@ -40,22 +36,18 @@ LavaridgeTown_Gym_1F_EventScript_CheckHideTrainers:: @ 81FE757 checktrainerflag TRAINER_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideGerald setobjectmovementtype 2, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_1F_EventScript_CheckHideGerald:: @ 81FE764 checktrainerflag TRAINER_GERALD goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideAxle setobjectmovementtype 3, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_1F_EventScript_CheckHideAxle:: @ 81FE771 checktrainerflag TRAINER_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_1F_EventScript_CheckHideDanielle:: @ 81FE77E checktrainerflag TRAINER_DANIELLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers setobjectmovementtype 5, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_1F_EventScript_EndCheckHideTrainers:: @ 81FE78B return diff --git a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc index 7d2e48463..9be4e2975 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/scripts.inc @@ -16,22 +16,18 @@ LavaridgeTown_Gym_B1F_EventScript_SetTrainerTempVars:: @ 81FF88F checktrainerflag TRAINER_KEEGAN goto_if_eq 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 setvar VAR_TEMP_8, 1 - LavaridgeTown_Gym_B1F_EventScript_SetJeffTempVar:: @ 81FF8BF checktrainerflag TRAINER_JEFF goto_if_eq 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 setvar VAR_TEMP_A, 1 - LavaridgeTown_Gym_B1F_EventScript_EndSetTrainerTempVars:: @ 81FF8DB return @@ -39,22 +35,18 @@ LavaridgeTown_Gym_B1F_EventScript_CheckHideTrainers:: @ 81FF8DC checktrainerflag TRAINER_KEEGAN goto_if_eq 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 setobjectmovementtype 1, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_B1F_EventScript_CheckHideJeff:: @ 81FF8F6 checktrainerflag TRAINER_JEFF goto_if_eq 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 setobjectmovementtype 4, MOVEMENT_TYPE_HIDDEN - LavaridgeTown_Gym_B1F_EventScript_EndCheckHideTrainers:: @ 81FF910 return