Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD

data/maps/SecretBase_BlueCave2/map.json

@@ -26,7 +26,7 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "SecretBase_EventScript_RecordMixTrainer",
-      "flag": "FLAG_DECORATION_0"
+      "flag": "FLAG_HIDE_SECRET_BASE_TRAINER"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_VAR_0",